From 24d45b49ad478538b2c0ba4eda1f2725ac3ca049 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 12 八月 2024 17:06:12 +0800
Subject: [PATCH] 数据中心增加查询总条数

---
 ycl-server/src/main/java/com/ycl/task/HKTask.java                                 |    2 
 ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java |  145 +++++++++++++++++-----------
 ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java    |   40 ++++----
 ycl-server/src/main/java/com/ycl/platform/service/DataCenterService.java          |   57 +++++-----
 4 files changed, 137 insertions(+), 107 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 fc8c849..1a57746 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
@@ -69,7 +69,7 @@
      */
     @GetMapping("/videoOneMachineDocumentQualified")
     public Result videoOneMachineDocumentQualified(DataCenterQuery query) {
-        return Result.ok().data(dataCenterService.videoOneMachineDocumentQualified(query));
+        return dataCenterService.videoOneMachineDocumentQualified(query);
     }
 
     /**
@@ -80,7 +80,7 @@
      */
     @GetMapping("/videoAssessmentFileRatio")
     public Result videoAssessmentFileRatio(DataCenterQuery query) {
-        return Result.ok().data(dataCenterService.videoAssessmentFileRatio(query));
+        return dataCenterService.videoAssessmentFileRatio(query);
     }
 
     /**
@@ -91,7 +91,7 @@
      */
     @GetMapping("/videoAvailabilityRate")
     public Result videoAvailabilityRate(DataCenterQuery query) {
-        return Result.ok().data(dataCenterService.videoAvailabilityRate(query));
+        return dataCenterService.videoAvailabilityRate(query);
     }
 
     /**
@@ -102,7 +102,7 @@
      */
     @GetMapping("/videoImportantPointAvailabilityRate")
     public Result videoImportantPointAvailabilityRate(DataCenterQuery query) {
-        return Result.ok().data(dataCenterService.videoImportantPointAvailabilityRate(query));
+        return dataCenterService.videoImportantPointAvailabilityRate(query);
     }
 
     /**
@@ -113,7 +113,7 @@
      */
     @GetMapping("/videoLabelingAccuracy")
     public Result videoLabelingAccuracy(DataCenterQuery query) {
-        return Result.ok().data(dataCenterService.videoLabelingAccuracy(query));
+        return dataCenterService.videoLabelingAccuracy(query);
     }
 
     /**
@@ -124,7 +124,7 @@
      */
     @GetMapping("/videoImportantPointLabelingAccuracy")
     public Result videoImportantPointLabelingAccuracy(DataCenterQuery query) {
-        return Result.ok().data(dataCenterService.videoImportantPointLabelingAccuracy(query));
+        return dataCenterService.videoImportantPointLabelingAccuracy(query);
     }
 
     /**
@@ -135,7 +135,7 @@
      */
     @GetMapping("/videoCheckTimeAccuracy")
     public Result videoCheckTimeAccuracy(DataCenterQuery query) {
-        return Result.ok().data(dataCenterService.videoCheckTimeAccuracy(query));
+        return dataCenterService.videoCheckTimeAccuracy(query);
     }
 
     /**
@@ -146,7 +146,7 @@
      */
     @GetMapping("/videoImportantPointCheckTimeAccuracy")
     public Result videoImportantPointCheckTimeAccuracy(DataCenterQuery query) {
-        return Result.ok().data(dataCenterService.videoImportantPointCheckTimeAccuracy(query));
+        return dataCenterService.videoImportantPointCheckTimeAccuracy(query);
     }
 
     /**
@@ -157,7 +157,7 @@
      */
     @GetMapping("/videoImportantPointOnlineRate")
     public Result videoImportantPointOnlineRate(DataCenterQuery query) {
-        return Result.ok().data(dataCenterService.videoImportantPointOnlineRate(query));
+        return dataCenterService.videoImportantPointOnlineRate(query);
     }
 
     /**
@@ -168,7 +168,7 @@
      */
     @GetMapping("/videoImportantPointImageOnlineRate")
     public Result videoImportantPointImageOnlineRate(DataCenterQuery query) {
-        return Result.ok().data(dataCenterService.videoImportantPointImageOnlineRate(query));
+        return dataCenterService.videoImportantPointImageOnlineRate(query);
     }
 
 
@@ -183,7 +183,7 @@
      */
     @GetMapping("/vehicleViewDockStable")
     public Result vehicleViewDockStable(DataCenterQuery query) {
-        return Result.ok().data(dataCenterService.vehicleViewDockStable(query));
+        return dataCenterService.vehicleViewDockStable(query);
     }
 
     /**
@@ -194,7 +194,7 @@
      */
     @GetMapping("/vehiclePointOnlineRate")
     public Result vehiclePointOnlineRate(DataCenterQuery query) {
-        return Result.ok().data(dataCenterService.vehiclePointOnlineRate(query));
+        return dataCenterService.vehiclePointOnlineRate(query);
     }
 
     /**
@@ -205,7 +205,7 @@
      */
     @GetMapping("/vehicleNetDeviceDirectoryConsistency")
     public Result vehicleNetDeviceDirectoryConsistency(DataCenterQuery query) {
-        return Result.ok().data(dataCenterService.vehicleNetDeviceDirectoryConsistency(query));
+        return dataCenterService.vehicleNetDeviceDirectoryConsistency(query);
     }
 
     /**
@@ -216,7 +216,7 @@
      */
     @GetMapping("/vehicleCollectionConsistency")
     public Result vehicleCollectionConsistency(DataCenterQuery query) {
-        return Result.ok().data(dataCenterService.vehicleCollectionConsistency(query));
+        return dataCenterService.vehicleCollectionConsistency(query);
     }
 
     /**
@@ -227,7 +227,7 @@
      */
     @GetMapping("/vehicleCollectionDataIntegrity")
     public Result vehicleCollectionDataIntegrity(DataCenterQuery query) {
-        return Result.ok().data(dataCenterService.vehicleCollectionDataIntegrity(query));
+        return dataCenterService.vehicleCollectionDataIntegrity(query);
     }
 
     /**
@@ -238,7 +238,7 @@
      */
     @GetMapping("/vehicleCollectionDataCaptured")
     public Result vehicleCollectionDataCaptured(DataCenterQuery query) {
-        return Result.ok().data(dataCenterService.vehicleCollectionDataCaptured(query));
+        return dataCenterService.vehicleCollectionDataCaptured(query);
     }
 
     /**
@@ -249,7 +249,7 @@
      */
     @GetMapping("/vehicleClockAccuracy")
     public Result vehicleClockAccuracy(DataCenterQuery query) {
-        return Result.ok().data(dataCenterService.vehicleClockAccuracy(query));
+        return dataCenterService.vehicleClockAccuracy(query);
     }
 
     /**
@@ -260,7 +260,7 @@
      */
     @GetMapping("/vehicleTimelyUploadAccuracy")
     public Result vehicleTimelyUploadAccuracy(DataCenterQuery query) {
-        return Result.ok().data(dataCenterService.vehicleTimelyUploadAccuracy(query));
+        return dataCenterService.vehicleTimelyUploadAccuracy(query);
     }
 
     /**
@@ -271,7 +271,7 @@
      */
     @GetMapping("/vehicleUrlAccuracy")
     public Result vehicleUrlAccuracy(DataCenterQuery query) {
-        return Result.ok().data(dataCenterService.vehicleUrlAccuracy(query));
+        return dataCenterService.vehicleUrlAccuracy(query);
     }
 
     /**
@@ -282,7 +282,7 @@
      */
     @GetMapping("/vehicleBigImgAccuracy")
     public Result vehicleBigImgAccuracy(DataCenterQuery query) {
-        return Result.ok().data(dataCenterService.vehicleBigImgAccuracy(query));
+        return dataCenterService.vehicleBigImgAccuracy(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 5b1d873..db4bf96 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
@@ -2,6 +2,7 @@
 
 import com.ycl.platform.domain.query.DataCenterQuery;
 import com.ycl.platform.domain.result.HK.*;
+import com.ycl.platform.domain.result.UY.MonitorQualifyResult;
 import com.ycl.platform.domain.result.UY.OneMachineFileResult;
 import com.ycl.platform.domain.result.UY.RecordMetaDSumResult;
 import com.ycl.system.Result;
@@ -39,7 +40,7 @@
      * @param query
      * @return
      */
-    List<OneMachineFileResult> videoOneMachineDocumentQualified(DataCenterQuery query);
+    Result videoOneMachineDocumentQualified(DataCenterQuery query);
 
     /**
      * 瑙嗛锛氭。妗堣�冩牳姣�
@@ -47,7 +48,7 @@
      * @param query
      * @return
      */
-    List<OneMachineFileResult> videoAssessmentFileRatio(DataCenterQuery query);
+    Result videoAssessmentFileRatio(DataCenterQuery query);
 
     /**
      * 瑙嗛锛氬綍鍍忓彲鐢ㄧ巼
@@ -55,7 +56,7 @@
      * @param query
      * @return
      */
-    List<RecordMetaDSumResult> videoAvailabilityRate(DataCenterQuery query);
+    Result videoAvailabilityRate(DataCenterQuery query);
 
     /**
      * 瑙嗛锛氶噸鐐圭偣浣嶅綍鍍忓彲鐢ㄧ巼
@@ -63,7 +64,7 @@
      * @param query
      * @return
      */
-    List<RecordMetaDSumResult> videoImportantPointAvailabilityRate(DataCenterQuery query);
+    Result videoImportantPointAvailabilityRate(DataCenterQuery query);
 
     /**
      * 瑙嗛锛氭爣娉ㄦ纭巼
@@ -72,7 +73,7 @@
      * @return
      */
     // TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
-    List<OneMachineFileResult> videoLabelingAccuracy(DataCenterQuery query);
+    Result videoLabelingAccuracy(DataCenterQuery query);
 
     /**
      * 瑙嗛锛氶噸鐐圭偣浣嶆爣娉ㄦ纭巼
@@ -81,7 +82,7 @@
      * @return
      */
     // TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
-    List<OneMachineFileResult> videoImportantPointLabelingAccuracy(DataCenterQuery query);
+    Result videoImportantPointLabelingAccuracy(DataCenterQuery query);
 
     /**
      * 瑙嗛锛氭牎鏃舵纭巼
@@ -90,7 +91,7 @@
      * @return
      */
     // TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
-    List<OneMachineFileResult> videoCheckTimeAccuracy(DataCenterQuery query);
+    Result videoCheckTimeAccuracy(DataCenterQuery query);
 
     /**
      * 瑙嗛锛氶噸鐐圭偣浣嶆牎鏃舵纭巼
@@ -99,7 +100,7 @@
      * @return
      */
     // TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
-    List<OneMachineFileResult> videoImportantPointCheckTimeAccuracy(DataCenterQuery query);
+    Result videoImportantPointCheckTimeAccuracy(DataCenterQuery query);
 
     /**
      * 瑙嗛锛氶噸鐐圭偣浣嶅湪绾跨巼
@@ -108,7 +109,7 @@
      * @return
      */
     // TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
-    List<OneMachineFileResult> videoImportantPointOnlineRate(DataCenterQuery query);
+    Result videoImportantPointOnlineRate(DataCenterQuery query);
 
     /**
      * 瑙嗛锛氶噸鐐规寚鎸ュ浘鍍忓湪绾跨巼
@@ -117,7 +118,7 @@
      * @return
      */
     // TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
-    List<OneMachineFileResult> videoImportantPointImageOnlineRate(DataCenterQuery query);
+    Result videoImportantPointImageOnlineRate(DataCenterQuery query);
 
 
 
@@ -129,7 +130,7 @@
      * @param query
      * @return
      */
-    List<SnapshotDataMonitorResult> vehicleViewDockStable(DataCenterQuery query);
+    Result vehicleViewDockStable(DataCenterQuery query);
 
     /**
      * 杞﹁締锛氱偣浣嶅湪绾跨巼
@@ -137,7 +138,7 @@
      * @param query
      * @return
      */
-    List<SnapshotDataMonitorResult> vehiclePointOnlineRate(DataCenterQuery query);
+    Result vehiclePointOnlineRate(DataCenterQuery query);
 
     /**
      * 杞﹁締锛氫簰鑱旂綉鍗″彛璁惧鐩綍涓�鑷存��
@@ -145,7 +146,7 @@
      * @param query
      * @return
      */
-    List<OneMachineFileResult> vehicleNetDeviceDirectoryConsistency(DataCenterQuery query);
+    Result vehicleNetDeviceDirectoryConsistency(DataCenterQuery query);
 
     /**
      * 杞﹁締锛氳溅杈嗗崱鍙ｄ俊鎭噰闆嗗噯纭巼
@@ -153,7 +154,7 @@
      * @param query
      * @return
      */
-    List<CrossDetailResult> vehicleCollectionConsistency(DataCenterQuery query);
+    Result vehicleCollectionConsistency(DataCenterQuery query);
 
     /**
      * 杞﹁締锛氳溅杈嗗崱鍙ｈ澶囨姄鎷嶆暟鎹畬鏁存��
@@ -161,7 +162,7 @@
      * @param query
      * @return
      */
-    List<DataIntegrityMonitoringResult> vehicleCollectionDataIntegrity(DataCenterQuery query);
+    Result vehicleCollectionDataIntegrity(DataCenterQuery query);
 
     /**
      * 杞﹁締锛氳溅杈嗗崱鍙ｈ澶囨姄鎷嶆暟鎹噯纭��
@@ -169,7 +170,7 @@
      * @param query
      * @return
      */
-    List<AttrRecognitionMonitorResult> vehicleCollectionDataCaptured(DataCenterQuery query);
+    Result vehicleCollectionDataCaptured(DataCenterQuery query);
 
     /**
      * 杞﹁締锛氳溅杈嗗崱鍙ｈ澶囨椂閽熷噯纭��
@@ -177,7 +178,7 @@
      * @param query
      * @return
      */
-    List<VehicleDeviceInspectionResult> vehicleClockAccuracy(DataCenterQuery query);
+    Result vehicleClockAccuracy(DataCenterQuery query);
 
     /**
      * 杞﹁締锛氳溅杈嗗崱鍙ｈ澶囨姄鎷嶆暟鎹笂浼犲強鏃舵��
@@ -185,7 +186,7 @@
      * @param query
      * @return
      */
-    List<SnapshotDelayMonitorResult> vehicleTimelyUploadAccuracy(DataCenterQuery query);
+    Result vehicleTimelyUploadAccuracy(DataCenterQuery query);
 
     /**
      * 杞﹁締锛氳溅杈嗗崱鍙ｈ澶噓rl鍙敤鎬�
@@ -193,7 +194,7 @@
      * @param query
      * @return
      */
-    List<PicAccessResult> vehicleUrlAccuracy(DataCenterQuery query);
+    Result vehicleUrlAccuracy(DataCenterQuery query);
 
     /**
      * 杞﹁締锛氳溅杈嗗崱鍙ｈ澶囨姄鎷嶆暟鎹ぇ鍥惧彲鐢ㄦ��
@@ -201,7 +202,7 @@
      * @param query
      * @return
      */
-    List<VehicleDeviceSamplingResult> vehicleBigImgAccuracy(DataCenterQuery query);
+    Result vehicleBigImgAccuracy(DataCenterQuery query);
 
 
 
@@ -217,7 +218,7 @@
      * @param query
      * @return
      */
-    List<SnapshotDataMonitorResult> faceViewDockStable(DataCenterQuery query);
+    Result faceViewDockStable(DataCenterQuery query);
 
     /**
      * 浜鸿劯锛氱偣浣嶅湪绾跨巼
@@ -226,7 +227,7 @@
      * @return
      */
     // TODO 鏇存崲鍝嶅簲缁撴灉
-    List<OneMachineFileResult> facePointOnlineRate(DataCenterQuery query);
+    Result facePointOnlineRate(DataCenterQuery query);
 
     /**
      * 浜鸿劯锛氱洰褰曚竴鑷寸巼
@@ -234,7 +235,7 @@
      * @param query
      * @return
      */
-    List<OneMachineFileResult> faceDirectoryConsistency(DataCenterQuery query);
+    Result faceDirectoryConsistency(DataCenterQuery query);
 
     /**
      * 浜鸿劯锛氫汉鑴稿崱鍙ｄ俊鎭噰闆嗗噯纭巼
@@ -242,7 +243,7 @@
      * @param query
      * @return
      */
-    List<CrossDetailResult> faceCollectionConsistency(DataCenterQuery query);
+    Result faceCollectionConsistency(DataCenterQuery query);
 
     /**
      * 浜鸿劯锛氳澶囨姄鎷嶅浘鐗囧悎鏍兼��
@@ -250,7 +251,7 @@
      * @param query
      * @return
      */
-    List<MonitoringDetailResult> faceImgQualification(DataCenterQuery query);
+    Result faceImgQualification(DataCenterQuery query);
 
     /**
      * 浜鸿劯锛氳澶囨姄鎷嶅浘鐗囨椂閽熷噯纭��
@@ -258,7 +259,7 @@
      * @param query
      * @return
      */
-    List<FaceDeviceInspectionResult> faceCapturesImagesAccuracy(DataCenterQuery query);
+    Result faceCapturesImagesAccuracy(DataCenterQuery query);
 
     /**
      * 浜鸿劯锛氭姄鎷嶄汉鑴告暟鎹笂浼犲強鏃舵��
@@ -266,7 +267,7 @@
      * @param query
      * @return
      */
-    List<FaceDeviceInspectionResult> faceTimelyUpload(DataCenterQuery query);
+    Result faceTimelyUpload(DataCenterQuery query);
 
     /**
      * 浜鸿劯锛氫汉鑴稿崱鍙ｈ澶囨姄鎷嶆暟鎹ぇ鍥惧彲鐢ㄦ��
@@ -274,5 +275,5 @@
      * @param query
      * @return
      */
-    List<FaceDeviceSamplingResult> faceAvailabilityOfLargeImg(DataCenterQuery query);
+    Result faceAvailabilityOfLargeImg(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 0c1c44c..7e35095 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
@@ -2,6 +2,7 @@
 
 import com.ycl.platform.domain.query.DataCenterQuery;
 import com.ycl.platform.domain.result.HK.*;
+import com.ycl.platform.domain.result.UY.MonitorQualifyResult;
 import com.ycl.platform.domain.result.UY.OneMachineFileResult;
 import com.ycl.platform.domain.result.UY.RecordMetaDSumResult;
 import com.ycl.platform.domain.result.UY.VideoOnlineResult;
@@ -89,7 +90,7 @@
      * @return
      */
     @Override
-    public List<OneMachineFileResult> videoOneMachineDocumentQualified(DataCenterQuery params) {
+    public Result videoOneMachineDocumentQualified(DataCenterQuery params) {
         Query query = new Query();
         // 鍏ㄦ枃绱㈠紩鏌ヨ
         MongoUtil.fullText(query, params.getKeyword());
@@ -102,8 +103,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<MonitorQualifyResult> resultList = mongoTemplate.find(query, MonitorQualifyResult.class);
+        long total = mongoTemplate.count(query, MonitorQualifyResult.class);
+        return Result.ok().data(resultList).total(total);
     }
 
     /**
@@ -113,7 +115,7 @@
      * @return
      */
     @Override
-    public List<OneMachineFileResult> videoAssessmentFileRatio(DataCenterQuery params) {
+    public Result videoAssessmentFileRatio(DataCenterQuery params) {
         Query query = new Query();
         // 鍏ㄦ枃绱㈠紩鏌ヨ
         MongoUtil.fullText(query, params.getKeyword());
@@ -127,7 +129,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);
     }
 
     /**
@@ -137,7 +140,7 @@
      * @return
      */
     @Override
-    public List<RecordMetaDSumResult> videoAvailabilityRate(DataCenterQuery params) {
+    public Result videoAvailabilityRate(DataCenterQuery params) {
         Query query = new Query();
         // 鍏ㄦ枃绱㈠紩鏌ヨ
         MongoUtil.fullText(query, params.getKeyword());
@@ -151,7 +154,8 @@
         query.addCriteria(criteria);
         query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
         List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
-        return resultList;
+        long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
+        return Result.ok().data(resultList).total(total);
     }
 
     /**
@@ -161,7 +165,7 @@
      * @return
      */
     @Override
-    public List<RecordMetaDSumResult> videoImportantPointAvailabilityRate(DataCenterQuery params) {
+    public Result videoImportantPointAvailabilityRate(DataCenterQuery params) {
         Query query = new Query();
         // 鍏ㄦ枃绱㈠紩鏌ヨ
         MongoUtil.fullText(query, params.getKeyword());
@@ -175,7 +179,8 @@
         query.addCriteria(criteria);
         query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
         List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
-        return resultList;
+        long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
+        return Result.ok().data(resultList).total(total);
     }
 
     /**
@@ -186,7 +191,7 @@
      */
     // TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
     @Override
-    public List<OneMachineFileResult> videoLabelingAccuracy(DataCenterQuery params) {
+    public Result videoLabelingAccuracy(DataCenterQuery params) {
         Query query = new Query();
         // 鍏ㄦ枃绱㈠紩鏌ヨ
         MongoUtil.fullText(query, params.getKeyword());
@@ -200,7 +205,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);
     }
 
     /**
@@ -211,7 +217,7 @@
      */
     // TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
     @Override
-    public List<OneMachineFileResult> videoImportantPointLabelingAccuracy(DataCenterQuery params) {
+    public Result videoImportantPointLabelingAccuracy(DataCenterQuery params) {
         Query query = new Query();
         // 鍏ㄦ枃绱㈠紩鏌ヨ
         MongoUtil.fullText(query, params.getKeyword());
@@ -225,7 +231,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);
     }
 
     /**
@@ -236,7 +243,7 @@
      */
     // TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
     @Override
-    public List<OneMachineFileResult> videoCheckTimeAccuracy(DataCenterQuery params) {
+    public Result videoCheckTimeAccuracy(DataCenterQuery params) {
         Query query = new Query();
         // 鍏ㄦ枃绱㈠紩鏌ヨ
         MongoUtil.fullText(query, params.getKeyword());
@@ -250,7 +257,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);
     }
 
     /**
@@ -261,7 +269,7 @@
      */
     // TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
     @Override
-    public List<OneMachineFileResult> videoImportantPointCheckTimeAccuracy(DataCenterQuery params) {
+    public Result videoImportantPointCheckTimeAccuracy(DataCenterQuery params) {
         Query query = new Query();
         // 鍏ㄦ枃绱㈠紩鏌ヨ
         MongoUtil.fullText(query, params.getKeyword());
@@ -275,7 +283,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);
     }
 
     /**
@@ -286,7 +295,7 @@
      */
     // TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
     @Override
-    public List<OneMachineFileResult> videoImportantPointOnlineRate(DataCenterQuery params) {
+    public Result videoImportantPointOnlineRate(DataCenterQuery params) {
         Query query = new Query();
         // 鍏ㄦ枃绱㈠紩鏌ヨ
         MongoUtil.fullText(query, params.getKeyword());
@@ -300,7 +309,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);
     }
 
     /**
@@ -311,7 +321,7 @@
      */
     // TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
     @Override
-    public List<OneMachineFileResult> videoImportantPointImageOnlineRate(DataCenterQuery params) {
+    public Result videoImportantPointImageOnlineRate(DataCenterQuery params) {
         Query query = new Query();
         // 鍏ㄦ枃绱㈠紩鏌ヨ
         MongoUtil.fullText(query, params.getKeyword());
@@ -325,7 +335,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);
     }
 
 
@@ -338,7 +349,7 @@
      * @return
      */
     @Override
-    public List<SnapshotDataMonitorResult> vehicleViewDockStable(DataCenterQuery params) {
+    public Result vehicleViewDockStable(DataCenterQuery params) {
         Query query = new Query();
         // 鍏ㄦ枃绱㈠紩鏌ヨ
         MongoUtil.fullText(query, params.getKeyword());
@@ -352,7 +363,8 @@
         query.addCriteria(criteria);
         query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
         List<SnapshotDataMonitorResult> resultList = mongoTemplate.find(query, SnapshotDataMonitorResult.class);
-        return resultList;
+        long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
+        return Result.ok().data(resultList).total(total);
     }
 
     /**
@@ -362,7 +374,7 @@
      * @return
      */
     @Override
-    public List<SnapshotDataMonitorResult> vehiclePointOnlineRate(DataCenterQuery params) {
+    public Result vehiclePointOnlineRate(DataCenterQuery params) {
         Query query = new Query();
         // 鍏ㄦ枃绱㈠紩鏌ヨ
         MongoUtil.fullText(query, params.getKeyword());
@@ -376,7 +388,8 @@
         query.addCriteria(criteria);
         query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
         List<SnapshotDataMonitorResult> resultList = mongoTemplate.find(query, SnapshotDataMonitorResult.class);
-        return resultList;
+        long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
+        return Result.ok().data(resultList).total(total);
     }
 
     /**
@@ -386,7 +399,7 @@
      * @return
      */
     @Override
-    public List<OneMachineFileResult> vehicleNetDeviceDirectoryConsistency(DataCenterQuery params) {
+    public Result vehicleNetDeviceDirectoryConsistency(DataCenterQuery params) {
         Query query = new Query();
         // 鍏ㄦ枃绱㈠紩鏌ヨ
         MongoUtil.fullText(query, params.getKeyword());
@@ -400,7 +413,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);
     }
 
     /**
@@ -410,7 +424,7 @@
      * @return
      */
     @Override
-    public List<CrossDetailResult> vehicleCollectionConsistency(DataCenterQuery params) {
+    public Result vehicleCollectionConsistency(DataCenterQuery params) {
         Query query = new Query();
         // 鍏ㄦ枃绱㈠紩鏌ヨ
         MongoUtil.fullText(query, params.getKeyword());
@@ -424,7 +438,8 @@
         query.addCriteria(criteria);
         query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
         List<CrossDetailResult> resultList = mongoTemplate.find(query, CrossDetailResult.class);
-        return resultList;
+        long total = mongoTemplate.count(query, CrossDetailResult.class);
+        return Result.ok().data(resultList).total(total);
     }
 
     /**
@@ -434,7 +449,7 @@
      * @return
      */
     @Override
-    public List<DataIntegrityMonitoringResult> vehicleCollectionDataIntegrity(DataCenterQuery params) {
+    public Result vehicleCollectionDataIntegrity(DataCenterQuery params) {
         Query query = new Query();
         // 鍏ㄦ枃绱㈠紩鏌ヨ
         MongoUtil.fullText(query, params.getKeyword());
@@ -448,7 +463,8 @@
         query.addCriteria(criteria);
         query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
         List<DataIntegrityMonitoringResult> resultList = mongoTemplate.find(query, DataIntegrityMonitoringResult.class);
-        return resultList;
+        long total = mongoTemplate.count(query, DataIntegrityMonitoringResult.class);
+        return Result.ok().data(resultList).total(total);
     }
 
     /**
@@ -458,7 +474,7 @@
      * @return
      */
     @Override
-    public List<AttrRecognitionMonitorResult> vehicleCollectionDataCaptured(DataCenterQuery params) {
+    public Result vehicleCollectionDataCaptured(DataCenterQuery params) {
         Query query = new Query();
         // 鍏ㄦ枃绱㈠紩鏌ヨ
         MongoUtil.fullText(query, params.getKeyword());
@@ -472,7 +488,8 @@
         query.addCriteria(criteria);
         query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
         List<AttrRecognitionMonitorResult> resultList = mongoTemplate.find(query, AttrRecognitionMonitorResult.class);
-        return resultList;
+        long total = mongoTemplate.count(query, AttrRecognitionMonitorResult.class);
+        return Result.ok().data(resultList).total(total);
     }
 
     /**
@@ -482,7 +499,7 @@
      * @return
      */
     @Override
-    public List<VehicleDeviceInspectionResult> vehicleClockAccuracy(DataCenterQuery params) {
+    public Result vehicleClockAccuracy(DataCenterQuery params) {
         Query query = new Query();
         // 鍏ㄦ枃绱㈠紩鏌ヨ
         MongoUtil.fullText(query, params.getKeyword());
@@ -496,7 +513,8 @@
         query.addCriteria(criteria);
         query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
         List<VehicleDeviceInspectionResult> resultList = mongoTemplate.find(query, VehicleDeviceInspectionResult.class);
-        return resultList;
+        long total = mongoTemplate.count(query, VehicleDeviceInspectionResult.class);
+        return Result.ok().data(resultList).total(total);
     }
 
     /**
@@ -506,7 +524,7 @@
      * @return
      */
     @Override
-    public List<SnapshotDelayMonitorResult> vehicleTimelyUploadAccuracy(DataCenterQuery params) {
+    public Result vehicleTimelyUploadAccuracy(DataCenterQuery params) {
         Query query = new Query();
         // 鍏ㄦ枃绱㈠紩鏌ヨ
         MongoUtil.fullText(query, params.getKeyword());
@@ -520,7 +538,8 @@
         query.addCriteria(criteria);
         query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
         List<SnapshotDelayMonitorResult> resultList = mongoTemplate.find(query, SnapshotDelayMonitorResult.class);
-        return resultList;
+        long total = mongoTemplate.count(query, SnapshotDelayMonitorResult.class);
+        return Result.ok().data(resultList).total(total);
     }
 
     /**
@@ -530,7 +549,7 @@
      * @return
      */
     @Override
-    public List<PicAccessResult> vehicleUrlAccuracy(DataCenterQuery params) {
+    public Result vehicleUrlAccuracy(DataCenterQuery params) {
         Query query = new Query();
         // 鍏ㄦ枃绱㈠紩鏌ヨ
         MongoUtil.fullText(query, params.getKeyword());
@@ -544,7 +563,8 @@
         query.addCriteria(criteria);
         query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
         List<PicAccessResult> resultList = mongoTemplate.find(query, PicAccessResult.class);
-        return resultList;
+        long total = mongoTemplate.count(query, PicAccessResult.class);
+        return Result.ok().data(resultList).total(total);
     }
 
     /**
@@ -554,7 +574,7 @@
      * @return
      */
     @Override
-    public List<VehicleDeviceSamplingResult> vehicleBigImgAccuracy(DataCenterQuery params) {
+    public Result vehicleBigImgAccuracy(DataCenterQuery params) {
         Query query = new Query();
         // 鍏ㄦ枃绱㈠紩鏌ヨ
         MongoUtil.fullText(query, params.getKeyword());
@@ -568,7 +588,8 @@
         query.addCriteria(criteria);
         query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
         List<VehicleDeviceSamplingResult> resultList = mongoTemplate.find(query, VehicleDeviceSamplingResult.class);
-        return resultList;
+        long total = mongoTemplate.count(query, VehicleDeviceSamplingResult.class);
+        return Result.ok().data(resultList).total(total);
     }
 
     /**
@@ -578,7 +599,7 @@
      * @return
      */
     @Override
-    public List<SnapshotDataMonitorResult> faceViewDockStable(DataCenterQuery params) {
+    public Result faceViewDockStable(DataCenterQuery params) {
         Query query = new Query();
         // 鍏ㄦ枃绱㈠紩鏌ヨ
         MongoUtil.fullText(query, params.getKeyword());
@@ -592,7 +613,8 @@
         query.addCriteria(criteria);
         query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
         List<SnapshotDataMonitorResult> resultList = mongoTemplate.find(query, SnapshotDataMonitorResult.class);
-        return resultList;
+        long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
+        return Result.ok().data(resultList).total(total);
     }
 
     /**
@@ -603,7 +625,7 @@
      */
     // TODO 鏇存崲鍝嶅簲缁撴灉
     @Override
-    public List<OneMachineFileResult> facePointOnlineRate(DataCenterQuery params) {
+    public Result facePointOnlineRate(DataCenterQuery params) {
         Query query = new Query();
         // 鍏ㄦ枃绱㈠紩鏌ヨ
         MongoUtil.fullText(query, params.getKeyword());
@@ -616,8 +638,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<SnapshotDataMonitorResult> resultList = mongoTemplate.find(query, SnapshotDataMonitorResult.class);
+        long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
+        return Result.ok().data(resultList).total(total);
     }
 
     /**
@@ -627,7 +650,7 @@
      * @return
      */
     @Override
-    public List<OneMachineFileResult> faceDirectoryConsistency(DataCenterQuery params) {
+    public Result faceDirectoryConsistency(DataCenterQuery params) {
         Query query = new Query();
         // 鍏ㄦ枃绱㈠紩鏌ヨ
         MongoUtil.fullText(query, params.getKeyword());
@@ -641,7 +664,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);
     }
 
     /**
@@ -651,7 +675,7 @@
      * @return
      */
     @Override
-    public List<CrossDetailResult> faceCollectionConsistency(DataCenterQuery params) {
+    public Result faceCollectionConsistency(DataCenterQuery params) {
         Query query = new Query();
         // 鍏ㄦ枃绱㈠紩鏌ヨ
         MongoUtil.fullText(query, params.getKeyword());
@@ -665,7 +689,8 @@
         query.addCriteria(criteria);
         query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
         List<CrossDetailResult> resultList = mongoTemplate.find(query, CrossDetailResult.class);
-        return resultList;
+        long total = mongoTemplate.count(query, CrossDetailResult.class);
+        return Result.ok().data(resultList).total(total);
     }
 
     /**
@@ -675,7 +700,7 @@
      * @return
      */
     @Override
-    public List<MonitoringDetailResult> faceImgQualification(DataCenterQuery params) {
+    public Result faceImgQualification(DataCenterQuery params) {
         Query query = new Query();
         // 鍏ㄦ枃绱㈠紩鏌ヨ
         MongoUtil.fullText(query, params.getKeyword());
@@ -689,7 +714,8 @@
         query.addCriteria(criteria);
         query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
         List<MonitoringDetailResult> resultList = mongoTemplate.find(query, MonitoringDetailResult.class);
-        return resultList;
+        long total = mongoTemplate.count(query, MonitoringDetailResult.class);
+        return Result.ok().data(resultList).total(total);
     }
 
     /**
@@ -699,7 +725,7 @@
      * @return
      */
     @Override
-    public List<FaceDeviceInspectionResult> faceCapturesImagesAccuracy(DataCenterQuery params) {
+    public Result faceCapturesImagesAccuracy(DataCenterQuery params) {
         Query query = new Query();
         // 鍏ㄦ枃绱㈠紩鏌ヨ
         MongoUtil.fullText(query, params.getKeyword());
@@ -713,7 +739,8 @@
         query.addCriteria(criteria);
         query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
         List<FaceDeviceInspectionResult> resultList = mongoTemplate.find(query, FaceDeviceInspectionResult.class);
-        return resultList;
+        long total = mongoTemplate.count(query, FaceDeviceInspectionResult.class);
+        return Result.ok().data(resultList).total(total);
     }
 
     /**
@@ -723,7 +750,7 @@
      * @return
      */
     @Override
-    public List<FaceDeviceInspectionResult> faceTimelyUpload(DataCenterQuery params) {
+    public Result faceTimelyUpload(DataCenterQuery params) {
         Query query = new Query();
         // 鍏ㄦ枃绱㈠紩鏌ヨ
         MongoUtil.fullText(query, params.getKeyword());
@@ -737,7 +764,8 @@
         query.addCriteria(criteria);
         query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
         List<FaceDeviceInspectionResult> resultList = mongoTemplate.find(query, FaceDeviceInspectionResult.class);
-        return resultList;
+        long total = mongoTemplate.count(query, FaceDeviceInspectionResult.class);
+        return Result.ok().data(resultList).total(total);
     }
 
     /**
@@ -747,7 +775,7 @@
      * @return
      */
     @Override
-    public List<FaceDeviceSamplingResult> faceAvailabilityOfLargeImg(DataCenterQuery params) {
+    public Result faceAvailabilityOfLargeImg(DataCenterQuery params) {
         Query query = new Query();
         // 鍏ㄦ枃绱㈠紩鏌ヨ
         MongoUtil.fullText(query, params.getKeyword());
@@ -761,6 +789,7 @@
         query.addCriteria(criteria);
         query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
         List<FaceDeviceSamplingResult> resultList = mongoTemplate.find(query, FaceDeviceSamplingResult.class);
-        return resultList;
+        long total = mongoTemplate.count(query, FaceDeviceSamplingResult.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 66bdfe7..adb6cba 100644
--- a/ycl-server/src/main/java/com/ycl/task/HKTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/HKTask.java
@@ -315,7 +315,7 @@
     //娴嬭瘯
     public void test3() {
         log.info("娴嬭瘯娴峰悍鎺ュ彛");
-        HkApiUtil.sendAPI("/dqd/service/rs/v2/data/passDetect/query", new FaceDeviceSamplingParam(), Object.class);
+        HkApiUtil.sendAPI("/api/dqd/service/rs/v2/data/passDetect/query", new FaceDeviceSamplingParam(), Object.class);
         log.info("缁撴潫->{}锛岃皟鐢ㄦ垚鍔�");
     }
 

--
Gitblit v1.8.0