From ddb3068a51a8af8aa9a8f8c2cb9b6e9228b0c8d9 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期三, 28 八月 2024 11:53:27 +0800 Subject: [PATCH] 同步国标设备、点播定时任务优化 --- ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 193 ++++++++++++++++++++++++++++++------------------ 1 files changed, 121 insertions(+), 72 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..394332d 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 @@ -1,17 +1,27 @@ package com.ycl.platform.service.impl; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.ycl.platform.domain.entity.ImageResourceSecurityDetail; 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.mapper.ImageResourceSecurityDetailMapper; +import com.ycl.platform.mapper.ImageResourceSecurityMapper; import com.ycl.platform.service.DataCenterService; +import com.ycl.system.Result; +import com.ycl.system.page.TableDataInfo; import com.ycl.utils.MongoUtil; +import constant.HttpStatus; 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; @@ -28,7 +38,8 @@ public class DataCenterServiceImpl implements DataCenterService { private final MongoTemplate mongoTemplate; - + private final ImageResourceSecurityMapper securityMapper; + private final ImageResourceSecurityDetailMapper securityDetailMapper; private final static String TIME_FIELD = "mongoCreateTime"; /** @@ -38,7 +49,7 @@ * @return */ @Override - public List<OneMachineFileResult> videoPointOnlineRate(DataCenterQuery params) { + public Result videoPointOnlineRate(DataCenterQuery params) { Query query = new Query(); // 鍏ㄦ枃绱㈠紩鏌ヨ MongoUtil.fullText(query, params.getKeyword()); @@ -50,9 +61,10 @@ ); } 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<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class); - return resultList; + List<VideoOnlineResult> resultList = mongoTemplate.find(query, VideoOnlineResult.class); + return Result.ok().data(resultList).total(total); } /** @@ -62,7 +74,7 @@ * @return */ @Override - public List<OneMachineFileResult> videoOneMachineDocumentRegister(DataCenterQuery params) { + public Result videoOneMachineDocumentRegister(DataCenterQuery params) { Query query = new Query(); // 鍏ㄦ枃绱㈠紩鏌ヨ MongoUtil.fullText(query, params.getKeyword()); @@ -74,9 +86,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); } /** @@ -86,7 +99,7 @@ * @return */ @Override - public List<OneMachineFileResult> videoOneMachineDocumentQualified(DataCenterQuery params) { + public Result videoOneMachineDocumentQualified(DataCenterQuery params) { Query query = new Query(); // 鍏ㄦ枃绱㈠紩鏌ヨ MongoUtil.fullText(query, params.getKeyword()); @@ -98,9 +111,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); } /** @@ -110,7 +124,7 @@ * @return */ @Override - public List<OneMachineFileResult> videoAssessmentFileRatio(DataCenterQuery params) { + public Result videoAssessmentFileRatio(DataCenterQuery params) { Query query = new Query(); // 鍏ㄦ枃绱㈠紩鏌ヨ MongoUtil.fullText(query, params.getKeyword()); @@ -122,9 +136,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); } /** @@ -134,7 +149,7 @@ * @return */ @Override - public List<RecordMetaDSumResult> videoAvailabilityRate(DataCenterQuery params) { + public Result videoAvailabilityRate(DataCenterQuery params) { Query query = new Query(); // 鍏ㄦ枃绱㈠紩鏌ヨ MongoUtil.fullText(query, params.getKeyword()); @@ -146,9 +161,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); } /** @@ -158,7 +174,7 @@ * @return */ @Override - public List<RecordMetaDSumResult> videoImportantPointAvailabilityRate(DataCenterQuery params) { + public Result videoImportantPointAvailabilityRate(DataCenterQuery params) { Query query = new Query(); // 鍏ㄦ枃绱㈠紩鏌ヨ MongoUtil.fullText(query, params.getKeyword()); @@ -170,9 +186,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); } /** @@ -181,9 +198,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()); @@ -195,9 +211,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); } /** @@ -206,9 +223,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()); @@ -220,9 +236,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); } /** @@ -231,9 +248,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()); @@ -245,9 +261,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); } /** @@ -256,9 +273,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()); @@ -270,9 +286,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); } /** @@ -281,9 +298,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()); @@ -295,9 +311,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); } /** @@ -306,9 +323,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()); @@ -320,9 +336,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); } @@ -335,7 +352,7 @@ * @return */ @Override - public List<SnapshotDataMonitorResult> vehicleViewDockStable(DataCenterQuery params) { + public Result vehicleViewDockStable(DataCenterQuery params) { Query query = new Query(); // 鍏ㄦ枃绱㈠紩鏌ヨ MongoUtil.fullText(query, params.getKeyword()); @@ -347,9 +364,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); } /** @@ -359,7 +377,7 @@ * @return */ @Override - public List<SnapshotDataMonitorResult> vehiclePointOnlineRate(DataCenterQuery params) { + public Result vehiclePointOnlineRate(DataCenterQuery params) { Query query = new Query(); // 鍏ㄦ枃绱㈠紩鏌ヨ MongoUtil.fullText(query, params.getKeyword()); @@ -371,9 +389,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); } /** @@ -383,7 +402,7 @@ * @return */ @Override - public List<OneMachineFileResult> vehicleNetDeviceDirectoryConsistency(DataCenterQuery params) { + public Result vehicleNetDeviceDirectoryConsistency(DataCenterQuery params) { Query query = new Query(); // 鍏ㄦ枃绱㈠紩鏌ヨ MongoUtil.fullText(query, params.getKeyword()); @@ -395,9 +414,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); } /** @@ -407,7 +427,7 @@ * @return */ @Override - public List<CrossDetailResult> vehicleCollectionConsistency(DataCenterQuery params) { + public Result vehicleCollectionConsistency(DataCenterQuery params) { Query query = new Query(); // 鍏ㄦ枃绱㈠紩鏌ヨ MongoUtil.fullText(query, params.getKeyword()); @@ -419,9 +439,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); } /** @@ -431,7 +452,7 @@ * @return */ @Override - public List<DataIntegrityMonitoringResult> vehicleCollectionDataIntegrity(DataCenterQuery params) { + public Result vehicleCollectionDataIntegrity(DataCenterQuery params) { Query query = new Query(); // 鍏ㄦ枃绱㈠紩鏌ヨ MongoUtil.fullText(query, params.getKeyword()); @@ -443,9 +464,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); } /** @@ -455,7 +477,7 @@ * @return */ @Override - public List<AttrRecognitionMonitorResult> vehicleCollectionDataCaptured(DataCenterQuery params) { + public Result vehicleCollectionDataCaptured(DataCenterQuery params) { Query query = new Query(); // 鍏ㄦ枃绱㈠紩鏌ヨ MongoUtil.fullText(query, params.getKeyword()); @@ -467,9 +489,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); } /** @@ -479,7 +502,7 @@ * @return */ @Override - public List<VehicleDeviceInspectionResult> vehicleClockAccuracy(DataCenterQuery params) { + public Result vehicleClockAccuracy(DataCenterQuery params) { Query query = new Query(); // 鍏ㄦ枃绱㈠紩鏌ヨ MongoUtil.fullText(query, params.getKeyword()); @@ -491,9 +514,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); } /** @@ -503,7 +527,7 @@ * @return */ @Override - public List<SnapshotDelayMonitorResult> vehicleTimelyUploadAccuracy(DataCenterQuery params) { + public Result vehicleTimelyUploadAccuracy(DataCenterQuery params) { Query query = new Query(); // 鍏ㄦ枃绱㈠紩鏌ヨ MongoUtil.fullText(query, params.getKeyword()); @@ -515,9 +539,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); } /** @@ -527,7 +552,7 @@ * @return */ @Override - public List<PicAccessResult> vehicleUrlAccuracy(DataCenterQuery params) { + public Result vehicleUrlAccuracy(DataCenterQuery params) { Query query = new Query(); // 鍏ㄦ枃绱㈠紩鏌ヨ MongoUtil.fullText(query, params.getKeyword()); @@ -539,9 +564,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); } /** @@ -551,7 +577,7 @@ * @return */ @Override - public List<VehicleDeviceSamplingResult> vehicleBigImgAccuracy(DataCenterQuery params) { + public Result vehicleBigImgAccuracy(DataCenterQuery params) { Query query = new Query(); // 鍏ㄦ枃绱㈠紩鏌ヨ MongoUtil.fullText(query, params.getKeyword()); @@ -563,9 +589,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); } /** @@ -575,7 +602,7 @@ * @return */ @Override - public List<SnapshotDataMonitorResult> faceViewDockStable(DataCenterQuery params) { + public Result faceViewDockStable(DataCenterQuery params) { Query query = new Query(); // 鍏ㄦ枃绱㈠紩鏌ヨ MongoUtil.fullText(query, params.getKeyword()); @@ -587,9 +614,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); } /** @@ -598,9 +626,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()); @@ -612,9 +639,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); } /** @@ -624,7 +652,7 @@ * @return */ @Override - public List<OneMachineFileResult> faceDirectoryConsistency(DataCenterQuery params) { + public Result faceDirectoryConsistency(DataCenterQuery params) { Query query = new Query(); // 鍏ㄦ枃绱㈠紩鏌ヨ MongoUtil.fullText(query, params.getKeyword()); @@ -636,9 +664,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); } /** @@ -648,7 +677,7 @@ * @return */ @Override - public List<CrossDetailResult> faceCollectionConsistency(DataCenterQuery params) { + public Result faceCollectionConsistency(DataCenterQuery params) { Query query = new Query(); // 鍏ㄦ枃绱㈠紩鏌ヨ MongoUtil.fullText(query, params.getKeyword()); @@ -660,9 +689,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); } /** @@ -672,7 +702,7 @@ * @return */ @Override - public List<MonitoringDetailResult> faceImgQualification(DataCenterQuery params) { + public Result faceImgQualification(DataCenterQuery params) { Query query = new Query(); // 鍏ㄦ枃绱㈠紩鏌ヨ MongoUtil.fullText(query, params.getKeyword()); @@ -684,9 +714,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); } /** @@ -696,7 +727,7 @@ * @return */ @Override - public List<FaceDeviceInspectionResult> faceCapturesImagesAccuracy(DataCenterQuery params) { + public Result faceCapturesImagesAccuracy(DataCenterQuery params) { Query query = new Query(); // 鍏ㄦ枃绱㈠紩鏌ヨ MongoUtil.fullText(query, params.getKeyword()); @@ -708,9 +739,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); } /** @@ -720,7 +752,7 @@ * @return */ @Override - public List<FaceDeviceInspectionResult> faceTimelyUpload(DataCenterQuery params) { + public Result faceTimelyUpload(DataCenterQuery params) { Query query = new Query(); // 鍏ㄦ枃绱㈠紩鏌ヨ MongoUtil.fullText(query, params.getKeyword()); @@ -732,9 +764,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); } /** @@ -744,7 +777,7 @@ * @return */ @Override - public List<FaceDeviceSamplingResult> faceAvailabilityOfLargeImg(DataCenterQuery params) { + public Result faceAvailabilityOfLargeImg(DataCenterQuery params) { Query query = new Query(); // 鍏ㄦ枃绱㈠紩鏌ヨ MongoUtil.fullText(query, params.getKeyword()); @@ -756,8 +789,24 @@ ); } 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); + } + /** + * 瑙嗛锛氳棰戝浘鍍忚祫婧愬畨鍏ㄧ鐞� + * + * @param query + * @return + */ + @Override + public Result videoImageResourceSecurity(DataCenterQuery query) { + ImageResourceSecurityDetail imageResourceSecurityDetail = new ImageResourceSecurityDetail(); + Page<ImageResourceSecurityDetail> page = PageHelper.startPage(query.getPageNum(), query.getPageSize()); + securityDetailMapper.selectImageResourceSecurityDetailList(imageResourceSecurityDetail); + + return Result.ok().data(page.getResult()).total(page.getTotal()); + } } -- Gitblit v1.8.0