From 1901a22a3b2d7a2a076b69ecd78d24ec55d5a3e8 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 22 八月 2024 18:26:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 156 +++++++++++++++++++++++++++++----------------------
1 files changed, 89 insertions(+), 67 deletions(-)
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..f779f18 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;
@@ -51,9 +52,9 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, VideoOnlineResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<VideoOnlineResult> resultList = mongoTemplate.find(query, VideoOnlineResult.class);
- long total = mongoTemplate.count(query, VideoOnlineResult.class);
return Result.ok().data(resultList).total(total);
}
@@ -76,9 +77,9 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, OneMachineFileResult.class);
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);
- long total = mongoTemplate.count(query, OneMachineFileResult.class);
return Result.ok().data(resultList).total(total);
}
@@ -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());
@@ -101,9 +102,10 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, MonitorQualifyResult.class);
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);
+ 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());
@@ -125,9 +127,10 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, OneMachineFileResult.class);
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;
+ 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());
@@ -149,9 +152,10 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
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;
+ 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());
@@ -173,9 +177,10 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
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;
+ return Result.ok().data(resultList).total(total);
}
/**
@@ -184,9 +189,8 @@
* @param params
* @return
*/
- // TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
@Override
- public List<OneMachineFileResult> videoLabelingAccuracy(DataCenterQuery params) {
+ public Result videoLabelingAccuracy(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -198,9 +202,10 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, OneMachineFileResult.class);
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;
+ return Result.ok().data(resultList).total(total);
}
/**
@@ -209,9 +214,8 @@
* @param params
* @return
*/
- // TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
@Override
- public List<OneMachineFileResult> videoImportantPointLabelingAccuracy(DataCenterQuery params) {
+ public Result videoImportantPointLabelingAccuracy(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -223,9 +227,10 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, OneMachineFileResult.class);
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;
+ return Result.ok().data(resultList).total(total);
}
/**
@@ -234,9 +239,8 @@
* @param params
* @return
*/
- // TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
@Override
- public List<OneMachineFileResult> videoCheckTimeAccuracy(DataCenterQuery params) {
+ public Result videoCheckTimeAccuracy(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -248,9 +252,10 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, OneMachineFileResult.class);
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;
+ return Result.ok().data(resultList).total(total);
}
/**
@@ -259,9 +264,8 @@
* @param params
* @return
*/
- // TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
@Override
- public List<OneMachineFileResult> videoImportantPointCheckTimeAccuracy(DataCenterQuery params) {
+ public Result videoImportantPointCheckTimeAccuracy(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -273,9 +277,10 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, OneMachineFileResult.class);
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;
+ return Result.ok().data(resultList).total(total);
}
/**
@@ -284,9 +289,8 @@
* @param params
* @return
*/
- // TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
@Override
- public List<OneMachineFileResult> videoImportantPointOnlineRate(DataCenterQuery params) {
+ public Result videoImportantPointOnlineRate(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -298,9 +302,10 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, OneMachineFileResult.class);
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;
+ return Result.ok().data(resultList).total(total);
}
/**
@@ -309,9 +314,8 @@
* @param params
* @return
*/
- // TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
@Override
- public List<OneMachineFileResult> videoImportantPointImageOnlineRate(DataCenterQuery params) {
+ public Result videoImportantPointImageOnlineRate(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -323,9 +327,10 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, OneMachineFileResult.class);
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;
+ return Result.ok().data(resultList).total(total);
}
@@ -338,7 +343,7 @@
* @return
*/
@Override
- public List<SnapshotDataMonitorResult> vehicleViewDockStable(DataCenterQuery params) {
+ public Result vehicleViewDockStable(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -350,9 +355,10 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
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;
+ return Result.ok().data(resultList).total(total);
}
/**
@@ -362,7 +368,7 @@
* @return
*/
@Override
- public List<SnapshotDataMonitorResult> vehiclePointOnlineRate(DataCenterQuery params) {
+ public Result vehiclePointOnlineRate(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -374,9 +380,10 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
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;
+ return Result.ok().data(resultList).total(total);
}
/**
@@ -386,7 +393,7 @@
* @return
*/
@Override
- public List<OneMachineFileResult> vehicleNetDeviceDirectoryConsistency(DataCenterQuery params) {
+ public Result vehicleNetDeviceDirectoryConsistency(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -398,9 +405,10 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, OneMachineFileResult.class);
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;
+ return Result.ok().data(resultList).total(total);
}
/**
@@ -410,7 +418,7 @@
* @return
*/
@Override
- public List<CrossDetailResult> vehicleCollectionConsistency(DataCenterQuery params) {
+ public Result vehicleCollectionConsistency(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -422,9 +430,10 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, CrossDetailResult.class);
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;
+ return Result.ok().data(resultList).total(total);
}
/**
@@ -434,7 +443,7 @@
* @return
*/
@Override
- public List<DataIntegrityMonitoringResult> vehicleCollectionDataIntegrity(DataCenterQuery params) {
+ public Result vehicleCollectionDataIntegrity(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -446,9 +455,10 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, DataIntegrityMonitoringResult.class);
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;
+ return Result.ok().data(resultList).total(total);
}
/**
@@ -458,7 +468,7 @@
* @return
*/
@Override
- public List<AttrRecognitionMonitorResult> vehicleCollectionDataCaptured(DataCenterQuery params) {
+ public Result vehicleCollectionDataCaptured(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -470,9 +480,10 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, AttrRecognitionMonitorResult.class);
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;
+ return Result.ok().data(resultList).total(total);
}
/**
@@ -482,7 +493,7 @@
* @return
*/
@Override
- public List<VehicleDeviceInspectionResult> vehicleClockAccuracy(DataCenterQuery params) {
+ public Result vehicleClockAccuracy(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -494,9 +505,10 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, VehicleDeviceInspectionResult.class);
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;
+ return Result.ok().data(resultList).total(total);
}
/**
@@ -506,7 +518,7 @@
* @return
*/
@Override
- public List<SnapshotDelayMonitorResult> vehicleTimelyUploadAccuracy(DataCenterQuery params) {
+ public Result vehicleTimelyUploadAccuracy(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -518,9 +530,10 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, SnapshotDelayMonitorResult.class);
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;
+ return Result.ok().data(resultList).total(total);
}
/**
@@ -530,7 +543,7 @@
* @return
*/
@Override
- public List<PicAccessResult> vehicleUrlAccuracy(DataCenterQuery params) {
+ public Result vehicleUrlAccuracy(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -542,9 +555,10 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, PicAccessResult.class);
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;
+ return Result.ok().data(resultList).total(total);
}
/**
@@ -554,7 +568,7 @@
* @return
*/
@Override
- public List<VehicleDeviceSamplingResult> vehicleBigImgAccuracy(DataCenterQuery params) {
+ public Result vehicleBigImgAccuracy(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -566,9 +580,10 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, VehicleDeviceSamplingResult.class);
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;
+ return Result.ok().data(resultList).total(total);
}
/**
@@ -578,7 +593,7 @@
* @return
*/
@Override
- public List<SnapshotDataMonitorResult> faceViewDockStable(DataCenterQuery params) {
+ public Result faceViewDockStable(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -590,9 +605,10 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
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;
+ return Result.ok().data(resultList).total(total);
}
/**
@@ -601,9 +617,8 @@
* @param params
* @return
*/
- // TODO 鏇存崲鍝嶅簲缁撴灉
@Override
- public List<OneMachineFileResult> facePointOnlineRate(DataCenterQuery params) {
+ public Result facePointOnlineRate(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -615,9 +630,10 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
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);
+ return Result.ok().data(resultList).total(total);
}
/**
@@ -627,7 +643,7 @@
* @return
*/
@Override
- public List<OneMachineFileResult> faceDirectoryConsistency(DataCenterQuery params) {
+ public Result faceDirectoryConsistency(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -639,9 +655,10 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, OneMachineFileResult.class);
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;
+ return Result.ok().data(resultList).total(total);
}
/**
@@ -651,7 +668,7 @@
* @return
*/
@Override
- public List<CrossDetailResult> faceCollectionConsistency(DataCenterQuery params) {
+ public Result faceCollectionConsistency(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -663,9 +680,10 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, CrossDetailResult.class);
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;
+ return Result.ok().data(resultList).total(total);
}
/**
@@ -675,7 +693,7 @@
* @return
*/
@Override
- public List<MonitoringDetailResult> faceImgQualification(DataCenterQuery params) {
+ public Result faceImgQualification(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -687,9 +705,10 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, MonitoringDetailResult.class);
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;
+ return Result.ok().data(resultList).total(total);
}
/**
@@ -699,7 +718,7 @@
* @return
*/
@Override
- public List<FaceDeviceInspectionResult> faceCapturesImagesAccuracy(DataCenterQuery params) {
+ public Result faceCapturesImagesAccuracy(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -711,9 +730,10 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, FaceDeviceInspectionResult.class);
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;
+ return Result.ok().data(resultList).total(total);
}
/**
@@ -723,7 +743,7 @@
* @return
*/
@Override
- public List<FaceDeviceInspectionResult> faceTimelyUpload(DataCenterQuery params) {
+ public Result faceTimelyUpload(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -735,9 +755,10 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, FaceDeviceInspectionResult.class);
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;
+ return Result.ok().data(resultList).total(total);
}
/**
@@ -747,7 +768,7 @@
* @return
*/
@Override
- public List<FaceDeviceSamplingResult> faceAvailabilityOfLargeImg(DataCenterQuery params) {
+ public Result faceAvailabilityOfLargeImg(DataCenterQuery params) {
Query query = new Query();
// 鍏ㄦ枃绱㈠紩鏌ヨ
MongoUtil.fullText(query, params.getKeyword());
@@ -759,8 +780,9 @@
);
}
query.addCriteria(criteria);
+ long total = mongoTemplate.count(query, FaceDeviceSamplingResult.class);
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;
+ return Result.ok().data(resultList).total(total);
}
}
--
Gitblit v1.8.0