From eb844dbc762cfbd65f027229a9fc43469aaf65d0 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 06 九月 2024 14:57:24 +0800
Subject: [PATCH] 考核模板定时任务getList分离

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 1131 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 914 insertions(+), 217 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 0f70896..f7b2e36 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,23 +1,24 @@
 package com.ycl.platform.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.mongodb.client.AggregateIterable;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
-import com.ycl.platform.domain.entity.ImageResourceSecurityDetail;
-import com.ycl.platform.domain.entity.YwPoint;
+import com.ycl.platform.domain.entity.*;
 import com.ycl.platform.domain.query.DataCenterQuery;
 import com.ycl.platform.domain.result.HK.*;
 import com.ycl.platform.domain.result.UY.*;
 import com.ycl.platform.mapper.ImageResourceSecurityDetailMapper;
 import com.ycl.platform.mapper.YwPointMapper;
-import com.ycl.platform.service.DataCenterService;
-import com.ycl.platform.service.YwPointService;
+import com.ycl.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.CheckConstants;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.collections.CollectionUtils;
 import org.bson.Document;
@@ -28,6 +29,9 @@
 import org.springframework.data.mongodb.core.query.TextCriteria;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.DecimalFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -44,9 +48,14 @@
     private final MongoTemplate mongoTemplate;
     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("#.####");
 
     /**
      * 瑙嗛锛氱偣浣嶅湪绾跨巼
@@ -57,7 +66,8 @@
     @Override
     public Result videoPointOnlineRate(DataCenterQuery params) {
         // 鐢熸垚鏌ヨ
-        Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, null);
+        List<String> likeFileds = Arrays.asList("arealayerName", "ipAddr", "deviceName", "deviceId");
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         // 鍏堟煡鎬绘暟鍐嶅垎椤�
         long total = mongoTemplate.count(query, VideoOnlineResult.class);
@@ -68,9 +78,19 @@
         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();
+        BigDecimal onlineRate = BigDecimal.ZERO;
+        if (CollectionUtils.isNotEmpty(videoList)) {
+            BigDecimal sum = videoList.stream().map(CheckIndexVideo::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(distinctCount + "",this.remove0(onlineRate)));
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -83,11 +103,10 @@
      */
     @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, deptGBList);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, 1);
 
         // 鍏堟煡鎬绘暟鍐嶅垎椤�
         long total = mongoTemplate.count(query, VideoOnlineResult.class);
@@ -97,7 +116,12 @@
         // 缁熻鏁伴噺
         MongoDatabase database = mongoTemplate.getDb();
         MongoCollection<Document> collection = database.getCollection("uy_online");
-        Document filter = new Document("deviceId", new Document("$in", deptGBList));
+        List<Document> dList = new ArrayList<>(2);
+        dList.add(new Document("deptTag", new Document("$eq", Boolean.TRUE)));
+        if (params.getDataType().equals(1)) {
+            dList.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        Document filter = new Document("$and", dList);
         // 鏋勫缓鑱氬悎绠￠亾
         List<Document> pipeline = Arrays.asList(
                 // 鍙閮ㄧ骇鐨�
@@ -113,9 +137,20 @@
             uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
             break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
         }
-
+        Date now = new Date();
+        List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
+                .select(CheckIndexVideo::getMinistrySiteOnline)
+                .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;
+        if (CollectionUtils.isNotEmpty(videoList)) {
+            BigDecimal sum = videoList.stream().map(CheckIndexVideo::getMinistrySiteOnline).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(uniqueDeviceIdCount));
+        map.put("count", Arrays.asList(uniqueDeviceIdCount + "", this.remove0(onlineRate)));
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -128,10 +163,8 @@
      */
     @Override
     public Result videoImportantPointOnlineRate(DataCenterQuery params) {
-        // 鍏堟煡鍑洪噸鐐圭偣浣嶇殑鍥芥爣
-        List<String> deptGBList = pointMapper.getDeptPointGB(1);
-
-        Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, deptGBList);
+        List<String> likeFileds = Arrays.asList("arealayerName", "ipAddr", "deviceName", "deviceId");
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, 3);
 
         long total = mongoTemplate.count(query, VideoOnlineResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -140,7 +173,13 @@
         // 缁熻鏁伴噺
         MongoDatabase database = mongoTemplate.getDb();
         MongoCollection<Document> collection = database.getCollection("uy_online");
-        Document filter = new Document("deviceId", new Document("$in", deptGBList));
+
+        List<Document> dList = new ArrayList<>(2);
+        dList.add(new Document("importantTag", new Document("$eq", Boolean.TRUE)));
+        if (params.getDataType().equals(1)) {
+            dList.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        Document filter = new Document("$and", dList);
         // 鏋勫缓鑱氬悎绠￠亾
         List<Document> pipeline = Arrays.asList(
                 new Document("$match", filter),
@@ -156,13 +195,20 @@
             break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
         }
 
-//        long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), VideoOnlineResult.class);
-//        long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), VideoOnlineResult.class);
-//        long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*1.*")), VideoOnlineResult.class);
-//        long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*2.*")), VideoOnlineResult.class);
-//        long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*3.*")), VideoOnlineResult.class);
+        Date now = new Date();
+        List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
+                .select(CheckIndexVideo::getKeySiteOnline)
+                .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;
+        if (CollectionUtils.isNotEmpty(videoList)) {
+            BigDecimal sum = videoList.stream().map(CheckIndexVideo::getKeySiteOnline).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(uniqueDeviceIdCount));
+        map.put("count", Arrays.asList(uniqueDeviceIdCount + "", this.remove0(onlineRate)));
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -175,10 +221,8 @@
      */
     @Override
     public Result videoImportantPointImageOnlineRate(DataCenterQuery params) {
-        // 鍏堟煡鍑洪噸鐐规寚鎸ュ浘鍍忕偣浣嶇殑鍥芥爣
-        List<String> deptGBList = pointMapper.getDeptPointGB(2);
-
-        Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, deptGBList);
+        List<String> likeFileds = Arrays.asList("arealayerName", "ipAddr", "deviceName", "deviceId");
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, 4);
 
         long total = mongoTemplate.count(query, VideoOnlineResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -187,7 +231,13 @@
         // 缁熻鏁伴噺
         MongoDatabase database = mongoTemplate.getDb();
         MongoCollection<Document> collection = database.getCollection("uy_online");
-        Document filter = new Document("deviceId", new Document("$in", deptGBList));
+
+        List<Document> dList = new ArrayList<>(2);
+        dList.add(new Document("importantCommandImageTag", new Document("$eq", Boolean.TRUE)));
+        if (params.getDataType().equals(1)) {
+            dList.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        Document filter = new Document("$and", dList);
         // 鏋勫缓鑱氬悎绠￠亾
         List<Document> pipeline = Arrays.asList(
                 new Document("$match", filter),
@@ -203,14 +253,20 @@
             break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
         }
 
-//        // 缁熻鏁�
-//        long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), VideoOnlineResult.class);
-//        long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), VideoOnlineResult.class);
-//        long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*1.*")), VideoOnlineResult.class);
-//        long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*2.*")), VideoOnlineResult.class);
-//        long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*3.*")), VideoOnlineResult.class);
+        Date now = new Date();
+        List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
+                .select(CheckIndexVideo::getKeyCommandImageOnline)
+                .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;
+        if (CollectionUtils.isNotEmpty(videoList)) {
+            BigDecimal sum = videoList.stream().map(CheckIndexVideo::getKeyCommandImageOnline).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(uniqueDeviceIdCount));
+        map.put("count", Arrays.asList(uniqueDeviceIdCount + "", this.remove0(onlineRate)));
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -223,8 +279,8 @@
      */
     @Override
     public Result videoOneMachineDocumentRegister(DataCenterQuery params) {
-
-        Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, null);
+        List<String> likeFileds = Arrays.asList("ip.showValue", "name.showValue", "serialNumber.showValue");
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, MonitorQualifyResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -234,13 +290,33 @@
         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)));
+        if (params.getDataType().equals(1)) {
+            dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList2 = new ArrayList<>(2);
+        dList2.add(new Document("macdz.error", new Document("$eq", Boolean.TRUE)));
+        if (params.getDataType().equals(1)) {
+            dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList3 = new ArrayList<>(2);
+        dList3.add(new Document("latitude.error", new Document("$eq", Boolean.TRUE)));
+        if (params.getDataType().equals(1)) {
+            dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList4 = new ArrayList<>(2);
+        dList4.add(new Document("longitude.error", new Document("$eq", Boolean.TRUE)));
+        if (params.getDataType().equals(1)) {
+            dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        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),
@@ -255,9 +331,22 @@
                 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::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;
+        if (CollectionUtils.isNotEmpty(videoList)) {
+            BigDecimal sum = videoList.stream().map(CheckIndexVideo::getMonitorRegistration).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);
@@ -272,8 +361,8 @@
      */
     @Override
     public Result videoOneMachineDocumentQualified(DataCenterQuery params) {
-
-        Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, null);
+        List<String> likeFileds = Arrays.asList("ip.showValue", "name.showValue", "serialNumber.showValue");
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, MonitorQualifyResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -283,13 +372,33 @@
         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)));
+        if (params.getDataType().equals(1)) {
+            dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList2 = new ArrayList<>(2);
+        dList2.add(new Document("macdz.error", new Document("$eq", Boolean.TRUE)));
+        if (params.getDataType().equals(1)) {
+            dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList3 = new ArrayList<>(2);
+        dList3.add(new Document("latitude.error", new Document("$eq", Boolean.TRUE)));
+        if (params.getDataType().equals(1)) {
+            dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList4 = new ArrayList<>(2);
+        dList4.add(new Document("longitude.error", new Document("$eq", Boolean.TRUE)));
+        if (params.getDataType().equals(1)) {
+            dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        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),
@@ -304,9 +413,22 @@
                 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::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;
+        if (CollectionUtils.isNotEmpty(videoList)) {
+            BigDecimal sum = videoList.stream().map(CheckIndexVideo::getMonitorQualification).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);
@@ -322,7 +444,8 @@
     @Override
     public Result videoAssessmentFileRatio(DataCenterQuery params) {
         // TODO 鏂板涓�寮犺〃璁板綍姣忔鐨勬。妗堣�冩牳
-        Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, null);
+        List<String> likeFileds = Arrays.asList("ip.showValue", "name.showValue", "serialNumber.showValue");
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, MonitorQualifyResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -332,13 +455,33 @@
         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)));
+        if (params.getDataType().equals(1)) {
+            dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList2 = new ArrayList<>(2);
+        dList2.add(new Document("macdz.error", new Document("$eq", Boolean.TRUE)));
+        if (params.getDataType().equals(1)) {
+            dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList3 = new ArrayList<>(2);
+        dList3.add(new Document("latitude.error", new Document("$eq", Boolean.TRUE)));
+        if (params.getDataType().equals(1)) {
+            dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList4 = new ArrayList<>(2);
+        dList4.add(new Document("longitude.error", new Document("$eq", Boolean.TRUE)));
+        if (params.getDataType().equals(1)) {
+            dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        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),
@@ -353,9 +496,10 @@
                 uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
                 break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
             }
-            return uniqueDeviceIdCount;
+            return uniqueDeviceIdCount + "";
         }).collect(Collectors.toList());
 
+        rList.add("0%");
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", rList);
         map.put("list", resultList);
@@ -370,8 +514,8 @@
      */
     @Override
     public Result videoAvailabilityRate(DataCenterQuery params) {
-
-        Query query = MongoUtil.getQuery(params, "deviceId", "createTime", null);
+        List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
+        Query query = MongoUtil.getQuery(params,"createTime", likeFileds, null);
 
         long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
         MongoUtil.setPage(query, params, "createTime");
@@ -381,8 +525,13 @@
         MongoDatabase database = mongoTemplate.getDb();
         MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum");
         List<Integer> status = Arrays.asList(1, 0, -1);
-        List<Integer> resultCount = status.stream().map(item -> {
-            Document filter = new Document("recordStatus", item);
+        List<String> resultCount = status.stream().map(item -> {
+            List<Document> dList = new ArrayList<>(2);
+            dList.add(new Document("recordStatus", new Document("$eq", item)));
+            if (params.getDataType().equals(1)) {
+                dList.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+            }
+            Document filter = new Document("$and", dList);
             // 鏋勫缓鑱氬悎绠￠亾
             List<Document> pipeline = Arrays.asList(
                     new Document("$match", filter),
@@ -397,10 +546,22 @@
                 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::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;
+        if (CollectionUtils.isNotEmpty(videoList)) {
+            BigDecimal sum = videoList.stream().map(CheckIndexVideo::getVideoAvailable).reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal count = BigDecimal.valueOf(videoList.size());
+            onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+        }
+        resultCount.add(this.remove0(onlineRate));
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", resultCount);
         map.put("list", resultList);
@@ -415,10 +576,8 @@
      */
     @Override
     public Result deptVideoAvailabilityRate(DataCenterQuery params) {
-
-        List<String> deptGBList = pointMapper.getDeptPointGB(0);
-
-        Query query = MongoUtil.getQuery(params, "deviceId", "createTime", deptGBList);
+        List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
+        Query query = MongoUtil.getQuery(params,"createTime", likeFileds, 1);
 
         long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
         MongoUtil.setPage(query, params, "createTime");
@@ -428,11 +587,14 @@
         MongoDatabase database = mongoTemplate.getDb();
         MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum");
         List<Integer> status = Arrays.asList(1, 0, -1);
-        List<Integer> resultCount = status.stream().map(item -> {
-            Document filter = new Document("$and", Arrays.asList(
-                    new Document("deviceId", new Document("$in", deptGBList)), // $in 鏉′欢
-                    new Document("recordStatus", item)
-            ));
+        List<String> resultCount = status.stream().map(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)));
+            if (params.getDataType().equals(1)) {
+                dList.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+            }
+            Document filter = new Document("$and", dList);
             // 鏋勫缓鑱氬悎绠￠亾
             List<Document> pipeline = Arrays.asList(
                     new Document("$match", filter),
@@ -447,10 +609,22 @@
                 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::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;
+        if (CollectionUtils.isNotEmpty(videoList)) {
+            BigDecimal sum = videoList.stream().map(CheckIndexVideo::getMinistryVideoAvailable).reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal count = BigDecimal.valueOf(videoList.size());
+            onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+        }
+        resultCount.add(this.remove0(onlineRate));
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", resultCount);
         map.put("list", resultList);
@@ -465,10 +639,8 @@
      */
     @Override
     public Result videoImportantPointAvailabilityRate(DataCenterQuery params) {
-
-        List<String> deptGBList = pointMapper.getDeptPointGB(1);
-
-        Query query = MongoUtil.getQuery(params, "deviceId", "createTime", deptGBList);
+        List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
+        Query query = MongoUtil.getQuery(params,"createTime", likeFileds, 3);
 
         long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
         MongoUtil.setPage(query, params, "createTime");
@@ -478,11 +650,14 @@
         MongoDatabase database = mongoTemplate.getDb();
         MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum");
         List<Integer> status = Arrays.asList(1, 0, -1);
-        List<Integer> resultCount = status.stream().map(item -> {
-            Document filter = new Document("$and", Arrays.asList(
-                    new Document("deviceId", new Document("$in", deptGBList)), // $in 鏉′欢
-                    new Document("recordStatus", item)
-            ));
+        List<String> resultCount = status.stream().map(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)));
+            if (params.getDataType().equals(1)) {
+                dList.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+            }
+            Document filter = new Document("$and", dList);
             // 鏋勫缓鑱氬悎绠￠亾
             List<Document> pipeline = Arrays.asList(
                     new Document("$match", filter),
@@ -497,9 +672,22 @@
                 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;
+        if (CollectionUtils.isNotEmpty(videoList)) {
+            BigDecimal sum = videoList.stream().map(CheckIndexVideo::getKeyVideoAvailable).reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal count = BigDecimal.valueOf(videoList.size());
+            onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+        }
+        resultCount.add(this.remove0(onlineRate));
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", resultCount);
         map.put("list", resultList);
@@ -514,8 +702,8 @@
      */
     @Override
     public Result videoLabelingAccuracy(DataCenterQuery params) {
-
-        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+        List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
         List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
@@ -539,9 +727,8 @@
      */
     @Override
     public Result videoImportantPointLabelingAccuracy(DataCenterQuery params) {
-
-        List<String> deptGBList = pointMapper.getDeptPointGB(1);
-        Query query = MongoUtil.getQuery(params, "deviceNo", "checkTime", deptGBList);
+        List<String> likeFileds = Arrays.asList("deviceNo", "osdName");
+        Query query = MongoUtil.getQuery(params,"checkTime", likeFileds, 3);
 
         long total = mongoTemplate.count(query, OsdCheckResult.class);
         MongoUtil.setPage(query, params, "checkTime");
@@ -551,12 +738,36 @@
         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)));
+        if (params.getDataType().equals(1)) {
+            dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList2 = new ArrayList<>(2);
+        dList2.add(new Document("importantTag", Boolean.TRUE));
+        dList2.add(new Document("osdNameCorrect", new Document("$eq", -1)));
+        if (params.getDataType().equals(1)) {
+            dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList3 = new ArrayList<>(2);
+        dList3.add(new Document("importantTag", Boolean.TRUE));
+        dList3.add(new Document("osdTimeCorrect", new Document("$eq", 1)));
+        if (params.getDataType().equals(1)) {
+            dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList4 = new ArrayList<>(2);
+        dList4.add(new Document("importantTag", Boolean.TRUE));
+        dList4.add(new Document("osdTimeCorrect", new Document("$eq", -1)));
+        if (params.getDataType().equals(1)) {
+            dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        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<Integer> rList = lists.stream().map(filter -> {
+        List<String> rList = lists.stream().map(filter -> {
             // 鏋勫缓鑱氬悎绠￠亾
             List<Document> pipeline = Arrays.asList(
                     new Document("$match", filter),
@@ -571,10 +782,22 @@
                 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::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;
+        if (CollectionUtils.isNotEmpty(videoList)) {
+            BigDecimal sum = videoList.stream().map(CheckIndexVideo::getKeyAnnotationAccuracy).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);
@@ -590,7 +813,8 @@
     @Override
     public Result videoCheckTimeAccuracy(DataCenterQuery params) {
 
-        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+        List<String> likeFileds = Arrays.asList("deviceId");
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, OneMachineFileResult.class);
         List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
@@ -615,9 +839,8 @@
     @Override
     public Result videoImportantPointCheckTimeAccuracy(DataCenterQuery params) {
 
-        List<String> deptGBList = pointMapper.getDeptPointGB(1);
-
-        Query query = MongoUtil.getQuery(params, "deviceNo", "checkTime", deptGBList);
+        List<String> likeFileds = Arrays.asList("deviceNo", "osdName");
+        Query query = MongoUtil.getQuery(params,"checkTime", likeFileds, 3);
 
         long total = mongoTemplate.count(query, OsdCheckResult.class);
         MongoUtil.setPage(query, params, "checkTime");
@@ -627,10 +850,22 @@
         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)));
+        if (params.getDataType().equals(1)) {
+            dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList2 = new ArrayList<>(2);
+        dList2.add(new Document("importantTag", Boolean.TRUE));
+        dList2.add(new Document("osdTimeCorrect", new Document("$eq", -1)));
+        if (params.getDataType().equals(1)) {
+            dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        Document osdTimeFilter = new Document("$and", dList1);
+        Document osdTimeErrFilter = new Document("$and", dList2);
         List<Document> lists = Arrays.asList(osdTimeFilter, osdTimeErrFilter);
-        List<Integer> rList = lists.stream().map(filter -> {
+        List<String> rList = lists.stream().map(filter -> {
             // 鏋勫缓鑱氬悎绠￠亾
             List<Document> pipeline = Arrays.asList(
                     new Document("$match", filter),
@@ -645,9 +880,22 @@
                 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::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;
+        if (CollectionUtils.isNotEmpty(videoList)) {
+            BigDecimal sum = videoList.stream().map(CheckIndexVideo::getKeyTimingAccuracy).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);
@@ -663,8 +911,8 @@
      */
     @Override
     public Result vehicleViewDockStable(DataCenterQuery params) {
-
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
+        List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -674,12 +922,36 @@
         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)));
+        if (params.getDataType().equals(1)) {
+            dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList2 = new ArrayList<>(2);
+        dList2.add(new Document("importantTag", Boolean.TRUE));
+        dList2.add(new Document("resultType", new Document("$eq", 2)));
+        if (params.getDataType().equals(1)) {
+            dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList3 = new ArrayList<>(2);
+        dList3.add(new Document("importantTag", Boolean.TRUE));
+        dList3.add(new Document("resultType", new Document("$eq", 3)));
+        if (params.getDataType().equals(1)) {
+            dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList4 = new ArrayList<>(2);
+        dList4.add(new Document("importantTag", Boolean.TRUE));
+        dList4.add(new Document("resultType", new Document("$eq", 4)));
+        if (params.getDataType().equals(1)) {
+            dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        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),
@@ -694,9 +966,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);
@@ -711,8 +996,8 @@
      */
     @Override
     public Result vehiclePointOnlineRate(DataCenterQuery params) {
-
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
+        List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -723,8 +1008,20 @@
         MongoCollection<Document> collection = database.getCollection("hk_snapshot_data_monitor");
         long distinctCount = collection.distinct("externalIndexCode", String.class).into(new ArrayList<>()).size();
 
+        Date now = new Date();
+        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(now), DateUtils.getDayEnd(now))
+                .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(distinctCount + "", this.remove0(onlineRate)));
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -737,8 +1034,8 @@
      */
     @Override
     public Result vehicleNetDeviceDirectoryConsistency(DataCenterQuery params) {
-
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
+        List<String> likeFileds = Arrays.asList("ip.showValue", "name.showValue", "serialNumber.showValue");
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, MonitorQualifyResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -748,13 +1045,32 @@
         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)));
+        if (params.getDataType().equals(1)) {
+            dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList2 = new ArrayList<>(2);
+        dList2.add(new Document("macdz.error", new Document("$eq", Boolean.TRUE)));
+        if (params.getDataType().equals(1)) {
+            dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList3 = new ArrayList<>(2);
+        dList3.add(new Document("latitude.error", new Document("$eq", Boolean.TRUE)));
+        if (params.getDataType().equals(1)) {
+            dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList4 = new ArrayList<>(2);
+        dList4.add(new Document("longitude.error", new Document("$eq", Boolean.TRUE)));
+        if (params.getDataType().equals(1)) {
+            dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        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),
@@ -769,9 +1085,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);
@@ -786,8 +1115,8 @@
      */
     @Override
     public Result vehicleCollectionConsistency(DataCenterQuery params) {
-
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
+        List<String> likeFileds = Arrays.asList("externalIndexCode", "crossName");
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, CrossDetailResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -797,13 +1126,33 @@
         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)));
+        if (params.getDataType().equals(1)) {
+            dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList2 = new ArrayList<>(2);
+        dList2.add(new Document("lalType", new Document("$eq", 2)));
+        if (params.getDataType().equals(1)) {
+            dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList3 = new ArrayList<>(2);
+        dList3.add(new Document("lalType", new Document("$eq", 3)));
+        if (params.getDataType().equals(1)) {
+            dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList4 = new ArrayList<>(2);
+        dList4.add(new Document("lalType", new Document("$eq", 4)));
+        if (params.getDataType().equals(1)) {
+            dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        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),
@@ -818,9 +1167,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);
@@ -835,8 +1197,8 @@
      */
     @Override
     public Result vehicleCollectionDataIntegrity(DataCenterQuery params) {
-
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
+        List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, DataIntegrityMonitoringResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -846,8 +1208,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);
     }
@@ -860,15 +1235,27 @@
      */
     @Override
     public Result vehicleCollectionDataCaptured(DataCenterQuery params) {
-
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
+        List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
+        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);
     }
@@ -881,8 +1268,8 @@
      */
     @Override
     public Result vehicleClockAccuracy(DataCenterQuery params) {
-
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
+        List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, VehicleDeviceInspectionResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -893,12 +1280,27 @@
         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)));
+        if (params.getDataType().equals(1)) {
+            dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList2 = new ArrayList<>(2);
+        dList2.add(new Document("snapResult", new Document("$eq", 2)));
+        if (params.getDataType().equals(1)) {
+            dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList3 = new ArrayList<>(2);
+        dList3.add(new Document("snapResult", new Document("$eq", 4)));
+        if (params.getDataType().equals(1)) {
+            dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        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),
@@ -913,9 +1315,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);
@@ -930,15 +1345,28 @@
      */
     @Override
     public Result vehicleTimelyUploadAccuracy(DataCenterQuery params) {
-
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
+        List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
+        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);
     }
@@ -951,15 +1379,28 @@
      */
     @Override
     public Result vehicleUrlAccuracy(DataCenterQuery params) {
-
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
+        List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
+        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);
     }
@@ -972,15 +1413,28 @@
      */
     @Override
     public Result vehicleBigImgAccuracy(DataCenterQuery params) {
-
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, new ArrayList<>());
+        List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
+        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);
     }
@@ -993,8 +1447,8 @@
      */
     @Override
     public Result faceViewDockStable(DataCenterQuery params) {
-
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
+        List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -1004,12 +1458,32 @@
         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)));
+        if (params.getDataType().equals(1)) {
+            dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList2 = new ArrayList<>(2);
+        dList2.add(new Document("resultType", new Document("$eq", 2)));
+        if (params.getDataType().equals(1)) {
+            dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList3 = new ArrayList<>(2);
+        dList3.add(new Document("resultType", new Document("$eq", 3)));
+        if (params.getDataType().equals(1)) {
+            dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList4 = new ArrayList<>(2);
+        dList4.add(new Document("resultType", new Document("$eq", 4)));
+        if (params.getDataType().equals(1)) {
+            dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        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),
@@ -1024,9 +1498,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);
@@ -1041,8 +1528,8 @@
      */
     @Override
     public Result facePointOnlineRate(DataCenterQuery params) {
-
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
+        List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -1052,12 +1539,32 @@
         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)));
+        if (params.getDataType().equals(1)) {
+            dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList2 = new ArrayList<>(2);
+        dList2.add(new Document("resultType", new Document("$eq", 2)));
+        if (params.getDataType().equals(1)) {
+            dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList3 = new ArrayList<>(2);
+        dList3.add(new Document("resultType", new Document("$eq", 3)));
+        if (params.getDataType().equals(1)) {
+            dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList4 = new ArrayList<>(2);
+        dList4.add(new Document("resultType", new Document("$eq", 4)));
+        if (params.getDataType().equals(1)) {
+            dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        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),
@@ -1072,9 +1579,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::getSiteOnline)
+                .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::getSiteOnline).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);
@@ -1089,24 +1609,43 @@
      */
     @Override
     public Result faceDirectoryConsistency(DataCenterQuery params) {
-
-        Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, null);
+        List<String> likeFileds = Arrays.asList("serialNumber.showValue", "ip.showValue", "name.showValue");
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, MonitorQualifyResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
         List<MonitorQualifyResult> resultList = mongoTemplate.find(query, MonitorQualifyResult.class);
 
-// 缁熻鏁伴噺
+        // 缁熻鏁伴噺
         MongoDatabase database = mongoTemplate.getDb();
         MongoCollection<Document> collection = database.getCollection("uy_monitor_qualify");
 
-        Document ipErrFilter = new Document("ip.error", true);
-        Document macdzErrFilter = new Document("macdz.error", true);
-        Document latitudeErrFilter = new Document("latitude.error", true);
-        Document longitudeErrFilter = new Document("longitude.error", true);
-
+        List<Document> dList1 = new ArrayList<>(2);
+        dList1.add(new Document("ip.error", new Document("$eq", Boolean.TRUE)));
+        if (params.getDataType().equals(1)) {
+            dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList2 = new ArrayList<>(2);
+        dList2.add(new Document("macdz.error", new Document("$eq", Boolean.TRUE)));
+        if (params.getDataType().equals(1)) {
+            dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList3 = new ArrayList<>(2);
+        dList3.add(new Document("latitude.error", new Document("$eq", Boolean.TRUE)));
+        if (params.getDataType().equals(1)) {
+            dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList4 = new ArrayList<>(2);
+        dList4.add(new Document("longitude.error", new Document("$eq", Boolean.TRUE)));
+        if (params.getDataType().equals(1)) {
+            dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        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),
@@ -1121,9 +1660,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);
@@ -1138,8 +1690,8 @@
      */
     @Override
     public Result faceCollectionConsistency(DataCenterQuery params) {
-
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
+        List<String> likeFileds = Arrays.asList("externalIndexCode", "crossName");
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, CrossDetailResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -1149,13 +1701,32 @@
         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)));
+        if (params.getDataType().equals(1)) {
+            dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList2 = new ArrayList<>(2);
+        dList2.add(new Document("lalType", new Document("$eq", 2)));
+        if (params.getDataType().equals(1)) {
+            dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList3 = new ArrayList<>(2);
+        dList3.add(new Document("lalType", new Document("$eq", 3)));
+        if (params.getDataType().equals(1)) {
+            dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList4 = new ArrayList<>(2);
+        dList4.add(new Document("lalType", new Document("$eq", 4)));
+        if (params.getDataType().equals(1)) {
+            dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        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),
@@ -1170,9 +1741,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);
@@ -1187,8 +1771,8 @@
      */
     @Override
     public Result faceImgQualification(DataCenterQuery params) {
-
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
+        List<String> likeFileds = Arrays.asList("externalIndexCode", "cameraName");
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, MonitoringDetailResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -1198,13 +1782,33 @@
         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)));
+        if (params.getDataType().equals(1)) {
+            dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList2 = new ArrayList<>(2);
+        dList2.add(new Document("lalType", new Document("$eq", 2)));
+        if (params.getDataType().equals(1)) {
+            dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList3 = new ArrayList<>(2);
+        dList3.add(new Document("lalType", new Document("$eq", 3)));
+        if (params.getDataType().equals(1)) {
+            dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList4 = new ArrayList<>(2);
+        dList4.add(new Document("lalType", new Document("$eq", 4)));
+        if (params.getDataType().equals(1)) {
+            dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        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),
@@ -1219,9 +1823,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);
@@ -1236,8 +1853,8 @@
      */
     @Override
     public Result faceCapturesImagesAccuracy(DataCenterQuery params) {
-
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
+        List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, FaceDeviceInspectionResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -1247,12 +1864,27 @@
         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)));
+        if (params.getDataType().equals(1)) {
+            dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList2 = new ArrayList<>(2);
+        dList2.add(new Document("snapResult", new Document("$eq", 2)));
+        if (params.getDataType().equals(1)) {
+            dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList3 = new ArrayList<>(2);
+        dList3.add(new Document("snapResult", new Document("$eq", 4)));
+        if (params.getDataType().equals(1)) {
+            dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        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),
@@ -1267,9 +1899,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);
@@ -1284,8 +1929,8 @@
      */
     @Override
     public Result faceTimelyUpload(DataCenterQuery params) {
-
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
+        List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, FaceDeviceInspectionResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -1295,12 +1940,27 @@
         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)));
+        if (params.getDataType().equals(1)) {
+            dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList2 = new ArrayList<>(2);
+        dList2.add(new Document("snapResult", new Document("$eq", 2)));
+        if (params.getDataType().equals(1)) {
+            dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        List<Document> dList3 = new ArrayList<>(2);
+        dList3.add(new Document("snapResult", new Document("$eq", 4)));
+        if (params.getDataType().equals(1)) {
+            dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        }
+        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),
@@ -1315,9 +1975,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);
@@ -1332,15 +2005,29 @@
      */
     @Override
     public Result faceAvailabilityOfLargeImg(DataCenterQuery params) {
-
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
+        List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
+        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);
     }
@@ -1362,4 +2049,14 @@
         return Result.ok().data(map).total(page.getTotal());
 
     }
+
+    /**
+     * 鍒犻櫎灏鹃儴鐨�0
+     * @param rate
+     * @return
+     */
+    private String remove0(BigDecimal rate) {
+        DF.setDecimalSeparatorAlwaysShown(false);
+        return DF.format(rate) + "%";
+    }
 }

--
Gitblit v1.8.0