From 0577dce262fc6971f441251cb83b06c1d0461368 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 03 九月 2024 23:24:42 +0800
Subject: [PATCH] 车辆、人脸mongo重构

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java |   82 +++++++++++++++++++++++++----------------
 1 files changed, 50 insertions(+), 32 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 a840d9e..caad6dd 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
@@ -410,9 +410,10 @@
     @Override
     public Result vehicleViewDockStable(DataCenterQuery params) {
 
-        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
 
         long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
+        MongoUtil.setPage(query, params, TIME_FIELD);
         List<SnapshotDataMonitorResult> resultList = mongoTemplate.find(query, SnapshotDataMonitorResult.class);
         // 缁熻鏁�
         long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("1")), SnapshotDataMonitorResult.class);
@@ -434,9 +435,10 @@
     @Override
     public Result vehiclePointOnlineRate(DataCenterQuery params) {
 
-        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
 
         long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
+        MongoUtil.setPage(query, params, TIME_FIELD);
         List<SnapshotDataMonitorResult> resultList = mongoTemplate.find(query, SnapshotDataMonitorResult.class);
         // 缁熻鏁�
         long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("1")), SnapshotDataMonitorResult.class);
@@ -458,16 +460,17 @@
     @Override
     public Result vehicleNetDeviceDirectoryConsistency(DataCenterQuery params) {
 
-        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
 
-        long total = mongoTemplate.count(query, OneMachineFileResult.class);
-        List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
+        long total = mongoTemplate.count(query, MonitorQualifyResult.class);
+        MongoUtil.setPage(query, params, TIME_FIELD);
+        List<MonitorQualifyResult> resultList = mongoTemplate.find(query, MonitorQualifyResult.class);
         // 缁熻鏁�
-        long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), OneMachineFileResult.class);
-        long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), OneMachineFileResult.class);
-        long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*1.*")), OneMachineFileResult.class);
-        long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*2.*")), OneMachineFileResult.class);
-        long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*3.*")), OneMachineFileResult.class);
+        long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), MonitorQualifyResult.class);
+        long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), MonitorQualifyResult.class);
+        long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*1.*")), MonitorQualifyResult.class);
+        long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*2.*")), MonitorQualifyResult.class);
+        long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*3.*")), MonitorQualifyResult.class);
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", Arrays.asList(nonNetwork, network, video, car, face));
         map.put("list", resultList);
@@ -483,9 +486,10 @@
     @Override
     public Result vehicleCollectionConsistency(DataCenterQuery params) {
 
-        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
 
         long total = mongoTemplate.count(query, CrossDetailResult.class);
+        MongoUtil.setPage(query, params, TIME_FIELD);
         List<CrossDetailResult> resultList = mongoTemplate.find(query, CrossDetailResult.class);
         // 缁熻鏁�
         long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("1")), CrossDetailResult.class);
@@ -507,9 +511,10 @@
     @Override
     public Result vehicleCollectionDataIntegrity(DataCenterQuery params) {
 
-        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
 
         long total = mongoTemplate.count(query, DataIntegrityMonitoringResult.class);
+        MongoUtil.setPage(query, params, TIME_FIELD);
         List<DataIntegrityMonitoringResult> resultList = mongoTemplate.find(query, DataIntegrityMonitoringResult.class);
         // 缁熻鏁�
         HashMap<String, Object> map = new HashMap<>();
@@ -527,9 +532,10 @@
     @Override
     public Result vehicleCollectionDataCaptured(DataCenterQuery params) {
 
-        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
 
         long total = mongoTemplate.count(query, AttrRecognitionMonitorResult.class);
+        MongoUtil.setPage(query, params, TIME_FIELD);
         List<AttrRecognitionMonitorResult> resultList = mongoTemplate.find(query, AttrRecognitionMonitorResult.class);
         // 缁熻鏁�
         HashMap<String, Object> map = new HashMap<>();
@@ -547,9 +553,10 @@
     @Override
     public Result vehicleClockAccuracy(DataCenterQuery params) {
 
-        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
 
         long total = mongoTemplate.count(query, VehicleDeviceInspectionResult.class);
+        MongoUtil.setPage(query, params, TIME_FIELD);
         List<VehicleDeviceInspectionResult> resultList = mongoTemplate.find(query, VehicleDeviceInspectionResult.class);
         // 缁熻鏁�
         long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("snapResult").is("1")), VehicleDeviceInspectionResult.class);
@@ -570,9 +577,10 @@
     @Override
     public Result vehicleTimelyUploadAccuracy(DataCenterQuery params) {
 
-        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
 
         long total = mongoTemplate.count(query, SnapshotDelayMonitorResult.class);
+        MongoUtil.setPage(query, params, TIME_FIELD);
         List<SnapshotDelayMonitorResult> resultList = mongoTemplate.find(query, SnapshotDelayMonitorResult.class);
         // 缁熻鏁�
         HashMap<String, Object> map = new HashMap<>();
@@ -590,9 +598,10 @@
     @Override
     public Result vehicleUrlAccuracy(DataCenterQuery params) {
 
-        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
 
         long total = mongoTemplate.count(query, PicAccessResult.class);
+        MongoUtil.setPage(query, params, TIME_FIELD);
         List<PicAccessResult> resultList = mongoTemplate.find(query, PicAccessResult.class);
         // 缁熻鏁�
         HashMap<String, Object> map = new HashMap<>();
@@ -610,9 +619,10 @@
     @Override
     public Result vehicleBigImgAccuracy(DataCenterQuery params) {
 
-        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, new ArrayList<>());
 
         long total = mongoTemplate.count(query, VehicleDeviceSamplingResult.class);
+        MongoUtil.setPage(query, params, TIME_FIELD);
         List<VehicleDeviceSamplingResult> resultList = mongoTemplate.find(query, VehicleDeviceSamplingResult.class);
         // 缁熻鏁�
         HashMap<String, Object> map = new HashMap<>();
@@ -630,9 +640,10 @@
     @Override
     public Result faceViewDockStable(DataCenterQuery params) {
 
-        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
 
         long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
+        MongoUtil.setPage(query, params, TIME_FIELD);
         List<SnapshotDataMonitorResult> resultList = mongoTemplate.find(query, SnapshotDataMonitorResult.class);
         // 缁熻鏁�
         long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("1")), SnapshotDataMonitorResult.class);
@@ -654,9 +665,10 @@
     @Override
     public Result facePointOnlineRate(DataCenterQuery params) {
 
-        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
 
         long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
+        MongoUtil.setPage(query, params, TIME_FIELD);
         List<SnapshotDataMonitorResult> resultList = mongoTemplate.find(query, SnapshotDataMonitorResult.class);
         // 缁熻鏁�
         long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("1")), SnapshotDataMonitorResult.class);
@@ -678,16 +690,17 @@
     @Override
     public Result faceDirectoryConsistency(DataCenterQuery params) {
 
-        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+        Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, null);
 
-        long total = mongoTemplate.count(query, OneMachineFileResult.class);
-        List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
+        long total = mongoTemplate.count(query, MonitorQualifyResult.class);
+        MongoUtil.setPage(query, params, TIME_FIELD);
+        List<MonitorQualifyResult> resultList = mongoTemplate.find(query, MonitorQualifyResult.class);
         // 缁熻鏁�
-        long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), OneMachineFileResult.class);
-        long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), OneMachineFileResult.class);
-        long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*1.*")), OneMachineFileResult.class);
-        long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*2.*")), OneMachineFileResult.class);
-        long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*3.*")), OneMachineFileResult.class);
+        long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), MonitorQualifyResult.class);
+        long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), MonitorQualifyResult.class);
+        long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*1.*")), MonitorQualifyResult.class);
+        long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*2.*")), MonitorQualifyResult.class);
+        long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*3.*")), MonitorQualifyResult.class);
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", Arrays.asList(nonNetwork, network, video, car, face));
         map.put("list", resultList);
@@ -703,9 +716,10 @@
     @Override
     public Result faceCollectionConsistency(DataCenterQuery params) {
 
-        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
 
         long total = mongoTemplate.count(query, CrossDetailResult.class);
+        MongoUtil.setPage(query, params, TIME_FIELD);
         List<CrossDetailResult> resultList = mongoTemplate.find(query, CrossDetailResult.class);
         // 缁熻鏁�
         long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("1")), CrossDetailResult.class);
@@ -727,9 +741,10 @@
     @Override
     public Result faceImgQualification(DataCenterQuery params) {
 
-        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+        Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, null);
 
         long total = mongoTemplate.count(query, MonitoringDetailResult.class);
+        MongoUtil.setPage(query, params, TIME_FIELD);
         List<MonitoringDetailResult> resultList = mongoTemplate.find(query, MonitoringDetailResult.class);
         // 缁熻鏁�
         long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("1")), MonitoringDetailResult.class);
@@ -751,9 +766,10 @@
     @Override
     public Result faceCapturesImagesAccuracy(DataCenterQuery params) {
 
-        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
 
         long total = mongoTemplate.count(query, FaceDeviceInspectionResult.class);
+        MongoUtil.setPage(query, params, TIME_FIELD);
         List<FaceDeviceInspectionResult> resultList = mongoTemplate.find(query, FaceDeviceInspectionResult.class);
         // 缁熻鏁�
         long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("snapResult").is("1")), FaceDeviceInspectionResult.class);
@@ -774,9 +790,10 @@
     @Override
     public Result faceTimelyUpload(DataCenterQuery params) {
 
-        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
 
         long total = mongoTemplate.count(query, FaceDeviceInspectionResult.class);
+        MongoUtil.setPage(query, params, TIME_FIELD);
         List<FaceDeviceInspectionResult> resultList = mongoTemplate.find(query, FaceDeviceInspectionResult.class);
         // 缁熻鏁�
         long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("snapResult").is("1")), FaceDeviceInspectionResult.class);
@@ -797,9 +814,10 @@
     @Override
     public Result faceAvailabilityOfLargeImg(DataCenterQuery params) {
 
-        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
 
         long total = mongoTemplate.count(query, FaceDeviceSamplingResult.class);
+        MongoUtil.setPage(query, params, TIME_FIELD);
         List<FaceDeviceSamplingResult> resultList = mongoTemplate.find(query, FaceDeviceSamplingResult.class);
         // 缁熻鏁�
         HashMap<String, Object> map = new HashMap<>();

--
Gitblit v1.8.0