From d74864fb938883b9c2b69abaf8b3ff740f03d930 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 23 十月 2024 10:22:14 +0800
Subject: [PATCH] 数据中心各种在线率优化

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 1299 +++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 1,010 insertions(+), 289 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 c1672df..f0c00c6 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,5 +1,6 @@
 package com.ycl.platform.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.github.pagehelper.Page;
@@ -7,27 +8,27 @@
 import com.mongodb.client.AggregateIterable;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
-import com.ycl.platform.domain.entity.CheckIndexVideo;
-import com.ycl.platform.domain.entity.ImageResourceSecurityDetail;
-import com.ycl.platform.domain.entity.YwPoint;
+import com.ycl.platform.domain.entity.*;
 import com.ycl.platform.domain.query.DataCenterQuery;
 import com.ycl.platform.domain.result.HK.*;
+import com.ycl.platform.domain.result.SYS.TMonitorResult;
 import com.ycl.platform.domain.result.UY.*;
+import com.ycl.platform.domain.vo.PointDetailVO;
 import com.ycl.platform.mapper.ImageResourceSecurityDetailMapper;
 import com.ycl.platform.mapper.YwPointMapper;
-import com.ycl.platform.service.DataCenterService;
-import com.ycl.platform.service.ICheckIndexCarService;
-import com.ycl.platform.service.ICheckIndexVideoService;
-import com.ycl.platform.service.YwPointService;
+import com.ycl.platform.service.*;
 import com.ycl.system.Result;
 import com.ycl.system.page.PageUtil;
 import com.ycl.utils.DateUtils;
 import com.ycl.utils.MongoUtil;
+import constant.ApiConstants;
+import constant.CheckConstants;
 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.aggregation.*;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.TextCriteria;
@@ -35,6 +36,7 @@
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.text.DecimalFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -52,9 +54,13 @@
     private final ImageResourceSecurityDetailMapper securityDetailMapper;
     private final YwPointMapper pointMapper;
     private final ICheckIndexVideoService checkIndexVideoService;
+    private final ICheckIndexCarService checkIndexCarService;
+    private final ICheckIndexFaceService checkIndexFaceService;
 
 
     private final static String TIME_FIELD = "mongoCreateTime";
+
+    private static DecimalFormat DF = new DecimalFormat("#.####");
 
     /**
      * 瑙嗛锛氱偣浣嶅湪绾跨巼
@@ -64,24 +70,91 @@
      */
     @Override
     public Result videoPointOnlineRate(DataCenterQuery params) {
-        // 鐢熸垚鏌ヨ
-        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);
+        List<String> likeFileds = Arrays.asList("name", "no", "ip");
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+        //鏌ヨ棰戣澶�
+        query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+        //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
+        if(params.getOption()!=null) {
+            query.addCriteria(Criteria.where("online").is(params.getOption()));
+        }
+        // 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈�
+        query.with(Sort.by(Sort.Order.asc("pingOnline")));
+        //鍒嗛〉鏁伴噺
+        long total = mongoTemplate.count(query, TMonitorResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
-        List<VideoOnlineResult> resultList = mongoTemplate.find(query, VideoOnlineResult.class);
+        List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
+        resultList.forEach(item -> {
+            if(item.getPingOnline() ==null){
+                item.setPingOnlineStr("鏈煡");
+            } else if (item.getPingOnline()) {
+                item.setPingOnlineStr("鍦ㄧ嚎");
+            } else if(!item.getPingOnline()){
+                item.setPingOnlineStr("绂荤嚎");
+            }
+            if(1== item.getOnline() ){
+                item.setOnlineStr("鍦ㄧ嚎");
+            }else if(-1==item.getOnline()){
+                item.setOnlineStr("绂荤嚎");
+            }else {
+                item.setOnlineStr("鏈煡");
+            }
+        });
+        params.setDeptTag(-1);
+        params.setDeviceType(1);
 
-        // 缁熻鏁伴噺
-        MongoDatabase database = mongoTemplate.getDb();
-        MongoCollection<Document> collection = database.getCollection("uy_online");
-        long distinctCount = collection.distinct("deviceId", String.class).into(new ArrayList<>()).size();
-        Date now = new Date();
-        List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
-                .select(CheckIndexVideo::getSiteOnline)
-                .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
-                .list();
+        //鍗＄墖缁熻
+        int totalCount =0;
+        int onlineCount =0;
+        int offlineCount =0;
+        int unknownCount =0;
+        //鏋勫缓鏉′欢
+        List<Criteria> criteriaList = new ArrayList<>();
+        // 娣诲姞鍥哄畾鏉′欢
+        criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+        criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
+        // 鏍规嵁dataType鍔ㄦ�佹坊鍔犳潯浠�
+        if (params.getDataType() == 1) {
+            criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE));
+        } else if (params.getDataType() == 2) {
+            criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
+        }
+        // 鏋勫缓match鎿嶄綔
+        MatchOperation match = Aggregation.match(
+                new Criteria().andOperator(criteriaList.toArray(new Criteria[0]))
+        );
+        GroupOperation group = Aggregation.group()
+                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Online)).then(1).otherwise(0)).as("onlineCount")
+                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Offline)).then(1).otherwise(0)).as("offlineCount")
+                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Unknown)).then(1).otherwise(0)).as("unknownCount");
+        // 灏嗗尮閰嶉樁娈靛拰鍒嗙粍闃舵缁勫悎璧锋潵
+        Aggregation aggregation = Aggregation.newAggregation(match, group);
+        // 鎵ц鑱氬悎鏌ヨ
+        AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class); // 鏇挎崲涓轰綘鐨勯泦鍚堝悕绉�
+        for (Map<String, Object> result : results.getMappedResults()) {
+            offlineCount =(Integer) result.getOrDefault("offlineCount",0L);
+            unknownCount =(Integer) result.getOrDefault("unknownCount",0L);
+            onlineCount = (Integer) result.getOrDefault("onlineCount",0L);
+            totalCount = offlineCount + unknownCount + onlineCount;
+        }
+        /** 鏌ヨ褰撳ぉ鍦ㄧ嚎鐜� */
+        // 鍒涘缓涓�涓猀ueryWrapper瀹炰緥
+        QueryWrapper<CheckIndexVideo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().select(CheckIndexVideo::getSiteOnline) // 閫夋嫨瑕佹煡璇㈢殑瀛楁
+                .between(CheckIndexVideo::getCreateTime, params.getStartTime(), params.getEndTime()); // 璁剧疆鏃堕棿鑼冨洿鏉′欢
+        if (params.getDataType() == 0) {
+            //鍖哄幙
+            queryWrapper.lambda().eq(CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_County);
+        }else if(params.getDataType() == 1){
+            //鐪佸巺
+            queryWrapper.lambda().eq(CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province);
+        }else if(params.getDataType() == 2){
+            //鍏畨閮�
+            queryWrapper.lambda().eq(CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept);
+        }
+        // 浣跨敤QueryWrapper鎵ц鏌ヨ
+        List<CheckIndexVideo> videoList = checkIndexVideoService.getBaseMapper().selectList(queryWrapper);
+
         BigDecimal onlineRate = BigDecimal.ZERO;
         if (CollectionUtils.isNotEmpty(videoList)) {
             BigDecimal sum = videoList.stream().map(CheckIndexVideo::getSiteOnline).reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -89,7 +162,7 @@
             onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
         }
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", Arrays.asList(distinctCount + "",onlineRate + "%"));
+        map.put("count", Arrays.asList(totalCount + "",onlineCount +"",offlineCount+"" ,unknownCount+"", this.remove0(onlineRate)));
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -102,40 +175,79 @@
      */
     @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 鍙細浜х敓涓�涓粨鏋�
+        List<String> likeFileds = Arrays.asList("name", "no", "ip");
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+        //鏌ヨ棰戣澶�
+        query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+        query.addCriteria(Criteria.where("deptTag").is(Boolean.TRUE));
+        //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
+        if(params.getOption()!=null) {
+            query.addCriteria(Criteria.where("online").is(params.getOption()));
         }
-        Date now = new Date();
+        // 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈�
+        query.with(Sort.by(Sort.Order.asc("pingOnline")));
+        //鍒嗛〉鏁伴噺
+        long total = mongoTemplate.count(query, TMonitorResult.class);
+        MongoUtil.setPage(query, params, TIME_FIELD);
+        List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
+        resultList.forEach(item -> {
+            if(item.getPingOnline() ==null){
+                item.setPingOnlineStr("鏈煡");
+            } else if (item.getPingOnline()) {
+                item.setPingOnlineStr("鍦ㄧ嚎");
+            } else if(!item.getPingOnline()){
+                item.setPingOnlineStr("绂荤嚎");
+            }
+            if (1 == item.getOnline()) {
+                item.setOnlineStr("鍦ㄧ嚎");
+            } else if (-1 == item.getOnline()) {
+                item.setOnlineStr("绂荤嚎");
+            } else {
+                item.setOnlineStr("鏈煡");
+            }
+        });
+        // 缁熻璁惧鏁伴噺
+        //鍗＄墖缁熻
+        int totalCount =0;
+        int onlineCount =0;
+        int offlineCount =0;
+        int unknownCount =0;
+        //鏋勫缓鏉′欢
+        List<Criteria> criteriaList = new ArrayList<>();
+        // 娣诲姞鍥哄畾鏉′欢
+        criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+        criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
+        // 鏍规嵁dataType鍔ㄦ�佹坊鍔犳潯浠�
+        if (params.getDataType() == 1) {
+            criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE));
+        } else if (params.getDataType() == 2) {
+            criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
+        }
+        // 鏋勫缓match鎿嶄綔
+        MatchOperation match = Aggregation.match(
+                new Criteria().andOperator(criteriaList.toArray(new Criteria[0]))
+        );
+        GroupOperation group = Aggregation.group()
+                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Online)).then(1).otherwise(0)).as("onlineCount")
+                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Offline)).then(1).otherwise(0)).as("offlineCount")
+                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Unknown)).then(1).otherwise(0)).as("unknownCount");
+        // 灏嗗尮閰嶉樁娈靛拰鍒嗙粍闃舵缁勫悎璧锋潵
+        Aggregation aggregation = Aggregation.newAggregation(match, group);
+        // 鎵ц鑱氬悎鏌ヨ
+        AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class); // 鏇挎崲涓轰綘鐨勯泦鍚堝悕绉�
+        for (Map<String, Object> result : results.getMappedResults()) {
+            offlineCount =(Integer) result.getOrDefault("offlineCount",0L);
+            unknownCount =(Integer) result.getOrDefault("unknownCount",0L);
+            onlineCount = (Integer) result.getOrDefault("onlineCount",0L);
+            totalCount = offlineCount + unknownCount + onlineCount;
+        }
+
+        params.setDeptTag(1);
+        params.setDeviceType(1);
         List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
                 .select(CheckIndexVideo::getMinistrySiteOnline)
-                .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+                .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
+                .between(CheckIndexVideo::getCreateTime, params.getStartTime(),  params.getEndTime())
                 .list();
         BigDecimal onlineRate = BigDecimal.ZERO;
         if (CollectionUtils.isNotEmpty(videoList)) {
@@ -144,7 +256,7 @@
             onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
         }
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", Arrays.asList(uniqueDeviceIdCount + "", onlineRate + "%"));
+        map.put("count", Arrays.asList(totalCount + "",onlineCount +"",offlineCount+"" ,unknownCount+"", this.remove0(onlineRate)));
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -157,38 +269,79 @@
      */
     @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 鍙細浜х敓涓�涓粨鏋�
+        List<String> likeFileds = Arrays.asList("name", "no", "ip");
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+        //鏌ヨ棰戣澶�
+        query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+        query.addCriteria(Criteria.where("importantTag").is(Boolean.TRUE));
+        //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
+        if(params.getOption()!=null) {
+            query.addCriteria(Criteria.where("online").is(params.getOption()));
         }
+        // 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈�
+        query.with(Sort.by(Sort.Order.asc("pingOnline")));
+        //鍒嗛〉鏁伴噺
+        long total = mongoTemplate.count(query, TMonitorResult.class);
+        MongoUtil.setPage(query, params, TIME_FIELD);
+        List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
+        params.setDeptTag(3);
+        params.setDeviceType(1);
+        resultList.forEach(item -> {
+            if(item.getPingOnline() ==null){
+                item.setPingOnlineStr("鏈煡");
+            } else if (item.getPingOnline()) {
+                item.setPingOnlineStr("鍦ㄧ嚎");
+            } else if(!item.getPingOnline()){
+                item.setPingOnlineStr("绂荤嚎");
+            }
+            if (1 == item.getOnline()) {
+                item.setOnlineStr("鍦ㄧ嚎");
+            } else if (-1 == item.getOnline()) {
+                item.setOnlineStr("绂荤嚎");
+            } else {
+                item.setOnlineStr("鏈煡");
+            }
+        });
 
-        Date now = new Date();
+        // 缁熻璁惧鏁伴噺
+        //鍗＄墖缁熻
+        int totalCount =0;
+        int onlineCount =0;
+        int offlineCount =0;
+        int unknownCount =0;
+        //鏋勫缓鏉′欢
+        List<Criteria> criteriaList = new ArrayList<>();
+        // 娣诲姞鍥哄畾鏉′欢
+        criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+        criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
+        // 鏍规嵁dataType鍔ㄦ�佹坊鍔犳潯浠�
+        if (params.getDataType() == 1) {
+            criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE));
+        } else if (params.getDataType() == 2) {
+            criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
+        }
+        // 鏋勫缓match鎿嶄綔
+        MatchOperation match = Aggregation.match(
+                new Criteria().andOperator(criteriaList.toArray(new Criteria[0]))
+        );
+        GroupOperation group = Aggregation.group()
+                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Online)).then(1).otherwise(0)).as("onlineCount")
+                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Offline)).then(1).otherwise(0)).as("offlineCount")
+                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Unknown)).then(1).otherwise(0)).as("unknownCount");
+        // 灏嗗尮閰嶉樁娈靛拰鍒嗙粍闃舵缁勫悎璧锋潵
+        Aggregation aggregation = Aggregation.newAggregation(match, group);
+        // 鎵ц鑱氬悎鏌ヨ
+        AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class); // 鏇挎崲涓轰綘鐨勯泦鍚堝悕绉�
+        for (Map<String, Object> result : results.getMappedResults()) {
+            offlineCount =(Integer) result.getOrDefault("offlineCount",0L);
+            unknownCount =(Integer) result.getOrDefault("unknownCount",0L);
+            onlineCount = (Integer) result.getOrDefault("onlineCount",0L);
+            totalCount = offlineCount + unknownCount + onlineCount;
+        }
         List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
                 .select(CheckIndexVideo::getKeySiteOnline)
-                .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+                .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
+                .between(CheckIndexVideo::getCreateTime, params.getStartTime(),  params.getEndTime())
                 .list();
         BigDecimal onlineRate = BigDecimal.ZERO;
         if (CollectionUtils.isNotEmpty(videoList)) {
@@ -197,7 +350,7 @@
             onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
         }
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", Arrays.asList(uniqueDeviceIdCount + "", onlineRate + "%"));
+        map.put("count", Arrays.asList(totalCount + "",onlineCount +"",offlineCount+"" ,unknownCount+"", this.remove0(onlineRate)));
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -210,38 +363,81 @@
      */
     @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);
+        List<String> likeFileds = Arrays.asList("name", "no", "ip");
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+        //鏌ヨ棰戣澶�
+        query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+        query.addCriteria(Criteria.where("importantCommandImageTag").is(Boolean.TRUE));
+        //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
+        if(params.getOption()!=null) {
+            query.addCriteria(Criteria.where("online").is(params.getOption()));
+        }
+        // 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈�
+        query.with(Sort.by(Sort.Order.asc("pingOnline")));
+        //鍒嗛〉鏁伴噺
+        long total = mongoTemplate.count(query, TMonitorResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
-        List<VideoOnlineResult> resultList = mongoTemplate.find(query, VideoOnlineResult.class);
+        List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.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")
+        params.setDeptTag(4);
+        params.setDeviceType(1);
+        resultList.forEach(item -> {
+            if(item.getPingOnline() ==null){
+                item.setPingOnlineStr("鏈煡");
+            } else if (item.getPingOnline()) {
+                item.setPingOnlineStr("鍦ㄧ嚎");
+            } else if(!item.getPingOnline()){
+                item.setPingOnlineStr("绂荤嚎");
+            }
+            if (1 == item.getOnline()) {
+                item.setOnlineStr("鍦ㄧ嚎");
+            } else if (-1 == item.getOnline()) {
+                item.setOnlineStr("绂荤嚎");
+            } else {
+                item.setOnlineStr("鏈煡");
+            }
+        });
+
+        // 缁熻璁惧鏁伴噺
+        //鍗＄墖缁熻
+        int totalCount =0;
+        int onlineCount =0;
+        int offlineCount =0;
+        int unknownCount =0;
+        //鏋勫缓鏉′欢
+        List<Criteria> criteriaList = new ArrayList<>();
+        // 娣诲姞鍥哄畾鏉′欢
+        criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+        criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
+        // 鏍规嵁dataType鍔ㄦ�佹坊鍔犳潯浠�
+        if (params.getDataType() == 1) {
+            criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE));
+        } else if (params.getDataType() == 2) {
+            criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
+        }
+        // 鏋勫缓match鎿嶄綔
+        MatchOperation match = Aggregation.match(
+                new Criteria().andOperator(criteriaList.toArray(new Criteria[0]))
         );
-        // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
-        AggregateIterable<Document> result = collection.aggregate(pipeline);
-        Integer uniqueDeviceIdCount = 0;
-        for (Document doc : result) {
-            uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
-            break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
+        GroupOperation group = Aggregation.group()
+                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Online)).then(1).otherwise(0)).as("onlineCount")
+                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Offline)).then(1).otherwise(0)).as("offlineCount")
+                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Unknown)).then(1).otherwise(0)).as("unknownCount");
+        // 灏嗗尮閰嶉樁娈靛拰鍒嗙粍闃舵缁勫悎璧锋潵
+        Aggregation aggregation = Aggregation.newAggregation(match, group);
+        // 鎵ц鑱氬悎鏌ヨ
+        AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class); // 鏇挎崲涓轰綘鐨勯泦鍚堝悕绉�
+        for (Map<String, Object> result : results.getMappedResults()) {
+            offlineCount =(Integer) result.getOrDefault("offlineCount",0L);
+            unknownCount =(Integer) result.getOrDefault("unknownCount",0L);
+            onlineCount = (Integer) result.getOrDefault("onlineCount",0L);
+            totalCount = offlineCount + unknownCount + onlineCount;
         }
 
-        Date now = new Date();
         List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
                 .select(CheckIndexVideo::getKeyCommandImageOnline)
-                .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+                .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
+                .between(CheckIndexVideo::getCreateTime, params.getStartTime(),  params.getEndTime())
                 .list();
         BigDecimal onlineRate = BigDecimal.ZERO;
         if (CollectionUtils.isNotEmpty(videoList)) {
@@ -250,7 +446,7 @@
             onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
         }
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", Arrays.asList(uniqueDeviceIdCount + "", onlineRate + "%"));
+        map.put("count", Arrays.asList(totalCount + "",onlineCount +"",offlineCount+"" ,unknownCount+"", this.remove0(onlineRate)));
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -264,7 +460,7 @@
     @Override
     public Result videoOneMachineDocumentRegister(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("ip.showValue", "name.showValue", "serialNumber.showValue");
-        Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, MonitorQualifyResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -274,10 +470,22 @@
         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> dList1 = new ArrayList<>(2);
+        dList1.add(new Document("ip.error", new Document("$eq", Boolean.TRUE)));
+        setTag(params, dList1);
+        List<Document> dList2 = new ArrayList<>(2);
+        dList2.add(new Document("macdz.error", new Document("$eq", Boolean.TRUE)));
+        setTag(params, dList2);
+        List<Document> dList3 = new ArrayList<>(2);
+        dList3.add(new Document("latitude.error", new Document("$eq", Boolean.TRUE)));
+        setTag(params, dList3);
+        List<Document> dList4 = new ArrayList<>(2);
+        dList4.add(new Document("longitude.error", new Document("$eq", Boolean.TRUE)));
+        setTag(params, dList4);
+        Document ipErrFilter = new Document("$and", dList1);
+        Document macdzErrFilter = new Document("$and", dList2);
+        Document latitudeErrFilter = new Document("$and", dList3);
+        Document longitudeErrFilter = new Document("$and", dList4);
 
         List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter);
         List<String> rList = lists.stream().map(filter -> {
@@ -301,6 +509,7 @@
         Date now = new Date();
         List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
                 .select(CheckIndexVideo::getMonitorRegistration)
+                .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
                 .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
                 .list();
         BigDecimal onlineRate = BigDecimal.ZERO;
@@ -309,7 +518,7 @@
             BigDecimal count = BigDecimal.valueOf(videoList.size());
             onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
         }
-        rList.add(onlineRate + "%");
+        rList.add(this.remove0(onlineRate));
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", rList);
         map.put("list", resultList);
@@ -325,7 +534,7 @@
     @Override
     public Result videoOneMachineDocumentQualified(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("ip.showValue", "name.showValue", "serialNumber.showValue");
-        Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, MonitorQualifyResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -335,10 +544,22 @@
         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> dList1 = new ArrayList<>(2);
+        dList1.add(new Document("ip.error", new Document("$eq", Boolean.TRUE)));
+        setTag(params, dList1);
+        List<Document> dList2 = new ArrayList<>(2);
+        dList2.add(new Document("macdz.error", new Document("$eq", Boolean.TRUE)));
+        setTag(params, dList2);
+        List<Document> dList3 = new ArrayList<>(2);
+        dList3.add(new Document("latitude.error", new Document("$eq", Boolean.TRUE)));
+        setTag(params, dList3);
+        List<Document> dList4 = new ArrayList<>(2);
+        dList4.add(new Document("longitude.error", new Document("$eq", Boolean.TRUE)));
+        setTag(params, dList4);
+        Document ipErrFilter = new Document("$and", dList1);
+        Document macdzErrFilter = new Document("$and", dList2);
+        Document latitudeErrFilter = new Document("$and", dList3);
+        Document longitudeErrFilter = new Document("$and", dList4);
 
         List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter);
         List<String> rList = lists.stream().map(filter -> {
@@ -362,6 +583,7 @@
         Date now = new Date();
         List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
                 .select(CheckIndexVideo::getMonitorQualification)
+                .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
                 .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
                 .list();
         BigDecimal onlineRate = BigDecimal.ZERO;
@@ -370,7 +592,7 @@
             BigDecimal count = BigDecimal.valueOf(videoList.size());
             onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
         }
-        rList.add(onlineRate + "%");
+        rList.add(this.remove0(onlineRate));
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", rList);
         map.put("list", resultList);
@@ -385,9 +607,8 @@
      */
     @Override
     public Result videoAssessmentFileRatio(DataCenterQuery params) {
-        // TODO 鏂板涓�寮犺〃璁板綍姣忔鐨勬。妗堣�冩牳
         List<String> likeFileds = Arrays.asList("ip.showValue", "name.showValue", "serialNumber.showValue");
-        Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, MonitorQualifyResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -397,10 +618,22 @@
         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> dList1 = new ArrayList<>(2);
+        dList1.add(new Document("ip.error", new Document("$eq", Boolean.TRUE)));
+        setTag(params, dList1);
+        List<Document> dList2 = new ArrayList<>(2);
+        dList2.add(new Document("macdz.error", new Document("$eq", Boolean.TRUE)));
+        setTag(params, dList2);
+        List<Document> dList3 = new ArrayList<>(2);
+        dList3.add(new Document("latitude.error", new Document("$eq", Boolean.TRUE)));
+        setTag(params, dList3);
+        List<Document> dList4 = new ArrayList<>(2);
+        dList4.add(new Document("longitude.error", new Document("$eq", Boolean.TRUE)));
+        setTag(params, dList4);
+        Document ipErrFilter = new Document("$and", dList1);
+        Document macdzErrFilter = new Document("$and", dList2);
+        Document latitudeErrFilter = new Document("$and", dList3);
+        Document longitudeErrFilter = new Document("$and", dList4);
 
         List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter);
         List<String> rList = lists.stream().map(filter -> {
@@ -437,7 +670,7 @@
     @Override
     public Result videoAvailabilityRate(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
-        Query query = MongoUtil.getQuery(params, "deviceId", "createTime", likeFileds, null);
+        Query query = MongoUtil.getQuery(params, "createTime", likeFileds, null);
 
         long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
         MongoUtil.setPage(query, params, "createTime");
@@ -448,7 +681,10 @@
         MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum");
         List<Integer> status = Arrays.asList(1, 0, -1);
         List<String> resultCount = status.stream().map(item -> {
-            Document filter = new Document("recordStatus", item);
+            List<Document> dList = new ArrayList<>(2);
+            dList.add(new Document("recordStatus", new Document("$eq", item)));
+            setTag(params, dList);
+            Document filter = new Document("$and", dList);
             // 鏋勫缓鑱氬悎绠￠亾
             List<Document> pipeline = Arrays.asList(
                     new Document("$match", filter),
@@ -469,6 +705,7 @@
         Date now = new Date();
         List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
                 .select(CheckIndexVideo::getVideoAvailable)
+                .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
                 .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
                 .list();
         BigDecimal onlineRate = BigDecimal.ZERO;
@@ -477,7 +714,7 @@
             BigDecimal count = BigDecimal.valueOf(videoList.size());
             onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
         }
-        resultCount.add(onlineRate + "%");
+        resultCount.add(this.remove0(onlineRate));
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", resultCount);
         map.put("list", resultList);
@@ -492,10 +729,8 @@
      */
     @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);
+        Query query = MongoUtil.getQuery(params, "createTime", likeFileds, 1);
 
         long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
         MongoUtil.setPage(query, params, "createTime");
@@ -506,10 +741,11 @@
         MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum");
         List<Integer> status = Arrays.asList(1, 0, -1);
         List<String> 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> dList = new ArrayList<>(4);
+            dList.add(new Document("deptTag", new Document("$eq", Boolean.TRUE)));
+            dList.add(new Document("recordStatus", new Document("$eq", item)));
+            setTag(params, dList);
+            Document filter = new Document("$and", dList);
             // 鏋勫缓鑱氬悎绠￠亾
             List<Document> pipeline = Arrays.asList(
                     new Document("$match", filter),
@@ -530,6 +766,7 @@
         Date now = new Date();
         List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
                 .select(CheckIndexVideo::getMinistryVideoAvailable)
+                .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
                 .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
                 .list();
         BigDecimal onlineRate = BigDecimal.ZERO;
@@ -538,7 +775,7 @@
             BigDecimal count = BigDecimal.valueOf(videoList.size());
             onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
         }
-        resultCount.add(onlineRate + "%");
+        resultCount.add(this.remove0(onlineRate));
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", resultCount);
         map.put("list", resultList);
@@ -553,10 +790,8 @@
      */
     @Override
     public Result videoImportantPointAvailabilityRate(DataCenterQuery params) {
-
-        List<String> deptGBList = pointMapper.getDeptPointGB(1);
         List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
-        Query query = MongoUtil.getQuery(params, "deviceId", "createTime", likeFileds, deptGBList);
+        Query query = MongoUtil.getQuery(params, "createTime", likeFileds, 3);
 
         long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
         MongoUtil.setPage(query, params, "createTime");
@@ -567,10 +802,11 @@
         MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum");
         List<Integer> status = Arrays.asList(1, 0, -1);
         List<String> 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> dList = new ArrayList<>(4);
+            dList.add(new Document("importantTag", new Document("$eq", Boolean.TRUE)));
+            dList.add(new Document("recordStatus", new Document("$eq", item)));
+            setTag(params, dList);
+            Document filter = new Document("$and", dList);
             // 鏋勫缓鑱氬悎绠￠亾
             List<Document> pipeline = Arrays.asList(
                     new Document("$match", filter),
@@ -585,12 +821,13 @@
                 uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
                 break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
             }
-            return uniqueDeviceIdCount + "%";
+            return uniqueDeviceIdCount + "";
         }).collect(Collectors.toList());
 
         Date now = new Date();
         List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
                 .select(CheckIndexVideo::getKeyVideoAvailable)
+                .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
                 .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
                 .list();
         BigDecimal onlineRate = BigDecimal.ZERO;
@@ -599,7 +836,7 @@
             BigDecimal count = BigDecimal.valueOf(videoList.size());
             onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
         }
-        resultCount.add(onlineRate + "%");
+        resultCount.add(this.remove0(onlineRate));
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", resultCount);
         map.put("list", resultList);
@@ -615,7 +852,7 @@
     @Override
     public Result videoLabelingAccuracy(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
-        Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
         List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
@@ -639,10 +876,8 @@
      */
     @Override
     public Result videoImportantPointLabelingAccuracy(DataCenterQuery params) {
-
-        List<String> deptGBList = pointMapper.getDeptPointGB(1);
         List<String> likeFileds = Arrays.asList("deviceNo", "osdName");
-        Query query = MongoUtil.getQuery(params, "deviceNo", "checkTime", likeFileds, deptGBList);
+        Query query = MongoUtil.getQuery(params, "checkTime", likeFileds, 3);
 
         long total = mongoTemplate.count(query, OsdCheckResult.class);
         MongoUtil.setPage(query, params, "checkTime");
@@ -652,10 +887,26 @@
         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> dList1 = new ArrayList<>(2);
+        dList1.add(new Document("importantTag", Boolean.TRUE));
+        dList1.add(new Document("osdNameCorrect", new Document("$eq", 1)));
+        setTag(params, dList1);
+        List<Document> dList2 = new ArrayList<>(2);
+        dList2.add(new Document("importantTag", Boolean.TRUE));
+        dList2.add(new Document("osdNameCorrect", new Document("$eq", -1)));
+        setTag(params, dList2);
+        List<Document> dList3 = new ArrayList<>(2);
+        dList3.add(new Document("importantTag", Boolean.TRUE));
+        dList3.add(new Document("osdTimeCorrect", new Document("$eq", 1)));
+        setTag(params, dList3);
+        List<Document> dList4 = new ArrayList<>(2);
+        dList4.add(new Document("importantTag", Boolean.TRUE));
+        dList4.add(new Document("osdTimeCorrect", new Document("$eq", -1)));
+        setTag(params, dList4);
+        Document osdNameFilter = new Document("$and", dList1);
+        Document osdNameErrFilter = new Document("$and", dList2);
+        Document osdTimeFilter = new Document("$and", dList3);
+        Document osdTimeErrFilter = new Document("$and", dList4);
         List<Document> lists = Arrays.asList(osdNameFilter, osdNameErrFilter, osdTimeFilter, osdTimeErrFilter);
         List<String> rList = lists.stream().map(filter -> {
             // 鏋勫缓鑱氬悎绠￠亾
@@ -678,6 +929,7 @@
         Date now = new Date();
         List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
                 .select(CheckIndexVideo::getKeyAnnotationAccuracy)
+                .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
                 .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
                 .list();
         BigDecimal onlineRate = BigDecimal.ZERO;
@@ -686,7 +938,7 @@
             BigDecimal count = BigDecimal.valueOf(videoList.size());
             onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
         }
-        rList.add(onlineRate + "%");
+        rList.add(this.remove0(onlineRate));
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", rList);
         map.put("list", resultList);
@@ -703,7 +955,7 @@
     public Result videoCheckTimeAccuracy(DataCenterQuery params) {
 
         List<String> likeFileds = Arrays.asList("deviceId");
-        Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, OneMachineFileResult.class);
         List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
@@ -728,9 +980,8 @@
     @Override
     public Result videoImportantPointCheckTimeAccuracy(DataCenterQuery params) {
 
-        List<String> deptGBList = pointMapper.getDeptPointGB(1);
         List<String> likeFileds = Arrays.asList("deviceNo", "osdName");
-        Query query = MongoUtil.getQuery(params, "deviceNo", "checkTime", likeFileds, deptGBList);
+        Query query = MongoUtil.getQuery(params, "checkTime", likeFileds, 3);
 
         long total = mongoTemplate.count(query, OsdCheckResult.class);
         MongoUtil.setPage(query, params, "checkTime");
@@ -740,8 +991,16 @@
         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> dList1 = new ArrayList<>(2);
+        dList1.add(new Document("importantTag", Boolean.TRUE));
+        dList1.add(new Document("osdTimeCorrect", new Document("$eq", 1)));
+        setTag(params, dList1);
+        List<Document> dList2 = new ArrayList<>(2);
+        dList2.add(new Document("importantTag", Boolean.TRUE));
+        dList2.add(new Document("osdTimeCorrect", new Document("$eq", -1)));
+        setTag(params, dList2);
+        Document osdTimeFilter = new Document("$and", dList1);
+        Document osdTimeErrFilter = new Document("$and", dList2);
         List<Document> lists = Arrays.asList(osdTimeFilter, osdTimeErrFilter);
         List<String> rList = lists.stream().map(filter -> {
             // 鏋勫缓鑱氬悎绠￠亾
@@ -764,6 +1023,7 @@
         Date now = new Date();
         List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
                 .select(CheckIndexVideo::getKeyTimingAccuracy)
+                .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
                 .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
                 .list();
         BigDecimal onlineRate = BigDecimal.ZERO;
@@ -772,7 +1032,7 @@
             BigDecimal count = BigDecimal.valueOf(videoList.size());
             onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
         }
-        rList.add(onlineRate + "%");
+        rList.add(this.remove0(onlineRate));
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", rList);
         map.put("list", resultList);
@@ -789,7 +1049,7 @@
     @Override
     public Result vehicleViewDockStable(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -799,12 +1059,28 @@
         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> dList1 = new ArrayList<>(2);
+        dList1.add(new Document("importantTag", Boolean.TRUE));
+        dList1.add(new Document("resultType", new Document("$eq", 1)));
+        setTag(params, dList1);
+        List<Document> dList2 = new ArrayList<>(2);
+        dList2.add(new Document("importantTag", Boolean.TRUE));
+        dList2.add(new Document("resultType", new Document("$eq", 2)));
+        setTag(params, dList2);
+        List<Document> dList3 = new ArrayList<>(2);
+        dList3.add(new Document("importantTag", Boolean.TRUE));
+        dList3.add(new Document("resultType", new Document("$eq", 3)));
+        setTag(params, dList3);
+        List<Document> dList4 = new ArrayList<>(2);
+        dList4.add(new Document("importantTag", Boolean.TRUE));
+        dList4.add(new Document("resultType", new Document("$eq", 4)));
+        setTag(params, dList4);
+        Document normalFilter = new Document("$and", dList1);
+        Document noDataFilter = new Document("$and", dList2);
+        Document trFilter = new Document("$and", dList3);
+        Document littleFilter = new Document("$and", dList4);
         List<Document> lists = Arrays.asList(normalFilter, noDataFilter, trFilter, littleFilter);
-        List<Integer> rList = lists.stream().map(filter -> {
+        List<String> rList = lists.stream().map(filter -> {
             // 鏋勫缓鑱氬悎绠￠亾
             List<Document> pipeline = Arrays.asList(
                     new Document("$match", filter),
@@ -819,9 +1095,22 @@
                 uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
                 break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
             }
-            return uniqueDeviceIdCount;
+            return uniqueDeviceIdCount + "";
         }).collect(Collectors.toList());
 
+        Date now = new Date();
+        List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
+                .select(CheckIndexCar::getViewConnectStability)
+                .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
+                .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+                .list();
+        BigDecimal onlineRate = BigDecimal.ZERO;
+        if (CollectionUtils.isNotEmpty(videoList)) {
+            BigDecimal sum = videoList.stream().map(CheckIndexCar::getViewConnectStability).reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal count = BigDecimal.valueOf(videoList.size());
+            onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+        }
+        rList.add(this.remove0(onlineRate));
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", rList);
         map.put("list", resultList);
@@ -836,20 +1125,89 @@
      */
     @Override
     public Result vehiclePointOnlineRate(DataCenterQuery params) {
-        List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
-
-        long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
+        List<String> likeFileds = Arrays.asList("name", "no", "ip");
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+        //鏌ヨ溅杈嗚澶�
+        query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Car + ".*"));
+        //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
+        if(params.getOption()!=null) {
+            query.addCriteria(Criteria.where("online").is(params.getOption()));
+        }
+        // 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈�
+        query.with(Sort.by(Sort.Order.asc("pingOnline")));
+        //鍒嗛〉鏁伴噺
+        long total = mongoTemplate.count(query, TMonitorResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
-        List<SnapshotDataMonitorResult> resultList = mongoTemplate.find(query, SnapshotDataMonitorResult.class);
+        //绯荤粺ping鐨勭粨鏋�
+        List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
+        params.setDeptTag(-1);
+        params.setDeviceType(2);
+        resultList.forEach(item -> {
+            if(item.getPingOnline() ==null){
+                item.setPingOnlineStr("鏈煡");
+            } else if (item.getPingOnline()) {
+                item.setPingOnlineStr("鍦ㄧ嚎");
+            } else if(!item.getPingOnline()){
+                item.setPingOnlineStr("绂荤嚎");
+            }
+            if (1 == item.getOnline()) {
+                item.setOnlineStr("鍦ㄧ嚎");
+            } else if (-1 == item.getOnline()) {
+                item.setOnlineStr("绂荤嚎");
+            } else {
+                item.setOnlineStr("鏈煡");
+            }
+        });
 
-        // 缁熻鏁伴噺
-        MongoDatabase database = mongoTemplate.getDb();
-        MongoCollection<Document> collection = database.getCollection("hk_snapshot_data_monitor");
-        long distinctCount = collection.distinct("externalIndexCode", String.class).into(new ArrayList<>()).size();
+        // 缁熻璁惧鏁伴噺
+        //鍗＄墖缁熻
+        int totalCount =0;
+        int onlineCount =0;
+        int offlineCount =0;
+        int unknownCount =0;
+        //鏋勫缓鏉′欢
+        List<Criteria> criteriaList = new ArrayList<>();
+        // 娣诲姞鍥哄畾鏉′欢
+        criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Car + ".*"));
+        criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
+        // 鏍规嵁dataType鍔ㄦ�佹坊鍔犳潯浠�
+        if (params.getDataType() == 1) {
+            criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE));
+        } else if (params.getDataType() == 2) {
+            criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
+        }
+        // 鏋勫缓match鎿嶄綔
+        MatchOperation match = Aggregation.match(
+                new Criteria().andOperator(criteriaList.toArray(new Criteria[0]))
+        );
+        GroupOperation group = Aggregation.group()
+                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Online)).then(1).otherwise(0)).as("onlineCount")
+                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Offline)).then(1).otherwise(0)).as("offlineCount")
+                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Unknown)).then(1).otherwise(0)).as("unknownCount");
+        // 灏嗗尮閰嶉樁娈靛拰鍒嗙粍闃舵缁勫悎璧锋潵
+        Aggregation aggregation = Aggregation.newAggregation(match, group);
+        // 鎵ц鑱氬悎鏌ヨ
+        AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class); // 鏇挎崲涓轰綘鐨勯泦鍚堝悕绉�
+        for (Map<String, Object> result : results.getMappedResults()) {
+            offlineCount =(Integer) result.getOrDefault("offlineCount",0L);
+            unknownCount =(Integer) result.getOrDefault("unknownCount",0L);
+            onlineCount = (Integer) result.getOrDefault("onlineCount",0L);
+            totalCount = offlineCount + unknownCount + onlineCount;
+        }
 
+        List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
+                .select(CheckIndexCar::getSiteOnline)
+                .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
+                .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
+                .list();
+        BigDecimal onlineRate = BigDecimal.ZERO;
+        if (CollectionUtils.isNotEmpty(videoList)) {
+            BigDecimal sum = videoList.stream().map(CheckIndexCar::getSiteOnline).reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal count = BigDecimal.valueOf(videoList.size());
+            onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+        }
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", Arrays.asList(distinctCount));
+        map.put("count", Arrays.asList(totalCount + "",onlineCount +"",offlineCount+"" ,unknownCount+"", this.remove0(onlineRate)));
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -863,7 +1221,7 @@
     @Override
     public Result vehicleNetDeviceDirectoryConsistency(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("ip.showValue", "name.showValue", "serialNumber.showValue");
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, MonitorQualifyResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -873,13 +1231,24 @@
         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> dList1 = new ArrayList<>(2);
+        dList1.add(new Document("ip.error", new Document("$eq", Boolean.TRUE)));
+        setTag(params, dList1);
+        List<Document> dList2 = new ArrayList<>(2);
+        dList2.add(new Document("macdz.error", new Document("$eq", Boolean.TRUE)));
+        setTag(params, dList2);
+        List<Document> dList3 = new ArrayList<>(2);
+        dList3.add(new Document("latitude.error", new Document("$eq", Boolean.TRUE)));
+        setTag(params, dList3);
+        List<Document> dList4 = new ArrayList<>(2);
+        dList4.add(new Document("longitude.error", new Document("$eq", Boolean.TRUE)));
+        setTag(params, dList4);
+        Document ipErrFilter = new Document("$and", dList1);
+        Document macdzErrFilter = new Document("$and", dList2);
+        Document latitudeErrFilter = new Document("$and", dList3);
+        Document longitudeErrFilter = new Document("$and", dList4);
         List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter);
-        List<Integer> rList = lists.stream().map(filter -> {
+        List<String> rList = lists.stream().map(filter -> {
             // 鏋勫缓鑱氬悎绠￠亾
             List<Document> pipeline = Arrays.asList(
                     new Document("$match", filter),
@@ -894,9 +1263,22 @@
                 uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
                 break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
             }
-            return uniqueDeviceIdCount;
+            return uniqueDeviceIdCount + "";
         }).collect(Collectors.toList());
 
+        Date now = new Date();
+        List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
+                .select(CheckIndexCar::getDeviceDirectoryConsistent)
+                .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
+                .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+                .list();
+        BigDecimal onlineRate = BigDecimal.ZERO;
+        if (CollectionUtils.isNotEmpty(videoList)) {
+            BigDecimal sum = videoList.stream().map(CheckIndexCar::getDeviceDirectoryConsistent).reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal count = BigDecimal.valueOf(videoList.size());
+            onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+        }
+        rList.add(this.remove0(onlineRate));
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", rList);
         map.put("list", resultList);
@@ -912,7 +1294,7 @@
     @Override
     public Result vehicleCollectionConsistency(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "crossName");
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, CrossDetailResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -922,13 +1304,25 @@
         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> dList1 = new ArrayList<>(2);
+        dList1.add(new Document("lalType", new Document("$eq", 1)));
+        setTag(params, dList1);
+        List<Document> dList2 = new ArrayList<>(2);
+        dList2.add(new Document("lalType", new Document("$eq", 2)));
+        setTag(params, dList2);
+        List<Document> dList3 = new ArrayList<>(2);
+        dList3.add(new Document("lalType", new Document("$eq", 3)));
+        setTag(params, dList3);
+        List<Document> dList4 = new ArrayList<>(2);
+        dList4.add(new Document("lalType", new Document("$eq", 4)));
+        setTag(params, dList4);
+        Document ipErrFilter = new Document("$and", dList1);
+        Document macdzErrFilter = new Document("$and", dList2);
+        Document latitudeErrFilter = new Document("$and", dList3);
+        Document longitudeErrFilter = new Document("$and", dList4);
 
         List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter);
-        List<Integer> rList = lists.stream().map(filter -> {
+        List<String> rList = lists.stream().map(filter -> {
             // 鏋勫缓鑱氬悎绠￠亾
             List<Document> pipeline = Arrays.asList(
                     new Document("$match", filter),
@@ -943,9 +1337,22 @@
                 uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
                 break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
             }
-            return uniqueDeviceIdCount;
+            return uniqueDeviceIdCount + "";
         }).collect(Collectors.toList());
 
+        Date now = new Date();
+        List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
+                .select(CheckIndexCar::getVehicleInformationCollectionAccuracy)
+                .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
+                .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+                .list();
+        BigDecimal onlineRate = BigDecimal.ZERO;
+        if (CollectionUtils.isNotEmpty(videoList)) {
+            BigDecimal sum = videoList.stream().map(CheckIndexCar::getVehicleInformationCollectionAccuracy).reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal count = BigDecimal.valueOf(videoList.size());
+            onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+        }
+        rList.add(this.remove0(onlineRate));
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", rList);
         map.put("list", resultList);
@@ -961,7 +1368,7 @@
     @Override
     public Result vehicleCollectionDataIntegrity(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, DataIntegrityMonitoringResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -971,8 +1378,21 @@
         MongoDatabase database = mongoTemplate.getDb();
         MongoCollection<Document> collection = database.getCollection("hk_data_integrity_monitoring");
 
+        Date now = new Date();
+        List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
+                .select(CheckIndexCar::getVehicleCaptureIntegrity)
+                .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
+                .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+                .list();
+        BigDecimal onlineRate = BigDecimal.ZERO;
+        if (CollectionUtils.isNotEmpty(videoList)) {
+            BigDecimal sum = videoList.stream().map(CheckIndexCar::getVehicleCaptureIntegrity).reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal count = BigDecimal.valueOf(videoList.size());
+            onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+        }
+
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", CollectionUtils.EMPTY_COLLECTION);
+        map.put("count", Arrays.asList(this.remove0(onlineRate)));
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -986,14 +1406,26 @@
     @Override
     public Result vehicleCollectionDataCaptured(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, AttrRecognitionMonitorResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
         List<AttrRecognitionMonitorResult> resultList = mongoTemplate.find(query, AttrRecognitionMonitorResult.class);
-        // 缁熻鏁�
+
+        Date now = new Date();
+        List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
+                .select(CheckIndexCar::getVehicleCaptureAccuracy)
+                .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
+                .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+                .list();
+        BigDecimal onlineRate = BigDecimal.ZERO;
+        if (CollectionUtils.isNotEmpty(videoList)) {
+            BigDecimal sum = videoList.stream().map(CheckIndexCar::getVehicleCaptureAccuracy).reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal count = BigDecimal.valueOf(videoList.size());
+            onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+        }
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", CollectionUtils.EMPTY_COLLECTION);
+        map.put("count", Arrays.asList(this.remove0(onlineRate)));
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -1007,7 +1439,7 @@
     @Override
     public Result vehicleClockAccuracy(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, VehicleDeviceInspectionResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -1018,12 +1450,21 @@
         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> dList1 = new ArrayList<>(2);
+        dList1.add(new Document("snapResult", new Document("$eq", 1)));
+        setTag(params, dList1);
+        List<Document> dList2 = new ArrayList<>(2);
+        dList2.add(new Document("snapResult", new Document("$eq", 2)));
+        setTag(params, dList2);
+        List<Document> dList3 = new ArrayList<>(2);
+        dList3.add(new Document("snapResult", new Document("$eq", 4)));
+        setTag(params, dList3);
+        Document ipErrFilter = new Document("$and", dList1);
+        Document macdzErrFilter = new Document("$and", dList2);
+        Document longitudeErrFilter = new Document("$and", dList3);
 
         List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, longitudeErrFilter);
-        List<Integer> rList = lists.stream().map(filter -> {
+        List<String> rList = lists.stream().map(filter -> {
             // 鏋勫缓鑱氬悎绠￠亾
             List<Document> pipeline = Arrays.asList(
                     new Document("$match", filter),
@@ -1038,9 +1479,22 @@
                 uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
                 break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
             }
-            return uniqueDeviceIdCount;
+            return uniqueDeviceIdCount + "";
         }).collect(Collectors.toList());
 
+        Date now = new Date();
+        List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
+                .select(CheckIndexCar::getVehicleTimingAccuracy)
+                .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
+                .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+                .list();
+        BigDecimal onlineRate = BigDecimal.ZERO;
+        if (CollectionUtils.isNotEmpty(videoList)) {
+            BigDecimal sum = videoList.stream().map(CheckIndexCar::getVehicleTimingAccuracy).reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal count = BigDecimal.valueOf(videoList.size());
+            onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+        }
+        rList.add(this.remove0(onlineRate));
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", rList);
         map.put("list", resultList);
@@ -1056,14 +1510,27 @@
     @Override
     public Result vehicleTimelyUploadAccuracy(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, SnapshotDelayMonitorResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
         List<SnapshotDelayMonitorResult> resultList = mongoTemplate.find(query, SnapshotDelayMonitorResult.class);
+
         // 缁熻鏁�
+        Date now = new Date();
+        List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
+                .select(CheckIndexCar::getVehicleUploadTimeliness)
+                .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
+                .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+                .list();
+        BigDecimal onlineRate = BigDecimal.ZERO;
+        if (CollectionUtils.isNotEmpty(videoList)) {
+            BigDecimal sum = videoList.stream().map(CheckIndexCar::getVehicleUploadTimeliness).reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal count = BigDecimal.valueOf(videoList.size());
+            onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+        }
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", CollectionUtils.EMPTY_COLLECTION);
+        map.put("count", Arrays.asList(this.remove0(onlineRate)));
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -1077,14 +1544,27 @@
     @Override
     public Result vehicleUrlAccuracy(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, PicAccessResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
         List<PicAccessResult> resultList = mongoTemplate.find(query, PicAccessResult.class);
+
         // 缁熻鏁�
+        Date now = new Date();
+        List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
+                .select(CheckIndexCar::getVehicleUrlAvailability)
+                .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
+                .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+                .list();
+        BigDecimal onlineRate = BigDecimal.ZERO;
+        if (CollectionUtils.isNotEmpty(videoList)) {
+            BigDecimal sum = videoList.stream().map(CheckIndexCar::getVehicleUrlAvailability).reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal count = BigDecimal.valueOf(videoList.size());
+            onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+        }
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", CollectionUtils.EMPTY_COLLECTION);
+        map.put("count", Arrays.asList(this.remove0(onlineRate)));
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -1098,14 +1578,27 @@
     @Override
     public Result vehicleBigImgAccuracy(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, VehicleDeviceSamplingResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
         List<VehicleDeviceSamplingResult> resultList = mongoTemplate.find(query, VehicleDeviceSamplingResult.class);
+
         // 缁熻鏁�
+        Date now = new Date();
+        List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
+                .select(CheckIndexCar::getVehiclePictureAvailability)
+                .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
+                .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+                .list();
+        BigDecimal onlineRate = BigDecimal.ZERO;
+        if (CollectionUtils.isNotEmpty(videoList)) {
+            BigDecimal sum = videoList.stream().map(CheckIndexCar::getVehiclePictureAvailability).reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal count = BigDecimal.valueOf(videoList.size());
+            onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+        }
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", CollectionUtils.EMPTY_COLLECTION);
+        map.put("count", Arrays.asList(this.remove0(onlineRate)));
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -1119,7 +1612,7 @@
     @Override
     public Result faceViewDockStable(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -1129,12 +1622,24 @@
         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> dList1 = new ArrayList<>(2);
+        dList1.add(new Document("resultType", new Document("$eq", 1)));
+        setTag(params, dList1);
+        List<Document> dList2 = new ArrayList<>(2);
+        dList2.add(new Document("resultType", new Document("$eq", 2)));
+        setTag(params, dList2);
+        List<Document> dList3 = new ArrayList<>(2);
+        dList3.add(new Document("resultType", new Document("$eq", 3)));
+        setTag(params, dList3);
+        List<Document> dList4 = new ArrayList<>(2);
+        dList4.add(new Document("resultType", new Document("$eq", 4)));
+        setTag(params, dList4);
+        Document normalFilter = new Document("$and", dList1);
+        Document noDataFilter = new Document("$and", dList2);
+        Document trFilter = new Document("$and", dList3);
+        Document littleFilter = new Document("$and", dList4);
         List<Document> lists = Arrays.asList(normalFilter, noDataFilter, trFilter, littleFilter);
-        List<Integer> rList = lists.stream().map(filter -> {
+        List<String> rList = lists.stream().map(filter -> {
             // 鏋勫缓鑱氬悎绠￠亾
             List<Document> pipeline = Arrays.asList(
                     new Document("$match", filter),
@@ -1149,9 +1654,22 @@
                 uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
                 break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
             }
-            return uniqueDeviceIdCount;
+            return uniqueDeviceIdCount + "";
         }).collect(Collectors.toList());
 
+        Date now = new Date();
+        List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
+                .select(CheckIndexFace::getViewConnectStability)
+                .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
+                .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+                .list();
+        BigDecimal onlineRate = BigDecimal.ZERO;
+        if (CollectionUtils.isNotEmpty(videoList)) {
+            BigDecimal sum = videoList.stream().map(CheckIndexFace::getViewConnectStability).reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal count = BigDecimal.valueOf(videoList.size());
+            onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+        }
+        rList.add(this.remove0(onlineRate));
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", rList);
         map.put("list", resultList);
@@ -1166,42 +1684,88 @@
      */
     @Override
     public Result facePointOnlineRate(DataCenterQuery params) {
-        List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
-
-        long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
+        List<String> likeFileds = Arrays.asList("name", "no", "ip");
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+        //鏌ヤ汉鑴歌澶�
+        query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Face + ".*"));
+        //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
+        if(params.getOption()!=null) {
+            query.addCriteria(Criteria.where("online").is(params.getOption()));
+        }
+        // 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈�
+        query.with(Sort.by(Sort.Order.asc("pingOnline")));
+        //鍒嗛〉鏁伴噺
+        long total = mongoTemplate.count(query, TMonitorResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
-        List<SnapshotDataMonitorResult> resultList = mongoTemplate.find(query, 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 鍙細浜х敓涓�涓粨鏋�
+        List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
+        resultList.forEach(item -> {
+            if(item.getPingOnline() ==null){
+                item.setPingOnlineStr("鏈煡");
+            } else if (item.getPingOnline()) {
+                item.setPingOnlineStr("鍦ㄧ嚎");
+            } else if(!item.getPingOnline()){
+                item.setPingOnlineStr("绂荤嚎");
             }
-            return uniqueDeviceIdCount;
-        }).collect(Collectors.toList());
+            if (1 == item.getOnline()) {
+                item.setOnlineStr("鍦ㄧ嚎");
+            } else if (-1 == item.getOnline()) {
+                item.setOnlineStr("绂荤嚎");
+            } else {
+                item.setOnlineStr("鏈煡");
+            }
+        });
+        params.setDeptTag(-1);
+        params.setDeviceType(3);
+
+// 缁熻璁惧鏁伴噺
+        //鍗＄墖缁熻
+        int totalCount =0;
+        int onlineCount =0;
+        int offlineCount =0;
+        int unknownCount =0;
+        //鏋勫缓鏉′欢
+        List<Criteria> criteriaList = new ArrayList<>();
+        // 娣诲姞鍥哄畾鏉′欢
+        criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Face + ".*"));
+        criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
+        // 鏍规嵁dataType鍔ㄦ�佹坊鍔犳潯浠�
+        if (params.getDataType() == 1) {
+            criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE));
+        } else if (params.getDataType() == 2) {
+            criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
+        }
+        // 鏋勫缓match鎿嶄綔
+        MatchOperation match = Aggregation.match(
+                new Criteria().andOperator(criteriaList.toArray(new Criteria[0]))
+        );
+        GroupOperation group = Aggregation.group()
+                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Online)).then(1).otherwise(0)).as("onlineCount")
+                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Offline)).then(1).otherwise(0)).as("offlineCount")
+                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Unknown)).then(1).otherwise(0)).as("unknownCount");
+        // 灏嗗尮閰嶉樁娈靛拰鍒嗙粍闃舵缁勫悎璧锋潵
+        Aggregation aggregation = Aggregation.newAggregation(match, group);
+        // 鎵ц鑱氬悎鏌ヨ
+        AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class); // 鏇挎崲涓轰綘鐨勯泦鍚堝悕绉�
+        for (Map<String, Object> result : results.getMappedResults()) {
+            offlineCount =(Integer) result.getOrDefault("offlineCount",0L);
+            unknownCount =(Integer) result.getOrDefault("unknownCount",0L);
+            onlineCount = (Integer) result.getOrDefault("onlineCount",0L);
+            totalCount = offlineCount + unknownCount + onlineCount;
+        }
+        List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
+                .select(CheckIndexFace::getSiteOnline)
+                .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
+                .between(CheckIndexFace::getCreateTime, params.getStartTime(),  params.getEndTime())
+                .list();
+        BigDecimal onlineRate = BigDecimal.ZERO;
+        if (CollectionUtils.isNotEmpty(videoList)) {
+            BigDecimal sum = videoList.stream().map(CheckIndexFace::getSiteOnline).reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal count = BigDecimal.valueOf(videoList.size());
+            onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+        }
 
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", rList);
+        map.put("count", Arrays.asList(totalCount + "",onlineCount +"",offlineCount+"" ,unknownCount+"", this.remove0(onlineRate)));
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -1215,7 +1779,7 @@
     @Override
     public Result faceDirectoryConsistency(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("serialNumber.showValue", "ip.showValue", "name.showValue");
-        Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, MonitorQualifyResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -1225,13 +1789,24 @@
         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> dList1 = new ArrayList<>(2);
+        dList1.add(new Document("ip.error", new Document("$eq", Boolean.TRUE)));
+        setTag(params, dList1);
+        List<Document> dList2 = new ArrayList<>(2);
+        dList2.add(new Document("macdz.error", new Document("$eq", Boolean.TRUE)));
+        setTag(params, dList2);
+        List<Document> dList3 = new ArrayList<>(2);
+        dList3.add(new Document("latitude.error", new Document("$eq", Boolean.TRUE)));
+        setTag(params, dList3);
+        List<Document> dList4 = new ArrayList<>(2);
+        dList4.add(new Document("longitude.error", new Document("$eq", Boolean.TRUE)));
+        setTag(params, dList4);
+        Document ipErrFilter = new Document("$and", dList1);
+        Document macdzErrFilter = new Document("$and", dList2);
+        Document latitudeErrFilter = new Document("$and", dList3);
+        Document longitudeErrFilter = new Document("$and", dList4);
         List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter);
-        List<Integer> rList = lists.stream().map(filter -> {
+        List<String> rList = lists.stream().map(filter -> {
             // 鏋勫缓鑱氬悎绠￠亾
             List<Document> pipeline = Arrays.asList(
                     new Document("$match", filter),
@@ -1246,9 +1821,22 @@
                 uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
                 break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
             }
-            return uniqueDeviceIdCount;
+            return uniqueDeviceIdCount + "";
         }).collect(Collectors.toList());
 
+        Date now = new Date();
+        List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
+                .select(CheckIndexFace::getDeviceDirectoryConsistent)
+                .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
+                .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+                .list();
+        BigDecimal onlineRate = BigDecimal.ZERO;
+        if (CollectionUtils.isNotEmpty(videoList)) {
+            BigDecimal sum = videoList.stream().map(CheckIndexFace::getDeviceDirectoryConsistent).reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal count = BigDecimal.valueOf(videoList.size());
+            onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+        }
+        rList.add(this.remove0(onlineRate));
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", rList);
         map.put("list", resultList);
@@ -1264,7 +1852,7 @@
     @Override
     public Result faceCollectionConsistency(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "crossName");
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, CrossDetailResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -1274,13 +1862,24 @@
         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> dList1 = new ArrayList<>(2);
+        dList1.add(new Document("lalType", new Document("$eq", 1)));
+        setTag(params, dList1);
+        List<Document> dList2 = new ArrayList<>(2);
+        dList2.add(new Document("lalType", new Document("$eq", 2)));
+        setTag(params, dList2);
+        List<Document> dList3 = new ArrayList<>(2);
+        dList3.add(new Document("lalType", new Document("$eq", 3)));
+        setTag(params, dList3);
+        List<Document> dList4 = new ArrayList<>(2);
+        dList4.add(new Document("lalType", new Document("$eq", 4)));
+        setTag(params, dList4);
+        Document ipErrFilter = new Document("$and", dList1);
+        Document macdzErrFilter = new Document("$and", dList2);
+        Document latitudeErrFilter = new Document("$and", dList3);
+        Document longitudeErrFilter = new Document("$and", dList4);
         List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter);
-        List<Integer> rList = lists.stream().map(filter -> {
+        List<String> rList = lists.stream().map(filter -> {
             // 鏋勫缓鑱氬悎绠￠亾
             List<Document> pipeline = Arrays.asList(
                     new Document("$match", filter),
@@ -1295,9 +1894,22 @@
                 uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
                 break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
             }
-            return uniqueDeviceIdCount;
+            return uniqueDeviceIdCount + "";
         }).collect(Collectors.toList());
 
+        Date now = new Date();
+        List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
+                .select(CheckIndexFace::getFaceInformationCollectionAccuracy)
+                .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
+                .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+                .list();
+        BigDecimal onlineRate = BigDecimal.ZERO;
+        if (CollectionUtils.isNotEmpty(videoList)) {
+            BigDecimal sum = videoList.stream().map(CheckIndexFace::getFaceInformationCollectionAccuracy).reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal count = BigDecimal.valueOf(videoList.size());
+            onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+        }
+        rList.add(this.remove0(onlineRate));
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", rList);
         map.put("list", resultList);
@@ -1313,7 +1925,7 @@
     @Override
     public Result faceImgQualification(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "cameraName");
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, MonitoringDetailResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -1323,13 +1935,25 @@
         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> dList1 = new ArrayList<>(2);
+        dList1.add(new Document("lalType", new Document("$eq", 1)));
+        setTag(params, dList1);
+        List<Document> dList2 = new ArrayList<>(2);
+        dList2.add(new Document("lalType", new Document("$eq", 2)));
+        setTag(params, dList2);
+        List<Document> dList3 = new ArrayList<>(2);
+        dList3.add(new Document("lalType", new Document("$eq", 3)));
+        setTag(params, dList3);
+        List<Document> dList4 = new ArrayList<>(2);
+        dList4.add(new Document("lalType", new Document("$eq", 4)));
+        setTag(params, dList4);
+        Document ipErrFilter = new Document("$and", dList1);
+        Document macdzErrFilter = new Document("$and", dList2);
+        Document latitudeErrFilter = new Document("$and", dList3);
+        Document longitudeErrFilter = new Document("$and", dList4);
 
         List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter);
-        List<Integer> rList = lists.stream().map(filter -> {
+        List<String> rList = lists.stream().map(filter -> {
             // 鏋勫缓鑱氬悎绠￠亾
             List<Document> pipeline = Arrays.asList(
                     new Document("$match", filter),
@@ -1344,9 +1968,22 @@
                 uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
                 break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
             }
-            return uniqueDeviceIdCount;
+            return uniqueDeviceIdCount + "";
         }).collect(Collectors.toList());
 
+        Date now = new Date();
+        List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
+                .select(CheckIndexFace::getFacePictureQualification)
+                .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
+                .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+                .list();
+        BigDecimal onlineRate = BigDecimal.ZERO;
+        if (CollectionUtils.isNotEmpty(videoList)) {
+            BigDecimal sum = videoList.stream().map(CheckIndexFace::getFacePictureQualification).reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal count = BigDecimal.valueOf(videoList.size());
+            onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+        }
+        rList.add(this.remove0(onlineRate));
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", rList);
         map.put("list", resultList);
@@ -1362,7 +1999,7 @@
     @Override
     public Result faceCapturesImagesAccuracy(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, FaceDeviceInspectionResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -1372,12 +2009,21 @@
         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> dList1 = new ArrayList<>(2);
+        dList1.add(new Document("snapResult", new Document("$eq", 1)));
+        setTag(params, dList1);
+        List<Document> dList2 = new ArrayList<>(2);
+        dList2.add(new Document("snapResult", new Document("$eq", 2)));
+        setTag(params, dList2);
+        List<Document> dList3 = new ArrayList<>(2);
+        dList3.add(new Document("snapResult", new Document("$eq", 4)));
+        setTag(params, dList3);
+        Document ipErrFilter = new Document("$and", dList1);
+        Document macdzErrFilter = new Document("$and", dList2);
+        Document longitudeErrFilter = new Document("$and", dList3);
 
         List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, longitudeErrFilter);
-        List<Integer> rList = lists.stream().map(filter -> {
+        List<String> rList = lists.stream().map(filter -> {
             // 鏋勫缓鑱氬悎绠￠亾
             List<Document> pipeline = Arrays.asList(
                     new Document("$match", filter),
@@ -1392,9 +2038,22 @@
                 uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
                 break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
             }
-            return uniqueDeviceIdCount;
+            return uniqueDeviceIdCount + "";
         }).collect(Collectors.toList());
 
+        Date now = new Date();
+        List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
+                .select(CheckIndexFace::getFaceTimingAccuracy)
+                .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
+                .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+                .list();
+        BigDecimal onlineRate = BigDecimal.ZERO;
+        if (CollectionUtils.isNotEmpty(videoList)) {
+            BigDecimal sum = videoList.stream().map(CheckIndexFace::getFaceTimingAccuracy).reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal count = BigDecimal.valueOf(videoList.size());
+            onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+        }
+        rList.add(this.remove0(onlineRate));
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", rList);
         map.put("list", resultList);
@@ -1410,7 +2069,7 @@
     @Override
     public Result faceTimelyUpload(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, FaceDeviceInspectionResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -1420,12 +2079,21 @@
         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> dList1 = new ArrayList<>(2);
+        dList1.add(new Document("snapResult", new Document("$eq", 1)));
+        setTag(params, dList1);
+        List<Document> dList2 = new ArrayList<>(2);
+        dList2.add(new Document("snapResult", new Document("$eq", 2)));
+        setTag(params, dList2);
+        List<Document> dList3 = new ArrayList<>(2);
+        dList3.add(new Document("snapResult", new Document("$eq", 4)));
+        setTag(params, dList3);
+        Document ipErrFilter = new Document("$and", dList1);
+        Document macdzErrFilter = new Document("$and", dList2);
+        Document longitudeErrFilter = new Document("$and", dList3);
 
         List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, longitudeErrFilter);
-        List<Integer> rList = lists.stream().map(filter -> {
+        List<String> rList = lists.stream().map(filter -> {
             // 鏋勫缓鑱氬悎绠￠亾
             List<Document> pipeline = Arrays.asList(
                     new Document("$match", filter),
@@ -1440,9 +2108,22 @@
                 uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
                 break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
             }
-            return uniqueDeviceIdCount;
+            return uniqueDeviceIdCount + "";
         }).collect(Collectors.toList());
 
+        Date now = new Date();
+        List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
+                .select(CheckIndexFace::getFaceUploadTimeliness)
+                .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
+                .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+                .list();
+        BigDecimal onlineRate = BigDecimal.ZERO;
+        if (CollectionUtils.isNotEmpty(videoList)) {
+            BigDecimal sum = videoList.stream().map(CheckIndexFace::getFaceUploadTimeliness).reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal count = BigDecimal.valueOf(videoList.size());
+            onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+        }
+        rList.add(this.remove0(onlineRate));
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", rList);
         map.put("list", resultList);
@@ -1458,17 +2139,32 @@
     @Override
     public Result faceAvailabilityOfLargeImg(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, FaceDeviceSamplingResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
         List<FaceDeviceSamplingResult> resultList = mongoTemplate.find(query, FaceDeviceSamplingResult.class);
+
         // 缁熻鏁�
+        Date now = new Date();
+        List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
+                .select(CheckIndexFace::getFacePictureAvailability)
+                .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
+                .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+                .list();
+        BigDecimal onlineRate = BigDecimal.ZERO;
+        if (CollectionUtils.isNotEmpty(videoList)) {
+            BigDecimal sum = videoList.stream().map(CheckIndexFace::getFacePictureAvailability).reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal count = BigDecimal.valueOf(videoList.size());
+            onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+        }
+
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", CollectionUtils.EMPTY_COLLECTION);
+        map.put("count", Arrays.asList(this.remove0(onlineRate)));
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
+
     /**
      * 瑙嗛锛氳棰戝浘鍍忚祫婧愬畨鍏ㄧ鐞�
      *
@@ -1487,4 +2183,29 @@
         return Result.ok().data(map).total(page.getTotal());
 
     }
+
+    /**
+     * 鍒犻櫎灏鹃儴鐨�0
+     *
+     * @param rate
+     * @return
+     */
+    private String remove0(BigDecimal rate) {
+        DF.setDecimalSeparatorAlwaysShown(false);
+        return DF.format(rate) + "%";
+    }
+
+    /**
+     * 璁剧疆鏍囩鎼滅储鏉′欢
+     *
+     * @param params
+     * @param dList
+     */
+    private void setTag(DataCenterQuery params, List<Document> dList) {
+        if (params.getDataType().equals(1)) {
+            dList.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        } else if (params.getDataType().equals(2)) {
+            dList.add(new Document("deptTag", new Document("$eq", Boolean.TRUE)));
+        }
+    }
 }

--
Gitblit v1.8.0