From 68e4f49cf09a133defc646f10654bbb3fe6ab487 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 12 八月 2024 16:09:49 +0800
Subject: [PATCH] 海康接口调整
---
ycl-server/src/main/java/com/ycl/task/HKTask.java | 48 ++++++++++++++++++++++++
ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 15 ++++---
ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java | 4 +-
ycl-server/src/main/java/com/ycl/platform/service/DataCenterService.java | 5 +-
4 files changed, 62 insertions(+), 10 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java b/ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java
index 7f8a7bb..fc8c849 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java
@@ -47,7 +47,7 @@
*/
@GetMapping("/videoPointOnlineRate")
public Result videoPointOnlineRate(DataCenterQuery query) {
- return Result.ok().data(dataCenterService.videoPointOnlineRate(query));
+ return dataCenterService.videoPointOnlineRate(query);
}
/**
@@ -58,7 +58,7 @@
*/
@GetMapping("/videoOneMachineDocumentRegister")
public Result videoOneMachineDocumentRegister(DataCenterQuery query) {
- return Result.ok().data(dataCenterService.videoOneMachineDocumentRegister(query));
+ return dataCenterService.videoOneMachineDocumentRegister(query);
}
/**
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/DataCenterService.java b/ycl-server/src/main/java/com/ycl/platform/service/DataCenterService.java
index 3b86d92..5b1d873 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/DataCenterService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/DataCenterService.java
@@ -4,6 +4,7 @@
import com.ycl.platform.domain.result.HK.*;
import com.ycl.platform.domain.result.UY.OneMachineFileResult;
import com.ycl.platform.domain.result.UY.RecordMetaDSumResult;
+import com.ycl.system.Result;
import java.util.List;
@@ -22,7 +23,7 @@
* @return
*/
// TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
- List<OneMachineFileResult> videoPointOnlineRate(DataCenterQuery query);
+ Result videoPointOnlineRate(DataCenterQuery query);
/**
* 瑙嗛锛氫竴鏈轰竴妗ｆ敞鍐岀巼
@@ -30,7 +31,7 @@
* @param query
* @return
*/
- List<OneMachineFileResult> videoOneMachineDocumentRegister(DataCenterQuery query);
+ Result videoOneMachineDocumentRegister(DataCenterQuery query);
/**
* 瑙嗛锛氫竴鏈轰竴妗ｅ悎鏍肩巼
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
index 9e70a0e..0c1c44c 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
@@ -4,14 +4,15 @@
import com.ycl.platform.domain.result.HK.*;
import com.ycl.platform.domain.result.UY.OneMachineFileResult;
import com.ycl.platform.domain.result.UY.RecordMetaDSumResult;
+import com.ycl.platform.domain.result.UY.VideoOnlineResult;
import com.ycl.platform.service.DataCenterService;
+import com.ycl.system.Result;
import com.ycl.utils.MongoUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Sort;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.data.mongodb.core.query.TextCriteria;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -38,7 +39,7 @@
* @return
*/
@Override
- public List<OneMachineFileResult> videoPointOnlineRate(DataCenterQuery params) {
+ public Result videoPointOnlineRate(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -51,8 +52,9 @@
}
query.addCriteria(criteria);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
- List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
- return resultList;
+ List<VideoOnlineResult> resultList = mongoTemplate.find(query, VideoOnlineResult.class);
+ long total = mongoTemplate.count(query, VideoOnlineResult.class);
+ return Result.ok().data(resultList).total(total);
}
/**
@@ -62,7 +64,7 @@
* @return
*/
@Override
- public List<OneMachineFileResult> videoOneMachineDocumentRegister(DataCenterQuery params) {
+ public Result videoOneMachineDocumentRegister(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -76,7 +78,8 @@
query.addCriteria(criteria);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
- return resultList;
+ long total = mongoTemplate.count(query, OneMachineFileResult.class);
+ return Result.ok().data(resultList).total(total);
}
/**
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 f37f81f..66bdfe7 100644
--- a/ycl-server/src/main/java/com/ycl/task/HKTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/HKTask.java
@@ -291,4 +291,52 @@
log.info("缁撴潫浜鸿劯璁惧鎶芥鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
}
+ //娴嬭瘯
+ public void test() {
+ log.info("娴嬭瘯娴峰悍鎺ュ彛");
+ HkApiUtil.sendAPI("/api/dqd/service/rs/v2/data/faceDetect/query", new FaceDeviceSamplingParam(), Object.class);
+ log.info("缁撴潫->{}锛岃皟鐢ㄦ垚鍔�");
+ }
+
+ //娴嬭瘯
+ public void test1() {
+ log.info("娴嬭瘯娴峰悍鎺ュ彛");
+ HkApiUtil.sendAPI("/api/dqd/service/rs/v1/device/coordinateExpInfo/query", new FaceDeviceSamplingParam(), Object.class);
+ log.info("缁撴潫->{}锛岃皟鐢ㄦ垚鍔�");
+ }
+
+ //娴嬭瘯
+ public void test2() {
+ log.info("娴嬭瘯娴峰悍鎺ュ彛");
+ HkApiUtil.sendAPI("/api/dqd/service/rs/v1/device/gbCodeExpInfo/query", new FaceDeviceSamplingParam(), Object.class);
+ log.info("缁撴潫->{}锛岃皟鐢ㄦ垚鍔�");
+ }
+
+ //娴嬭瘯
+ public void test3() {
+ log.info("娴嬭瘯娴峰悍鎺ュ彛");
+ HkApiUtil.sendAPI("/dqd/service/rs/v2/data/passDetect/query", new FaceDeviceSamplingParam(), Object.class);
+ log.info("缁撴潫->{}锛岃皟鐢ㄦ垚鍔�");
+ }
+
+ //瑙ｆ瀽鏁版嵁
+ 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