From 27bf1aad170bc78af274a596ce5c89caaa903ce3 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 04 九月 2024 03:34:45 +0800
Subject: [PATCH] 合同积分回显

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java |  630 +++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 503 insertions(+), 127 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 23ffdc8..9038beb 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
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
+import com.mongodb.client.AggregateIterable;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoDatabase;
 import com.ycl.platform.domain.entity.ImageResourceSecurityDetail;
 import com.ycl.platform.domain.entity.YwPoint;
 import com.ycl.platform.domain.query.DataCenterQuery;
@@ -17,6 +20,7 @@
 import com.ycl.utils.MongoUtil;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.collections.CollectionUtils;
+import org.bson.Document;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
@@ -25,6 +29,7 @@
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 鏁版嵁涓績鎺ュ彛
@@ -51,7 +56,6 @@
      */
     @Override
     public Result videoPointOnlineRate(DataCenterQuery params) {
-        params.setTime();
         // 鐢熸垚鏌ヨ
         Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, null);
 
@@ -60,8 +64,13 @@
         MongoUtil.setPage(query, params, TIME_FIELD);
         List<VideoOnlineResult> resultList = mongoTemplate.find(query, VideoOnlineResult.class);
 
+        // 缁熻鏁伴噺
+        MongoDatabase database = mongoTemplate.getDb();
+        MongoCollection<Document> collection = database.getCollection("uy_online");
+        long distinctCount = collection.distinct("deviceId", String.class).into(new ArrayList<>()).size();
+
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", Arrays.asList(total));
+        map.put("count", Arrays.asList(distinctCount));
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -74,7 +83,6 @@
      */
     @Override
     public Result deptVideoPointOnlineRate(DataCenterQuery params) {
-        params.setTime();
         // 鍏堟煡鍑洪儴绾х偣浣嶇殑鍥芥爣
         List<String> deptGBList = pointMapper.getDeptPointGB(0);
 
@@ -86,8 +94,28 @@
         MongoUtil.setPage(query, params, TIME_FIELD);
         List<VideoOnlineResult> resultList = mongoTemplate.find(query, VideoOnlineResult.class);
 
+        // 缁熻鏁伴噺
+        MongoDatabase database = mongoTemplate.getDb();
+        MongoCollection<Document> collection = database.getCollection("uy_online");
+        Document filter = new Document("deviceId", new Document("$in", deptGBList));
+        // 鏋勫缓鑱氬悎绠￠亾
+        List<Document> pipeline = Arrays.asList(
+                // 鍙閮ㄧ骇鐨�
+                new Document("$match", filter),
+                // $group 鍘婚噸
+                new Document("$group", new Document("_id", "$deviceId")),
+                new Document("$count", "uniqueDeviceIds")
+        );
+        // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+        AggregateIterable<Document> result = collection.aggregate(pipeline);
+        Integer uniqueDeviceIdCount = 0;
+        for (Document doc : result) {
+            uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
+            break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
+        }
+
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", Arrays.asList(total));
+        map.put("count", Arrays.asList(uniqueDeviceIdCount));
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -100,7 +128,6 @@
      */
     @Override
     public Result videoImportantPointOnlineRate(DataCenterQuery params) {
-        params.setTime();
         // 鍏堟煡鍑洪噸鐐圭偣浣嶇殑鍥芥爣
         List<String> deptGBList = pointMapper.getDeptPointGB(1);
 
@@ -109,14 +136,33 @@
         long total = mongoTemplate.count(query, VideoOnlineResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
         List<VideoOnlineResult> resultList = mongoTemplate.find(query, VideoOnlineResult.class);
-        // 缁熻鏁�
-        long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), VideoOnlineResult.class);
-        long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), VideoOnlineResult.class);
-        long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*1.*")), VideoOnlineResult.class);
-        long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*2.*")), VideoOnlineResult.class);
-        long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*3.*")), VideoOnlineResult.class);
+
+        // 缁熻鏁伴噺
+        MongoDatabase database = mongoTemplate.getDb();
+        MongoCollection<Document> collection = database.getCollection("uy_online");
+        Document filter = new Document("deviceId", new Document("$in", deptGBList));
+        // 鏋勫缓鑱氬悎绠￠亾
+        List<Document> pipeline = Arrays.asList(
+                new Document("$match", filter),
+                // $group 鍘婚噸
+                new Document("$group", new Document("_id", "$deviceId")),
+                new Document("$count", "uniqueDeviceIds")
+        );
+        // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+        AggregateIterable<Document> result = collection.aggregate(pipeline);
+        Integer uniqueDeviceIdCount = 0;
+        for (Document doc : result) {
+            uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
+            break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
+        }
+
+//        long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), VideoOnlineResult.class);
+//        long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), VideoOnlineResult.class);
+//        long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*1.*")), VideoOnlineResult.class);
+//        long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*2.*")), VideoOnlineResult.class);
+//        long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*3.*")), VideoOnlineResult.class);
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", Arrays.asList(nonNetwork, network, video, car, face));
+        map.put("count", Arrays.asList(uniqueDeviceIdCount));
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -129,7 +175,6 @@
      */
     @Override
     public Result videoImportantPointImageOnlineRate(DataCenterQuery params) {
-        params.setTime();
         // 鍏堟煡鍑洪噸鐐规寚鎸ュ浘鍍忕偣浣嶇殑鍥芥爣
         List<String> deptGBList = pointMapper.getDeptPointGB(2);
 
@@ -138,14 +183,34 @@
         long total = mongoTemplate.count(query, VideoOnlineResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
         List<VideoOnlineResult> resultList = mongoTemplate.find(query, VideoOnlineResult.class);
-        // 缁熻鏁�
-        long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), VideoOnlineResult.class);
-        long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), VideoOnlineResult.class);
-        long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*1.*")), VideoOnlineResult.class);
-        long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*2.*")), VideoOnlineResult.class);
-        long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*3.*")), VideoOnlineResult.class);
+
+        // 缁熻鏁伴噺
+        MongoDatabase database = mongoTemplate.getDb();
+        MongoCollection<Document> collection = database.getCollection("uy_online");
+        Document filter = new Document("deviceId", new Document("$in", deptGBList));
+        // 鏋勫缓鑱氬悎绠￠亾
+        List<Document> pipeline = Arrays.asList(
+                new Document("$match", filter),
+                // $group 鍘婚噸
+                new Document("$group", new Document("_id", "$deviceId")),
+                new Document("$count", "uniqueDeviceIds")
+        );
+        // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+        AggregateIterable<Document> result = collection.aggregate(pipeline);
+        Integer uniqueDeviceIdCount = 0;
+        for (Document doc : result) {
+            uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
+            break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
+        }
+
+//        // 缁熻鏁�
+//        long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), VideoOnlineResult.class);
+//        long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), VideoOnlineResult.class);
+//        long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*1.*")), VideoOnlineResult.class);
+//        long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*2.*")), VideoOnlineResult.class);
+//        long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*3.*")), VideoOnlineResult.class);
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", Arrays.asList(nonNetwork, network, video, car, face));
+        map.put("count", Arrays.asList(uniqueDeviceIdCount));
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -159,18 +224,42 @@
     @Override
     public Result videoOneMachineDocumentRegister(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 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 total = mongoTemplate.count(query, MonitorQualifyResult.class);
+        MongoUtil.setPage(query, params, TIME_FIELD);
+        List<MonitorQualifyResult> resultList = mongoTemplate.find(query, MonitorQualifyResult.class);
+
+        // 缁熻鏁伴噺
+        MongoDatabase database = mongoTemplate.getDb();
+        MongoCollection<Document> collection = database.getCollection("uy_monitor_qualify");
+
+        Document ipErrFilter = new Document("ip.error", true);
+        Document macdzErrFilter = new Document("macdz.error", true);
+        Document latitudeErrFilter = new Document("latitude.error", true);
+        Document longitudeErrFilter = new Document("longitude.error", true);
+
+        List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter);
+        List<Integer> rList = lists.stream().map(filter -> {
+            // 鏋勫缓鑱氬悎绠￠亾
+            List<Document> pipeline = Arrays.asList(
+                    new Document("$match", filter),
+                    // $group 鍘婚噸
+                    new Document("$group", new Document("_id", "$serialNumber.showValue")),
+                    new Document("$count", "uniqueDeviceIds")
+            );
+            // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+            AggregateIterable<Document> result = collection.aggregate(pipeline);
+            Integer uniqueDeviceIdCount = 0;
+            for (Document doc : result) {
+                uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
+                break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
+            }
+            return uniqueDeviceIdCount;
+        }).collect(Collectors.toList());
+
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", Arrays.asList(nonNetwork, network, video, car, face));
+        map.put("count", rList);
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -184,13 +273,42 @@
     @Override
     public Result videoOneMachineDocumentQualified(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, MonitorQualifyResult.class);
+        MongoUtil.setPage(query, params, TIME_FIELD);
         List<MonitorQualifyResult> resultList = mongoTemplate.find(query, MonitorQualifyResult.class);
-        // 缁熻鏁�
+
+        // 缁熻鏁伴噺
+        MongoDatabase database = mongoTemplate.getDb();
+        MongoCollection<Document> collection = database.getCollection("uy_monitor_qualify");
+
+        Document ipErrFilter = new Document("ip.error", true);
+        Document macdzErrFilter = new Document("macdz.error", true);
+        Document latitudeErrFilter = new Document("latitude.error", true);
+        Document longitudeErrFilter = new Document("longitude.error", true);
+
+        List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter);
+        List<Integer> rList = lists.stream().map(filter -> {
+            // 鏋勫缓鑱氬悎绠￠亾
+            List<Document> pipeline = Arrays.asList(
+                    new Document("$match", filter),
+                    // $group 鍘婚噸
+                    new Document("$group", new Document("_id", "$serialNumber.showValue")),
+                    new Document("$count", "uniqueDeviceIds")
+            );
+            // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+            AggregateIterable<Document> result = collection.aggregate(pipeline);
+            Integer uniqueDeviceIdCount = 0;
+            for (Document doc : result) {
+                uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
+                break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
+            }
+            return uniqueDeviceIdCount;
+        }).collect(Collectors.toList());
+
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", CollectionUtils.EMPTY_COLLECTION);
+        map.put("count", rList);
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -203,19 +321,43 @@
      */
     @Override
     public Result videoAssessmentFileRatio(DataCenterQuery params) {
+        // TODO 鏂板涓�寮犺〃璁板綍姣忔鐨勬。妗堣�冩牳
+        Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, null);
 
-        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+        long total = mongoTemplate.count(query, MonitorQualifyResult.class);
+        MongoUtil.setPage(query, params, TIME_FIELD);
+        List<MonitorQualifyResult> resultList = mongoTemplate.find(query, MonitorQualifyResult.class);
 
-        long total = mongoTemplate.count(query, OneMachineFileResult.class);
-        List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.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);
+        // 缁熻鏁伴噺
+        MongoDatabase database = mongoTemplate.getDb();
+        MongoCollection<Document> collection = database.getCollection("uy_monitor_qualify");
+
+        Document ipErrFilter = new Document("ip.error", true);
+        Document macdzErrFilter = new Document("macdz.error", true);
+        Document latitudeErrFilter = new Document("latitude.error", true);
+        Document longitudeErrFilter = new Document("longitude.error", true);
+
+        List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter);
+        List<Integer> rList = lists.stream().map(filter -> {
+            // 鏋勫缓鑱氬悎绠￠亾
+            List<Document> pipeline = Arrays.asList(
+                    new Document("$match", filter),
+                    // $group 鍘婚噸
+                    new Document("$group", new Document("_id", "$serialNumber.showValue")),
+                    new Document("$count", "uniqueDeviceIds")
+            );
+            // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+            AggregateIterable<Document> result = collection.aggregate(pipeline);
+            Integer uniqueDeviceIdCount = 0;
+            for (Document doc : result) {
+                uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
+                break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
+            }
+            return uniqueDeviceIdCount;
+        }).collect(Collectors.toList());
+
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", Arrays.asList(nonNetwork, network, video, car, face));
+        map.put("count", rList);
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -229,16 +371,88 @@
     @Override
     public Result videoAvailabilityRate(DataCenterQuery params) {
 
-        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+        Query query = MongoUtil.getQuery(params, "deviceId", "createTime", null);
 
         long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
+        MongoUtil.setPage(query, params, "createTime");
         List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
-        // 缁熻鏁�
-        long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("recordStatus").is("1")), RecordMetaDSumResult.class);
-        long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("recordStatus").is("2")), RecordMetaDSumResult.class);
-        long three = mongoTemplate.count(new Query().addCriteria(Criteria.where("recordStatus").is("-1")), RecordMetaDSumResult.class);
+
+        // 缁熻鏁伴噺
+        MongoDatabase database = mongoTemplate.getDb();
+        MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum");
+        List<Integer> status = Arrays.asList(1, 0, -1);
+        List<Integer> resultCount = status.stream().map(item -> {
+            Document filter = new Document("recordStatus", item);
+            // 鏋勫缓鑱氬悎绠￠亾
+            List<Document> pipeline = Arrays.asList(
+                    new Document("$match", filter),
+                    // $group 鍘婚噸
+                    new Document("$group", new Document("_id", "$deviceId")),
+                    new Document("$count", "uniqueDeviceIds")
+            );
+            // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+            AggregateIterable<Document> result = collection.aggregate(pipeline);
+            Integer uniqueDeviceIdCount = 0;
+            for (Document doc : result) {
+                uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
+                break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
+            }
+            return uniqueDeviceIdCount;
+        }).collect(Collectors.toList());
+
+
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", Arrays.asList(one, two, three));
+        map.put("count", resultCount);
+        map.put("list", resultList);
+        return Result.ok().data(map).total(total);
+    }
+
+    /**
+     * 瑙嗛锛氶儴绾у綍鍍忓彲鐢ㄧ巼
+     *
+     * @param params
+     * @return
+     */
+    @Override
+    public Result deptVideoAvailabilityRate(DataCenterQuery params) {
+
+        List<String> deptGBList = pointMapper.getDeptPointGB(0);
+
+        Query query = MongoUtil.getQuery(params, "deviceId", "createTime", deptGBList);
+
+        long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
+        MongoUtil.setPage(query, params, "createTime");
+        List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
+
+        // 缁熻鏁伴噺
+        MongoDatabase database = mongoTemplate.getDb();
+        MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum");
+        List<Integer> status = Arrays.asList(1, 0, -1);
+        List<Integer> resultCount = status.stream().map(item -> {
+            Document filter = new Document("$and", Arrays.asList(
+                    new Document("deviceId", new Document("$in", deptGBList)), // $in 鏉′欢
+                    new Document("recordStatus", item)
+            ));
+            // 鏋勫缓鑱氬悎绠￠亾
+            List<Document> pipeline = Arrays.asList(
+                    new Document("$match", filter),
+                    // $group 鍘婚噸
+                    new Document("$group", new Document("_id", "$deviceId")),
+                    new Document("$count", "uniqueDeviceIds")
+            );
+            // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+            AggregateIterable<Document> result = collection.aggregate(pipeline);
+            Integer uniqueDeviceIdCount = 0;
+            for (Document doc : result) {
+                uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
+                break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
+            }
+            return uniqueDeviceIdCount;
+        }).collect(Collectors.toList());
+
+
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("count", resultCount);
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -252,16 +466,42 @@
     @Override
     public Result videoImportantPointAvailabilityRate(DataCenterQuery params) {
 
-        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+        List<String> deptGBList = pointMapper.getDeptPointGB(1);
+
+        Query query = MongoUtil.getQuery(params, "deviceId", "createTime", deptGBList);
 
         long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
+        MongoUtil.setPage(query, params, "createTime");
         List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
-        // 缁熻鏁�
-        long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("recordStatus").is("1")), OneMachineFileResult.class);
-        long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("recordStatus").is("2")), OneMachineFileResult.class);
-        long three = mongoTemplate.count(new Query().addCriteria(Criteria.where("recordStatus").is("-1")), OneMachineFileResult.class);
+
+        // 缁熻鏁伴噺
+        MongoDatabase database = mongoTemplate.getDb();
+        MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum");
+        List<Integer> status = Arrays.asList(1, 0, -1);
+        List<Integer> resultCount = status.stream().map(item -> {
+            Document filter = new Document("$and", Arrays.asList(
+                    new Document("deviceId", new Document("$in", deptGBList)), // $in 鏉′欢
+                    new Document("recordStatus", item)
+            ));
+            // 鏋勫缓鑱氬悎绠￠亾
+            List<Document> pipeline = Arrays.asList(
+                    new Document("$match", filter),
+                    // $group 鍘婚噸
+                    new Document("$group", new Document("_id", "$deviceId")),
+                    new Document("$count", "uniqueDeviceIds")
+            );
+            // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+            AggregateIterable<Document> result = collection.aggregate(pipeline);
+            Integer uniqueDeviceIdCount = 0;
+            for (Document doc : result) {
+                uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
+                break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
+            }
+            return uniqueDeviceIdCount;
+        }).collect(Collectors.toList());
+
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", Arrays.asList(one, two, three));
+        map.put("count", resultCount);
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -300,18 +540,43 @@
     @Override
     public Result videoImportantPointLabelingAccuracy(DataCenterQuery params) {
 
-        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+        List<String> deptGBList = pointMapper.getDeptPointGB(1);
+        Query query = MongoUtil.getQuery(params, "deviceNo", "checkTime", deptGBList);
 
         long total = mongoTemplate.count(query, OsdCheckResult.class);
+        MongoUtil.setPage(query, params, "checkTime");
         List<OsdCheckResult> resultList = mongoTemplate.find(query, OsdCheckResult.class);
-        // 缁熻鏁�
-        long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), OsdCheckResult.class);
-        long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), OsdCheckResult.class);
-        long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*1.*")), OsdCheckResult.class);
-        long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*2.*")), OsdCheckResult.class);
-        long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*3.*")), OsdCheckResult.class);
+
+        // 缁熻鏁伴噺
+        MongoDatabase database = mongoTemplate.getDb();
+        MongoCollection<Document> collection = database.getCollection("osd_check_result");
+
+        Document osdNameFilter = new Document("osdNameCorrect", 1);
+        Document osdNameErrFilter = new Document("osdNameCorrect", -1);
+        Document osdTimeFilter = new Document("osdTimeCorrect", 1);
+        Document osdTimeErrFilter = new Document("osdTimeCorrect", -1);
+        List<Document> lists = Arrays.asList(osdNameFilter, osdNameErrFilter, osdTimeFilter, osdTimeErrFilter);
+        List<Integer> rList = lists.stream().map(filter -> {
+            // 鏋勫缓鑱氬悎绠￠亾
+            List<Document> pipeline = Arrays.asList(
+                    new Document("$match", filter),
+                    // $group 鍘婚噸
+                    new Document("$group", new Document("_id", "$deviceNo")),
+                    new Document("$count", "uniqueDeviceIds")
+            );
+            // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+            AggregateIterable<Document> result = collection.aggregate(pipeline);
+            Integer uniqueDeviceIdCount = 0;
+            for (Document doc : result) {
+                uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
+                break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
+            }
+            return uniqueDeviceIdCount;
+        }).collect(Collectors.toList());
+
+
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", Arrays.asList(nonNetwork, network, video, car, face));
+        map.put("count", rList);
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -350,18 +615,41 @@
     @Override
     public Result videoImportantPointCheckTimeAccuracy(DataCenterQuery params) {
 
-        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+        List<String> deptGBList = pointMapper.getDeptPointGB(1);
 
-        long total = mongoTemplate.count(query, OneMachineFileResult.class);
-        List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.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);
+        Query query = MongoUtil.getQuery(params, "deviceNo", "checkTime", deptGBList);
+
+        long total = mongoTemplate.count(query, OsdCheckResult.class);
+        MongoUtil.setPage(query, params, "checkTime");
+        List<OsdCheckResult> resultList = mongoTemplate.find(query, OsdCheckResult.class);
+
+        // 缁熻鏁伴噺
+        MongoDatabase database = mongoTemplate.getDb();
+        MongoCollection<Document> collection = database.getCollection("osd_check_result");
+
+        Document osdTimeFilter = new Document("osdTimeCorrect", 1);
+        Document osdTimeErrFilter = new Document("osdTimeCorrect", -1);
+        List<Document> lists = Arrays.asList(osdTimeFilter, osdTimeErrFilter);
+        List<Integer> rList = lists.stream().map(filter -> {
+            // 鏋勫缓鑱氬悎绠￠亾
+            List<Document> pipeline = Arrays.asList(
+                    new Document("$match", filter),
+                    // $group 鍘婚噸
+                    new Document("$group", new Document("_id", "$deviceNo")),
+                    new Document("$count", "uniqueDeviceIds")
+            );
+            // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+            AggregateIterable<Document> result = collection.aggregate(pipeline);
+            Integer uniqueDeviceIdCount = 0;
+            for (Document doc : result) {
+                uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
+                break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
+            }
+            return uniqueDeviceIdCount;
+        }).collect(Collectors.toList());
+
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", Arrays.asList(nonNetwork, network, video, car, face));
+        map.put("count", rList);
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -376,17 +664,41 @@
     @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);
-        long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("2")), SnapshotDataMonitorResult.class);
-        long three = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("3")), SnapshotDataMonitorResult.class);
-        long four = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("4")), SnapshotDataMonitorResult.class);
+
+        // 缁熻鏁伴噺
+        MongoDatabase database = mongoTemplate.getDb();
+        MongoCollection<Document> collection = database.getCollection("hk_snapshot_data_monitor");
+
+        Document normalFilter = new Document("resultType", 1);
+        Document noDataFilter = new Document("resultType", 2);
+        Document trFilter = new Document("resultType", 3);
+        Document littleFilter = new Document("resultType", 4);
+        List<Document> lists = Arrays.asList(normalFilter, noDataFilter, trFilter, littleFilter);
+        List<Integer> rList = lists.stream().map(filter -> {
+            // 鏋勫缓鑱氬悎绠￠亾
+            List<Document> pipeline = Arrays.asList(
+                    new Document("$match", filter),
+                    // $group 鍘婚噸
+                    new Document("$group", new Document("_id", "$externalIndexCode")),
+                    new Document("$count", "uniqueDeviceIds")
+            );
+            // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+            AggregateIterable<Document> result = collection.aggregate(pipeline);
+            Integer uniqueDeviceIdCount = 0;
+            for (Document doc : result) {
+                uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
+                break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
+            }
+            return uniqueDeviceIdCount;
+        }).collect(Collectors.toList());
+
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", Arrays.asList(one, two, three, four));
+        map.put("count", rList);
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -400,17 +712,19 @@
     @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);
-        long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("2")), SnapshotDataMonitorResult.class);
-        long three = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("3")), SnapshotDataMonitorResult.class);
-        long four = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("4")), SnapshotDataMonitorResult.class);
+
+        // 缁熻鏁伴噺
+        MongoDatabase database = mongoTemplate.getDb();
+        MongoCollection<Document> collection = database.getCollection("hk_snapshot_data_monitor");
+        long distinctCount = collection.distinct("externalIndexCode", String.class).into(new ArrayList<>()).size();
+
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", Arrays.asList(one, two, three, four));
+        map.put("count", Arrays.asList(distinctCount));
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -424,18 +738,42 @@
     @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 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 total = mongoTemplate.count(query, MonitorQualifyResult.class);
+        MongoUtil.setPage(query, params, TIME_FIELD);
+        List<MonitorQualifyResult> resultList = mongoTemplate.find(query, MonitorQualifyResult.class);
+
+        // 缁熻鏁伴噺
+        MongoDatabase database = mongoTemplate.getDb();
+        MongoCollection<Document> collection = database.getCollection("uy_monitor_qualify");
+
+        Document ipErrFilter = new Document("ip.error", true);
+        Document macdzErrFilter = new Document("macdz.error", true);
+        Document latitudeErrFilter = new Document("latitude.error", true);
+        Document longitudeErrFilter = new Document("longitude.error", true);
+
+        List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter);
+        List<Integer> rList = lists.stream().map(filter -> {
+            // 鏋勫缓鑱氬悎绠￠亾
+            List<Document> pipeline = Arrays.asList(
+                    new Document("$match", filter),
+                    // $group 鍘婚噸
+                    new Document("$group", new Document("_id", "$serialNumber.showValue")),
+                    new Document("$count", "uniqueDeviceIds")
+            );
+            // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+            AggregateIterable<Document> result = collection.aggregate(pipeline);
+            Integer uniqueDeviceIdCount = 0;
+            for (Document doc : result) {
+                uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
+                break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
+            }
+            return uniqueDeviceIdCount;
+        }).collect(Collectors.toList());
+
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", Arrays.asList(nonNetwork, network, video, car, face));
+        map.put("count", rList);
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -449,17 +787,42 @@
     @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);
-        long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("2")), CrossDetailResult.class);
-        long three = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("3")), CrossDetailResult.class);
-        long four = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("4")), CrossDetailResult.class);
+
+        // 缁熻鏁伴噺
+        MongoDatabase database = mongoTemplate.getDb();
+        MongoCollection<Document> collection = database.getCollection("hk_cross_detail");
+
+        Document ipErrFilter = new Document("lalType", 1);
+        Document macdzErrFilter = new Document("lalType", 2);
+        Document latitudeErrFilter = new Document("lalType", 3);
+        Document longitudeErrFilter = new Document("lalType", 4);
+
+        List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter);
+        List<Integer> rList = lists.stream().map(filter -> {
+            // 鏋勫缓鑱氬悎绠￠亾
+            List<Document> pipeline = Arrays.asList(
+                    new Document("$match", filter),
+                    // $group 鍘婚噸
+                    new Document("$group", new Document("_id", "$externalIndexCode")),
+                    new Document("$count", "uniqueDeviceIds")
+            );
+            // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+            AggregateIterable<Document> result = collection.aggregate(pipeline);
+            Integer uniqueDeviceIdCount = 0;
+            for (Document doc : result) {
+                uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
+                break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
+            }
+            return uniqueDeviceIdCount;
+        }).collect(Collectors.toList());
+
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", Arrays.asList(one, two, three, four));
+        map.put("count", rList);
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -473,9 +836,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<>();
@@ -493,9 +857,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<>();
@@ -513,9 +878,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);
@@ -536,9 +902,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<>();
@@ -556,9 +923,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<>();
@@ -576,9 +944,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<>();
@@ -596,9 +965,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);
@@ -620,9 +990,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);
@@ -644,16 +1015,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);
@@ -669,9 +1041,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);
@@ -693,9 +1066,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);
@@ -717,9 +1091,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);
@@ -740,9 +1115,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);
@@ -763,9 +1139,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<>();
@@ -781,9 +1158,8 @@
      */
     @Override
     public Result videoImageResourceSecurity(DataCenterQuery query) {
-        ImageResourceSecurityDetail imageResourceSecurityDetail = new ImageResourceSecurityDetail();
         Page<ImageResourceSecurityDetail> page = PageHelper.startPage(query.getPageNum(), query.getPageSize());
-        securityDetailMapper.selectImageResourceSecurityDetailList(imageResourceSecurityDetail);
+        securityDetailMapper.selectImageResourceSecurityDetailList(query);
 
         // 缁熻鏁�
         HashMap<String, Object> map = new HashMap<>();

--
Gitblit v1.8.0