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 |   60 ++++++++++++++++++++++++++++++------------------------------
 1 files changed, 30 insertions(+), 30 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 7e35095..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
@@ -52,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);
     }
 
@@ -77,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);
     }
 
@@ -102,9 +102,9 @@
             );
         }
         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<MonitorQualifyResult> resultList = mongoTemplate.find(query, MonitorQualifyResult.class);
-        long total = mongoTemplate.count(query, MonitorQualifyResult.class);
         return Result.ok().data(resultList).total(total);
     }
 
@@ -127,9 +127,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);
     }
 
@@ -152,9 +152,9 @@
             );
         }
         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);
-        long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
         return Result.ok().data(resultList).total(total);
     }
 
@@ -177,9 +177,9 @@
             );
         }
         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);
-        long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
         return Result.ok().data(resultList).total(total);
     }
 
@@ -203,9 +203,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);
     }
 
@@ -229,9 +229,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);
     }
 
@@ -255,9 +255,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);
     }
 
@@ -281,9 +281,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);
     }
 
@@ -307,9 +307,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);
     }
 
@@ -333,9 +333,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);
     }
 
@@ -361,9 +361,9 @@
             );
         }
         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);
-        long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
         return Result.ok().data(resultList).total(total);
     }
 
@@ -386,9 +386,9 @@
             );
         }
         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);
-        long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
         return Result.ok().data(resultList).total(total);
     }
 
@@ -411,9 +411,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);
     }
 
@@ -436,9 +436,9 @@
             );
         }
         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);
-        long total = mongoTemplate.count(query, CrossDetailResult.class);
         return Result.ok().data(resultList).total(total);
     }
 
@@ -461,9 +461,9 @@
             );
         }
         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);
-        long total = mongoTemplate.count(query, DataIntegrityMonitoringResult.class);
         return Result.ok().data(resultList).total(total);
     }
 
@@ -486,9 +486,9 @@
             );
         }
         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);
-        long total = mongoTemplate.count(query, AttrRecognitionMonitorResult.class);
         return Result.ok().data(resultList).total(total);
     }
 
@@ -511,9 +511,9 @@
             );
         }
         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);
-        long total = mongoTemplate.count(query, VehicleDeviceInspectionResult.class);
         return Result.ok().data(resultList).total(total);
     }
 
@@ -536,9 +536,9 @@
             );
         }
         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);
-        long total = mongoTemplate.count(query, SnapshotDelayMonitorResult.class);
         return Result.ok().data(resultList).total(total);
     }
 
@@ -561,9 +561,9 @@
             );
         }
         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);
-        long total = mongoTemplate.count(query, PicAccessResult.class);
         return Result.ok().data(resultList).total(total);
     }
 
@@ -586,9 +586,9 @@
             );
         }
         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);
-        long total = mongoTemplate.count(query, VehicleDeviceSamplingResult.class);
         return Result.ok().data(resultList).total(total);
     }
 
@@ -611,9 +611,9 @@
             );
         }
         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);
-        long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
         return Result.ok().data(resultList).total(total);
     }
 
@@ -637,9 +637,9 @@
             );
         }
         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);
-        long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
         return Result.ok().data(resultList).total(total);
     }
 
@@ -662,9 +662,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);
     }
 
@@ -687,9 +687,9 @@
             );
         }
         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);
-        long total = mongoTemplate.count(query, CrossDetailResult.class);
         return Result.ok().data(resultList).total(total);
     }
 
@@ -712,9 +712,9 @@
             );
         }
         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);
-        long total = mongoTemplate.count(query, MonitoringDetailResult.class);
         return Result.ok().data(resultList).total(total);
     }
 
@@ -737,9 +737,9 @@
             );
         }
         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);
-        long total = mongoTemplate.count(query, FaceDeviceInspectionResult.class);
         return Result.ok().data(resultList).total(total);
     }
 
@@ -762,9 +762,9 @@
             );
         }
         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);
-        long total = mongoTemplate.count(query, FaceDeviceInspectionResult.class);
         return Result.ok().data(resultList).total(total);
     }
 
@@ -787,9 +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);
-        long total = mongoTemplate.count(query, FaceDeviceSamplingResult.class);
         return Result.ok().data(resultList).total(total);
     }
 }

--
Gitblit v1.8.0