From 9da24a8dfa3766cec565b092fc105f7f006de070 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期三, 21 八月 2024 11:52:25 +0800 Subject: [PATCH] 合同考核点位在线率记录 --- ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 160 ++++++++++++++++++++++++++++++++--------------------- 1 files changed, 96 insertions(+), 64 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 9e70a0e..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,16 +2,18 @@ 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; 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 +40,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 +53,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 +65,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 +79,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); } /** @@ -86,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()); @@ -99,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); } /** @@ -110,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()); @@ -124,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); } /** @@ -134,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()); @@ -148,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); } /** @@ -158,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()); @@ -172,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); } /** @@ -183,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()); @@ -197,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); } /** @@ -208,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()); @@ -222,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); } /** @@ -233,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()); @@ -247,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); } /** @@ -258,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()); @@ -272,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); } /** @@ -283,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()); @@ -297,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); } /** @@ -308,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()); @@ -322,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); } @@ -335,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()); @@ -349,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); } /** @@ -359,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()); @@ -373,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); } /** @@ -383,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()); @@ -397,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); } /** @@ -407,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()); @@ -421,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); } /** @@ -431,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()); @@ -445,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); } /** @@ -455,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()); @@ -469,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); } /** @@ -479,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()); @@ -493,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); } /** @@ -503,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()); @@ -517,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); } /** @@ -527,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()); @@ -541,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); } /** @@ -551,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()); @@ -565,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); } /** @@ -575,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()); @@ -589,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); } /** @@ -600,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()); @@ -613,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); } /** @@ -624,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()); @@ -638,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); } /** @@ -648,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()); @@ -662,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); } /** @@ -672,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()); @@ -686,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); } /** @@ -696,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()); @@ -710,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); } /** @@ -720,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()); @@ -734,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); } /** @@ -744,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()); @@ -758,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); } } -- Gitblit v1.8.0