From 4f6290bb416e17e692eafcb5bb40ee15af5148fe Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 12 八月 2024 14:20:55 +0800
Subject: [PATCH] 海康接口重写
---
/dev/null | 60 ------------------------------
ycl-server/src/main/java/com/ycl/task/HKTask.java | 48 +++---------------------
2 files changed, 6 insertions(+), 102 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/feign/HKApi.java b/ycl-server/src/main/java/com/ycl/feign/HKApi.java
deleted file mode 100644
index c8d77ef..0000000
--- a/ycl-server/src/main/java/com/ycl/feign/HKApi.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.ycl.feign;
-
-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONObject;
-import com.hikvision.artemis.sdk.ArtemisHttpUtil;
-import com.hikvision.artemis.sdk.config.ArtemisConfig;
-import com.ycl.platform.domain.param.HK.FaceDetectParam;
-import com.ycl.utils.DateUtils;
-import lombok.extern.slf4j.Slf4j;
-
-import java.util.HashMap;
-import java.util.Map;
-@Slf4j
-public class HKApi {
-
- public static String GetCameraPreviewURL() {
-
- /**
- * STEP1锛氳缃钩鍙板弬鏁帮紝鏍规嵁瀹為檯鎯呭喌,璁剧疆host appkey appsecret 涓変釜鍙傛暟.
- */
- ArtemisConfig.host = "51.92.65.49"; // 骞冲彴鐨刬p绔彛
- ArtemisConfig.appKey = "29555942"; // 瀵嗛挜appkey
- ArtemisConfig.appSecret = "t9U7tCplCyYHzQPPL7cH";// 瀵嗛挜appSecret
-
- /**
- * STEP2锛氳缃甇penAPI鎺ュ彛鐨勪笂涓嬫枃
- */
- final String ARTEMIS_PATH = "/artemis";
-
- /**
- * STEP3锛氳缃帴鍙ｇ殑URI鍦板潃
- */
- final String previewURLsApi = ARTEMIS_PATH + "/api/dqd/service/rs/v2/data/faceDetect/query";
- Map<String, String> path = new HashMap<String, String>(2) {
- {
- put("https://", previewURLsApi);//鏍规嵁鐜板満鐜閮ㄧ讲纭鏄痟ttp杩樻槸https
- }
- };
-
- /**
- * STEP4锛氳缃弬鏁版彁浜ゆ柟寮�
- */
- String contentType = "application/json";
-
- /**
- * STEP5锛氱粍瑁呰姹傚弬鏁�
- */
- FaceDetectParam param = new FaceDetectParam();
- param.setDate(DateUtils.getDate());
- param.setPageNo(1);
- param.setPageSize(20);
- String body = JSON.toJSONString(param);
- log.info("璇锋眰鍙傛暟:{}",body);
- /**
- * STEP6锛氳皟鐢ㄦ帴鍙�
- */
- String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, contentType , null);// post璇锋眰application/json绫诲瀷鍙傛暟
- return result;
- }
-}
diff --git a/ycl-server/src/main/java/com/ycl/task/HKTask.java b/ycl-server/src/main/java/com/ycl/task/HKTask.java
index 4b21232..f37f81f 100644
--- a/ycl-server/src/main/java/com/ycl/task/HKTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/HKTask.java
@@ -2,10 +2,9 @@
import com.alibaba.fastjson2.JSONObject;
import com.mongodb.client.result.DeleteResult;
-import com.ycl.feign.HKApi;
+import com.ycl.feign.HkApiUtil;
import com.ycl.feign.HkApiUtil;
import com.ycl.platform.domain.param.HK.*;
-import com.ycl.platform.domain.result.BaseResult;
import com.ycl.platform.domain.result.HK.*;
import com.ycl.platform.service.ICheckIndexCarService;
import com.ycl.platform.service.ICheckIndexFaceService;
@@ -33,8 +32,6 @@
@Autowired
private MongoTemplate mongoTemplate;
@Autowired
- private HKClient hkClient;
- @Autowired
private IYwThresholdService ywThresholdService;
@Autowired
private ICheckIndexFaceService checkIndexFaceService;
@@ -48,8 +45,7 @@
log.info("寮�濮嬫墽琛岃溅杈嗚澶囧叏妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
VehicleDeviceInspectionParam param = new VehicleDeviceInspectionParam();
param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate());
- JSONObject jsonObject = hkClient.vehicleDeviceInspection(param);
- List<VehicleDeviceInspectionResult> list = getDataList(jsonObject, VehicleDeviceInspectionResult.class, "杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁涓虹┖");
+ List<VehicleDeviceInspectionResult> list = HkApiUtil.sendAPI("/api/dqd/service/rs/v2/data/vehFullAmount/query", param, VehicleDeviceInspectionResult.class);
if (!CollectionUtils.isEmpty(list)) {
//濡傛灉瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
@@ -67,8 +63,7 @@
log.info("寮�濮嬫墽琛屼汉鑴歌澶囧叏妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
FaceDeviceInspectionParam param = new FaceDeviceInspectionParam();
param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate());
- JSONObject jsonObject = hkClient.faceDeviceInspection(param);
- List<FaceDeviceInspectionResult> list = getDataList(jsonObject, FaceDeviceInspectionResult.class, "浜鸿劯璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁涓虹┖");
+ List<FaceDeviceInspectionResult> list = HkApiUtil.sendAPI("/api/dqd/service/rs/v2/data/faceFullAmount/query", param, FaceDeviceInspectionResult.class);
if (!CollectionUtils.isEmpty(list)) {
//濡傛灉瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
@@ -89,8 +84,7 @@
/** 杞﹁締鏁版嵁 */
SnapshotDataMonitorParam carParam = new SnapshotDataMonitorParam();
carParam.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_CAR);
- JSONObject carJsonObject = hkClient.snapshotDataMonitor(carParam);
- List<SnapshotDataMonitorResult> carList = getDataList(carJsonObject, SnapshotDataMonitorResult.class, "杞﹁締鎶撴媿鏁版嵁閲忔娴嬬粨鏋滄暟鎹�");
+ List<SnapshotDataMonitorResult> carList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/data/snapCountDetail/query", carParam, SnapshotDataMonitorResult.class);
if (!CollectionUtils.isEmpty(carList)) {
//濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
Query query = new Query(Criteria
@@ -105,8 +99,7 @@
/** 浜鸿劯鏁版嵁 */
SnapshotDataMonitorParam faceParam = new SnapshotDataMonitorParam();
faceParam.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_FACE);
- JSONObject faceJsonObject = hkClient.snapshotDataMonitor(carParam);
- List<SnapshotDataMonitorResult> faceList = getDataList(faceJsonObject, SnapshotDataMonitorResult.class, "浜鸿劯鎶撴媿鏁版嵁閲忔娴嬬粨鏋滄暟鎹负绌�");
+ List<SnapshotDataMonitorResult> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/data/snapCountDetail/query", faceParam, SnapshotDataMonitorResult.class);
if (!CollectionUtils.isEmpty(faceList)) {
//濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
Query query = new Query(Criteria
@@ -127,9 +120,7 @@
//浜鸿劯鍗″彛淇℃伅閲囬泦鍑嗙‘鐜�
MonitoringDetailParam param = new MonitoringDetailParam();
param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate());
-
List<MonitoringDetailResult> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/device/cameraExpDetailInfo/query", param, MonitoringDetailResult.class);
-
if (!CollectionUtils.isEmpty(faceList)) {
//濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
Query query = new Query(Criteria
@@ -148,8 +139,7 @@
//杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜�
CrossDetailParam param = new CrossDetailParam();
param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate());
- JSONObject jsonObject = hkClient.crossDetail(param);
- List<CrossDetailResult> faceList = getDataList(jsonObject, CrossDetailResult.class, "鍗″彛灞炴�х洃娴嬬粨鏋滄暟鎹负绌�");
+ List<CrossDetailResult> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/device/crossExpDetailInfo/query", param, CrossDetailResult.class);
if (!CollectionUtils.isEmpty(faceList)) {
//濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
Query query = new Query(Criteria
@@ -301,30 +291,4 @@
log.info("缁撴潫浜鸿劯璁惧鎶芥鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
}
- //娴嬭瘯
- public void test() {
- log.info("娴嬭瘯娴峰悍鎺ュ彛");
- String result = HKApi.GetCameraPreviewURL();
- log.info("缁撴潫->{}",result);
- }
- //瑙ｆ瀽鏁版嵁
- private <T> List<T> getDataList(JSONObject jsonObject, Class<T> resultClass, String message) {
- if (jsonObject != null && ApiConstants.HKSuccessCode.equals(jsonObject.getString("code"))) {
- log.info("鏁版嵁鏍煎紡"+jsonObject);
- JSONObject data = jsonObject.getJSONObject("data");
- if (data == null) {
- log.error(message, jsonObject);
- return null;
- }
- List<T> list = data.getList("list", resultClass);
- if (CollectionUtils.isEmpty(list)) {
- log.error(message, data);
- return null;
- }
- return list;
- } else {
- log.error(message);
- }
- return null;
- }
}
--
Gitblit v1.8.0