From 615af82c9ea47993e78b00e9c64e887e063474f8 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 04 九月 2024 22:08:50 +0800
Subject: [PATCH] 点位修改增加部级标签设置

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 1440 +++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 893 insertions(+), 547 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 fc39754..f40c430 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,30 +1,35 @@
 package com.ycl.platform.service.impl;
 
+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;
 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.domain.result.UY.*;
 import com.ycl.platform.mapper.ImageResourceSecurityDetailMapper;
+import com.ycl.platform.mapper.YwPointMapper;
 import com.ycl.platform.service.DataCenterService;
+import com.ycl.platform.service.YwPointService;
 import com.ycl.system.Result;
+import com.ycl.system.page.PageUtil;
 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;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.TextCriteria;
 import org.springframework.stereotype.Service;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 鏁版嵁涓績鎺ュ彛
@@ -38,6 +43,9 @@
 
     private final MongoTemplate mongoTemplate;
     private final ImageResourceSecurityDetailMapper securityDetailMapper;
+    private final YwPointMapper pointMapper;
+
+
     private final static String TIME_FIELD = "mongoCreateTime";
 
     /**
@@ -48,23 +56,162 @@
      */
     @Override
     public Result videoPointOnlineRate(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
+        // 鐢熸垚鏌ヨ
+        List<String> likeFileds = Arrays.asList("arealayerName", "ipAddr", "deviceName", "deviceId");
+        Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, likeFileds, null);
+
+        // 鍏堟煡鎬绘暟鍐嶅垎椤�
         long total = mongoTemplate.count(query, VideoOnlineResult.class);
-        query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+        MongoUtil.setPage(query, params, TIME_FIELD);
         List<VideoOnlineResult> resultList = mongoTemplate.find(query, VideoOnlineResult.class);
-        long count = mongoTemplate.count(new 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("total", count);
+        map.put("count", Arrays.asList(distinctCount));
+        map.put("list", resultList);
+        return Result.ok().data(map).total(total);
+    }
+
+    /**
+     * 瑙嗛锛氶儴绾х偣浣嶅湪绾跨巼
+     *
+     * @param params
+     * @return
+     */
+    @Override
+    public Result deptVideoPointOnlineRate(DataCenterQuery params) {
+        // 鍏堟煡鍑洪儴绾х偣浣嶇殑鍥芥爣
+        List<String> deptGBList = pointMapper.getDeptPointGB(0);
+        List<String> likeFileds = Arrays.asList("arealayerName", "ipAddr", "deviceName", "deviceId");
+        // 鐢熸垚鏌ヨ
+        Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, likeFileds, deptGBList);
+
+        // 鍏堟煡鎬绘暟鍐嶅垎椤�
+        long total = mongoTemplate.count(query, VideoOnlineResult.class);
+        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(uniqueDeviceIdCount));
+        map.put("list", resultList);
+        return Result.ok().data(map).total(total);
+    }
+
+    /**
+     * 瑙嗛锛氶噸鐐圭偣浣嶅湪绾跨巼
+     *
+     * @param params
+     * @return
+     */
+    @Override
+    public Result videoImportantPointOnlineRate(DataCenterQuery params) {
+        // 鍏堟煡鍑洪噸鐐圭偣浣嶇殑鍥芥爣
+        List<String> deptGBList = pointMapper.getDeptPointGB(1);
+        List<String> likeFileds = Arrays.asList("arealayerName", "ipAddr", "deviceName", "deviceId");
+        Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, likeFileds, deptGBList);
+
+        long total = mongoTemplate.count(query, VideoOnlineResult.class);
+        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 鍙細浜х敓涓�涓粨鏋�
+        }
+
+//        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(uniqueDeviceIdCount));
+        map.put("list", resultList);
+        return Result.ok().data(map).total(total);
+    }
+
+    /**
+     * 瑙嗛锛氶噸鐐规寚鎸ュ浘鍍忓湪绾跨巼
+     *
+     * @param params
+     * @return
+     */
+    @Override
+    public Result videoImportantPointImageOnlineRate(DataCenterQuery params) {
+        // 鍏堟煡鍑洪噸鐐规寚鎸ュ浘鍍忕偣浣嶇殑鍥芥爣
+        List<String> deptGBList = pointMapper.getDeptPointGB(2);
+        List<String> likeFileds = Arrays.asList("arealayerName", "ipAddr", "deviceName", "deviceId");
+        Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, likeFileds, deptGBList);
+
+        long total = mongoTemplate.count(query, VideoOnlineResult.class);
+        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 鍙細浜х敓涓�涓粨鏋�
+        }
+
+//        // 缁熻鏁�
+//        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(uniqueDeviceIdCount));
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -77,28 +224,43 @@
      */
     @Override
     public Result videoOneMachineDocumentRegister(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
+        List<String> likeFileds = Arrays.asList("ip.showValue", "name.showValue", "serialNumber.showValue");
+        Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, likeFileds, 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")
             );
-        }
-        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 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);
+            // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+            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);
     }
@@ -111,23 +273,43 @@
      */
     @Override
     public Result videoOneMachineDocumentQualified(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
+        List<String> likeFileds = Arrays.asList("ip.showValue", "name.showValue", "serialNumber.showValue");
+        Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, likeFileds, null);
+
         long total = mongoTemplate.count(query, MonitorQualifyResult.class);
-        query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+        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);
     }
@@ -140,28 +322,44 @@
      */
     @Override
     public Result videoAssessmentFileRatio(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
+        // TODO 鏂板涓�寮犺〃璁板綍姣忔鐨勬。妗堣�冩牳
+        List<String> likeFileds = Arrays.asList("ip.showValue", "name.showValue", "serialNumber.showValue");
+        Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, likeFileds, 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")
             );
-        }
-        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 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);
+            // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+            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);
     }
@@ -174,26 +372,89 @@
      */
     @Override
     public Result videoAvailabilityRate(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
+        List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
+        Query query = MongoUtil.getQuery(params, "deviceId", "createTime", likeFileds, null);
+
         long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
-        query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+        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("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);
+        List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
+        Query query = MongoUtil.getQuery(params, "deviceId", "createTime", likeFileds, 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);
     }
@@ -206,26 +467,43 @@
      */
     @Override
     public Result videoImportantPointAvailabilityRate(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
+
+        List<String> deptGBList = pointMapper.getDeptPointGB(1);
+        List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
+        Query query = MongoUtil.getQuery(params, "deviceId", "createTime", likeFileds, deptGBList);
+
         long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
-        query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+        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);
     }
@@ -238,26 +516,17 @@
      */
     @Override
     public Result videoLabelingAccuracy(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        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);
+        List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
+        Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, likeFileds, null);
+
+        long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
+        List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.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")), RecordMetaDSumResult.class);
+        long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), RecordMetaDSumResult.class);
+        long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*1.*")), RecordMetaDSumResult.class);
+        long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*2.*")), RecordMetaDSumResult.class);
+        long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*3.*")), RecordMetaDSumResult.class);
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", Arrays.asList(nonNetwork, network, video, car, face));
         map.put("list", resultList);
@@ -272,28 +541,45 @@
      */
     @Override
     public Result videoImportantPointLabelingAccuracy(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
+
+        List<String> deptGBList = pointMapper.getDeptPointGB(1);
+        List<String> likeFileds = Arrays.asList("deviceNo", "osdName");
+        Query query = MongoUtil.getQuery(params, "deviceNo", "checkTime", likeFileds, 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 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")
             );
-        }
-        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 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);
+            // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+            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);
     }
@@ -306,26 +592,18 @@
      */
     @Override
     public Result videoCheckTimeAccuracy(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
+
+        List<String> likeFileds = Arrays.asList("deviceId");
+        Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, likeFileds, null);
+
         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 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 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);
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", Arrays.asList(nonNetwork, network, video, car, face));
         map.put("list", resultList);
@@ -340,101 +618,45 @@
      */
     @Override
     public Result videoImportantPointCheckTimeAccuracy(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
+
+        List<String> deptGBList = pointMapper.getDeptPointGB(1);
+        List<String> likeFileds = Arrays.asList("deviceNo", "osdName");
+        Query query = MongoUtil.getQuery(params, "deviceNo", "checkTime", likeFileds, 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")
             );
-        }
-        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 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);
+            // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+            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);
     }
-
-    /**
-     * 瑙嗛锛氶噸鐐圭偣浣嶅湪绾跨巼
-     *
-     * @param params
-     * @return
-     */
-    @Override
-    public Result videoImportantPointOnlineRate(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        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 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);
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("count", Arrays.asList(nonNetwork, network, video, car, face));
-        map.put("list", resultList);
-        return Result.ok().data(map).total(total);
-    }
-
-    /**
-     * 瑙嗛锛氶噸鐐规寚鎸ュ浘鍍忓湪绾跨巼
-     *
-     * @param params
-     * @return
-     */
-    @Override
-    public Result videoImportantPointImageOnlineRate(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        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 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);
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("count", Arrays.asList(nonNetwork, network, video, car, face));
-        map.put("list", resultList);
-        return Result.ok().data(map).total(total);
-    }
-
-
 
 
     /**
@@ -445,27 +667,42 @@
      */
     @Override
     public Result vehicleViewDockStable(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
+        List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
+        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+
         long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
-        query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+        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);
     }
@@ -478,27 +715,20 @@
      */
     @Override
     public Result vehiclePointOnlineRate(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
+        List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
+        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+
         long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
-        query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+        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);
     }
@@ -511,28 +741,43 @@
      */
     @Override
     public Result vehicleNetDeviceDirectoryConsistency(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
+        List<String> likeFileds = Arrays.asList("ip.showValue", "name.showValue", "serialNumber.showValue");
+        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, 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")
             );
-        }
-        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 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);
+            // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+            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);
     }
@@ -545,27 +790,43 @@
      */
     @Override
     public Result vehicleCollectionConsistency(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
+        List<String> likeFileds = Arrays.asList("externalIndexCode", "crossName");
+        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+
         long total = mongoTemplate.count(query, CrossDetailResult.class);
-        query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+        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);
     }
@@ -578,21 +839,17 @@
      */
     @Override
     public Result vehicleCollectionDataIntegrity(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
+        List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
+        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+
         long total = mongoTemplate.count(query, DataIntegrityMonitoringResult.class);
-        query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+        MongoUtil.setPage(query, params, TIME_FIELD);
         List<DataIntegrityMonitoringResult> resultList = mongoTemplate.find(query, DataIntegrityMonitoringResult.class);
-        // 缁熻鏁�
+
+        // 缁熻鏁伴噺
+        MongoDatabase database = mongoTemplate.getDb();
+        MongoCollection<Document> collection = database.getCollection("hk_data_integrity_monitoring");
+
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", CollectionUtils.EMPTY_COLLECTION);
         map.put("list", resultList);
@@ -607,19 +864,11 @@
      */
     @Override
     public Result vehicleCollectionDataCaptured(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
+        List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
+        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+
         long total = mongoTemplate.count(query, AttrRecognitionMonitorResult.class);
-        query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+        MongoUtil.setPage(query, params, TIME_FIELD);
         List<AttrRecognitionMonitorResult> resultList = mongoTemplate.find(query, AttrRecognitionMonitorResult.class);
         // 缁熻鏁�
         HashMap<String, Object> map = new HashMap<>();
@@ -636,26 +885,43 @@
      */
     @Override
     public Result vehicleClockAccuracy(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
+        List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
+        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+
         long total = mongoTemplate.count(query, VehicleDeviceInspectionResult.class);
-        query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+        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);
-        long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("snapResult").is("2")), VehicleDeviceInspectionResult.class);
-        long four = mongoTemplate.count(new Query().addCriteria(Criteria.where("snapResult").is("4")), VehicleDeviceInspectionResult.class);
+
+
+        // 缁熻鏁伴噺
+        MongoDatabase database = mongoTemplate.getDb();
+        MongoCollection<Document> collection = database.getCollection("hk_vehicle_device_inspection");
+
+        Document ipErrFilter = new Document("snapResult", 1);
+        Document macdzErrFilter = new Document("snapResult", 2);
+        Document longitudeErrFilter = new Document("snapResult", 4);
+
+        List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, 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, four));
+        map.put("count", rList);
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -668,19 +934,11 @@
      */
     @Override
     public Result vehicleTimelyUploadAccuracy(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
+        List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
+        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+
         long total = mongoTemplate.count(query, SnapshotDelayMonitorResult.class);
-        query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+        MongoUtil.setPage(query, params, TIME_FIELD);
         List<SnapshotDelayMonitorResult> resultList = mongoTemplate.find(query, SnapshotDelayMonitorResult.class);
         // 缁熻鏁�
         HashMap<String, Object> map = new HashMap<>();
@@ -697,19 +955,11 @@
      */
     @Override
     public Result vehicleUrlAccuracy(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
+        List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
+        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+
         long total = mongoTemplate.count(query, PicAccessResult.class);
-        query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+        MongoUtil.setPage(query, params, TIME_FIELD);
         List<PicAccessResult> resultList = mongoTemplate.find(query, PicAccessResult.class);
         // 缁熻鏁�
         HashMap<String, Object> map = new HashMap<>();
@@ -726,19 +976,11 @@
      */
     @Override
     public Result vehicleBigImgAccuracy(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
+        List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
+        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+
         long total = mongoTemplate.count(query, VehicleDeviceSamplingResult.class);
-        query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+        MongoUtil.setPage(query, params, TIME_FIELD);
         List<VehicleDeviceSamplingResult> resultList = mongoTemplate.find(query, VehicleDeviceSamplingResult.class);
         // 缁熻鏁�
         HashMap<String, Object> map = new HashMap<>();
@@ -755,27 +997,42 @@
      */
     @Override
     public Result faceViewDockStable(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
+        List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
+        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+
         long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
-        query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+        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);
     }
@@ -788,27 +1045,42 @@
      */
     @Override
     public Result facePointOnlineRate(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
+        List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
+        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+
         long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
-        query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+        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);
     }
@@ -821,28 +1093,43 @@
      */
     @Override
     public Result faceDirectoryConsistency(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
+        List<String> likeFileds = Arrays.asList("serialNumber.showValue", "ip.showValue", "name.showValue");
+        Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, likeFileds, 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")
             );
-        }
-        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 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);
+            // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+            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);
     }
@@ -855,27 +1142,43 @@
      */
     @Override
     public Result faceCollectionConsistency(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
+        List<String> likeFileds = Arrays.asList("externalIndexCode", "crossName");
+        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+
         long total = mongoTemplate.count(query, CrossDetailResult.class);
-        query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+        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);
     }
@@ -888,27 +1191,43 @@
      */
     @Override
     public Result faceImgQualification(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
+        List<String> likeFileds = Arrays.asList("externalIndexCode", "cameraName");
+        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+
         long total = mongoTemplate.count(query, MonitoringDetailResult.class);
-        query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+        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);
-        long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("2")), MonitoringDetailResult.class);
-        long three = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("3")), MonitoringDetailResult.class);
-        long four = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("4")), MonitoringDetailResult.class);
+
+        // 缁熻鏁伴噺
+        MongoDatabase database = mongoTemplate.getDb();
+        MongoCollection<Document> collection = database.getCollection("hk_monitoring_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);
     }
@@ -921,26 +1240,42 @@
      */
     @Override
     public Result faceCapturesImagesAccuracy(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
+        List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
+        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+
         long total = mongoTemplate.count(query, FaceDeviceInspectionResult.class);
-        query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+        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);
-        long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("snapResult").is("2")), FaceDeviceInspectionResult.class);
-        long four = mongoTemplate.count(new Query().addCriteria(Criteria.where("snapResult").is("4")), FaceDeviceInspectionResult.class);
+
+        // 缁熻鏁伴噺
+        MongoDatabase database = mongoTemplate.getDb();
+        MongoCollection<Document> collection = database.getCollection("hk_vehicle_device_inspection");
+
+        Document ipErrFilter = new Document("snapResult", 1);
+        Document macdzErrFilter = new Document("snapResult", 2);
+        Document longitudeErrFilter = new Document("snapResult", 4);
+
+        List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, 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, four));
+        map.put("count", rList);
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -953,26 +1288,42 @@
      */
     @Override
     public Result faceTimelyUpload(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
+        List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
+        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+
         long total = mongoTemplate.count(query, FaceDeviceInspectionResult.class);
-        query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+        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);
-        long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("snapResult").is("2")), FaceDeviceInspectionResult.class);
-        long four = mongoTemplate.count(new Query().addCriteria(Criteria.where("snapResult").is("4")), FaceDeviceInspectionResult.class);
+
+        // 缁熻鏁伴噺
+        MongoDatabase database = mongoTemplate.getDb();
+        MongoCollection<Document> collection = database.getCollection("hk_vehicle_device_inspection");
+
+        Document ipErrFilter = new Document("snapResult", 1);
+        Document macdzErrFilter = new Document("snapResult", 2);
+        Document longitudeErrFilter = new Document("snapResult", 4);
+
+        List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, 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, four));
+        map.put("count", rList);
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -985,19 +1336,11 @@
      */
     @Override
     public Result faceAvailabilityOfLargeImg(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
+        List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
+        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+
         long total = mongoTemplate.count(query, FaceDeviceSamplingResult.class);
-        query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+        MongoUtil.setPage(query, params, TIME_FIELD);
         List<FaceDeviceSamplingResult> resultList = mongoTemplate.find(query, FaceDeviceSamplingResult.class);
         // 缁熻鏁�
         HashMap<String, Object> map = new HashMap<>();
@@ -1013,11 +1356,14 @@
      */
     @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);
 
-        return  Result.ok().data(page.getResult()).total(page.getTotal());
+        // 缁熻鏁�
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("count", CollectionUtils.EMPTY_COLLECTION);
+        map.put("list", page);
+        return Result.ok().data(map).total(page.getTotal());
 
     }
 }

--
Gitblit v1.8.0