From 4082ee4d1cd2357771d7f844a57fe4932a1dd4c4 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期三, 21 八月 2024 15:03:46 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 149 +++++++++++++++++++++++++++++-------------------- 1 files changed, 89 insertions(+), 60 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..8b0c6d6 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); } /** @@ -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()); @@ -198,9 +203,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); } /** @@ -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()); @@ -223,9 +229,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); } /** @@ -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()); @@ -248,9 +255,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); } /** @@ -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()); @@ -273,9 +281,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); } /** @@ -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()); @@ -298,9 +307,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); } /** @@ -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()); @@ -323,9 +333,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 +349,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 +361,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 +374,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 +386,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 +399,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 +411,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 +424,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 +436,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 +449,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 +461,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 +474,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 +486,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 +499,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 +511,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 +524,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 +536,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 +549,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 +561,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 +574,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 +586,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 +599,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 +611,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); } /** @@ -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()); @@ -615,9 +637,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 +650,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 +662,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 +675,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 +687,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 +700,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 +712,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 +725,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 +737,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 +750,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 +762,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 +775,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 +787,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