From cd24a045bd9ee29505ddc9760d25f5d4037f4f0c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 05 九月 2024 21:55:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java |  574 ++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 448 insertions(+), 126 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 f40c430..39fb39a 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,22 +1,22 @@
 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 lombok.RequiredArgsConstructor;
 import org.apache.commons.collections.CollectionUtils;
@@ -28,6 +28,8 @@
 import org.springframework.data.mongodb.core.query.TextCriteria;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -44,6 +46,9 @@
     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";
@@ -58,7 +63,7 @@
     public Result videoPointOnlineRate(DataCenterQuery params) {
         // 鐢熸垚鏌ヨ
         List<String> likeFileds = Arrays.asList("arealayerName", "ipAddr", "deviceName", "deviceId");
-        Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         // 鍏堟煡鎬绘暟鍐嶅垎椤�
         long total = mongoTemplate.count(query, VideoOnlineResult.class);
@@ -69,9 +74,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 + "",onlineRate + "%"));
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -84,11 +99,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, likeFileds, deptGBList);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, 1);
 
         // 鍏堟煡鎬绘暟鍐嶅垎椤�
         long total = mongoTemplate.count(query, VideoOnlineResult.class);
@@ -98,7 +112,7 @@
         // 缁熻鏁伴噺
         MongoDatabase database = mongoTemplate.getDb();
         MongoCollection<Document> collection = database.getCollection("uy_online");
-        Document filter = new Document("deviceId", new Document("$in", deptGBList));
+        Document filter = new Document("deptTag", new Document("$eq", Boolean.TRUE));
         // 鏋勫缓鑱氬悎绠¢亾
         List<Document> pipeline = Arrays.asList(
                 // 鍙閮ㄧ骇鐨�
@@ -114,9 +128,19 @@
             uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
             break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
         }
-
+        Date now = new Date();
+        List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
+                .select(CheckIndexVideo::getMinistrySiteOnline)
+                .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 + "", onlineRate + "%"));
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -129,10 +153,8 @@
      */
     @Override
     public Result videoImportantPointOnlineRate(DataCenterQuery params) {
-        // 鍏堟煡鍑洪噸鐐圭偣浣嶇殑鍥芥爣
-        List<String> deptGBList = pointMapper.getDeptPointGB(1);
         List<String> likeFileds = Arrays.asList("arealayerName", "ipAddr", "deviceName", "deviceId");
-        Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, likeFileds, deptGBList);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, 3);
 
         long total = mongoTemplate.count(query, VideoOnlineResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -141,7 +163,7 @@
         // 缁熻鏁伴噺
         MongoDatabase database = mongoTemplate.getDb();
         MongoCollection<Document> collection = database.getCollection("uy_online");
-        Document filter = new Document("deviceId", new Document("$in", deptGBList));
+        Document filter = new Document("importantTag", new Document("$eq", Boolean.TRUE));
         // 鏋勫缓鑱氬悎绠¢亾
         List<Document> pipeline = Arrays.asList(
                 new Document("$match", filter),
@@ -157,13 +179,19 @@
             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)
+                .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 + "", onlineRate + "%"));
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -176,10 +204,8 @@
      */
     @Override
     public Result videoImportantPointImageOnlineRate(DataCenterQuery params) {
-        // 鍏堟煡鍑洪噸鐐规寚鎸ュ浘鍍忕偣浣嶇殑鍥芥爣
-        List<String> deptGBList = pointMapper.getDeptPointGB(2);
         List<String> likeFileds = Arrays.asList("arealayerName", "ipAddr", "deviceName", "deviceId");
-        Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, likeFileds, deptGBList);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, 4);
 
         long total = mongoTemplate.count(query, VideoOnlineResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -188,7 +214,7 @@
         // 缁熻鏁伴噺
         MongoDatabase database = mongoTemplate.getDb();
         MongoCollection<Document> collection = database.getCollection("uy_online");
-        Document filter = new Document("deviceId", new Document("$in", deptGBList));
+        Document filter = new Document("importantCommandImageTag", new Document("$eq", Boolean.TRUE));
         // 鏋勫缓鑱氬悎绠¢亾
         List<Document> pipeline = Arrays.asList(
                 new Document("$match", filter),
@@ -204,14 +230,19 @@
             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)
+                .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 + "", onlineRate + "%"));
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -225,7 +256,7 @@
     @Override
     public Result videoOneMachineDocumentRegister(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("ip.showValue", "name.showValue", "serialNumber.showValue");
-        Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, MonitorQualifyResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -241,7 +272,7 @@
         Document longitudeErrFilter = new Document("longitude.error", true);
 
         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),
@@ -256,9 +287,21 @@
                 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)
+                .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(onlineRate + "%");
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", rList);
         map.put("list", resultList);
@@ -274,7 +317,7 @@
     @Override
     public Result videoOneMachineDocumentQualified(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("ip.showValue", "name.showValue", "serialNumber.showValue");
-        Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, MonitorQualifyResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -290,7 +333,7 @@
         Document longitudeErrFilter = new Document("longitude.error", true);
 
         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),
@@ -305,9 +348,21 @@
                 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)
+                .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(onlineRate + "%");
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", rList);
         map.put("list", resultList);
@@ -324,7 +379,7 @@
     public Result videoAssessmentFileRatio(DataCenterQuery params) {
         // TODO 鏂板涓�寮犺〃璁板綍姣忔鐨勬。妗堣�冩牳
         List<String> likeFileds = Arrays.asList("ip.showValue", "name.showValue", "serialNumber.showValue");
-        Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, MonitorQualifyResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -340,7 +395,7 @@
         Document longitudeErrFilter = new Document("longitude.error", true);
 
         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),
@@ -355,9 +410,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);
@@ -373,7 +429,7 @@
     @Override
     public Result videoAvailabilityRate(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
-        Query query = MongoUtil.getQuery(params, "deviceId", "createTime", likeFileds, null);
+        Query query = MongoUtil.getQuery(params,"createTime", likeFileds, null);
 
         long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
         MongoUtil.setPage(query, params, "createTime");
@@ -383,7 +439,7 @@
         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 -> {
+        List<String> resultCount = status.stream().map(item -> {
             Document filter = new Document("recordStatus", item);
             // 鏋勫缓鑱氬悎绠¢亾
             List<Document> pipeline = Arrays.asList(
@@ -399,10 +455,21 @@
                 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)
+                .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(onlineRate + "%");
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", resultCount);
         map.put("list", resultList);
@@ -417,10 +484,8 @@
      */
     @Override
     public Result deptVideoAvailabilityRate(DataCenterQuery params) {
-
-        List<String> deptGBList = pointMapper.getDeptPointGB(0);
         List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
-        Query query = MongoUtil.getQuery(params, "deviceId", "createTime", likeFileds, deptGBList);
+        Query query = MongoUtil.getQuery(params,"createTime", likeFileds, 1);
 
         long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
         MongoUtil.setPage(query, params, "createTime");
@@ -430,9 +495,9 @@
         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 -> {
+        List<String> resultCount = status.stream().map(item -> {
             Document filter = new Document("$and", Arrays.asList(
-                    new Document("deviceId", new Document("$in", deptGBList)), // $in 鏉′欢
+                    new Document("deptTag", new Document("$eq", Boolean.TRUE)),
                     new Document("recordStatus", item)
             ));
             // 鏋勫缓鑱氬悎绠¢亾
@@ -449,10 +514,21 @@
                 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)
+                .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(onlineRate + "%");
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", resultCount);
         map.put("list", resultList);
@@ -467,10 +543,8 @@
      */
     @Override
     public Result videoImportantPointAvailabilityRate(DataCenterQuery params) {
-
-        List<String> deptGBList = pointMapper.getDeptPointGB(1);
         List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
-        Query query = MongoUtil.getQuery(params, "deviceId", "createTime", likeFileds, deptGBList);
+        Query query = MongoUtil.getQuery(params,"createTime", likeFileds, 3);
 
         long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
         MongoUtil.setPage(query, params, "createTime");
@@ -480,9 +554,9 @@
         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 -> {
+        List<String> resultCount = status.stream().map(item -> {
             Document filter = new Document("$and", Arrays.asList(
-                    new Document("deviceId", new Document("$in", deptGBList)), // $in 鏉′欢
+                    new Document("importantTag", new Document("$eq", Boolean.TRUE)),
                     new Document("recordStatus", item)
             ));
             // 鏋勫缓鑱氬悎绠¢亾
@@ -499,9 +573,21 @@
                 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)
+                .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(onlineRate + "%");
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", resultCount);
         map.put("list", resultList);
@@ -517,7 +603,7 @@
     @Override
     public Result videoLabelingAccuracy(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
-        Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
         List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
@@ -541,10 +627,8 @@
      */
     @Override
     public Result videoImportantPointLabelingAccuracy(DataCenterQuery params) {
-
-        List<String> deptGBList = pointMapper.getDeptPointGB(1);
         List<String> likeFileds = Arrays.asList("deviceNo", "osdName");
-        Query query = MongoUtil.getQuery(params, "deviceNo", "checkTime", likeFileds, deptGBList);
+        Query query = MongoUtil.getQuery(params,"checkTime", likeFileds, 3);
 
         long total = mongoTemplate.count(query, OsdCheckResult.class);
         MongoUtil.setPage(query, params, "checkTime");
@@ -554,12 +638,13 @@
         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);
+        Document importantTag = new Document("importantTag", Boolean.TRUE);
+        Document osdNameFilter = new Document("$and", Arrays.asList(new Document("osdNameCorrect", 1), importantTag));
+        Document osdNameErrFilter = new Document("$and", Arrays.asList(new Document("osdNameCorrect", -1), importantTag));
+        Document osdTimeFilter = new Document("$and", Arrays.asList(new Document("osdTimeCorrect", 1), importantTag));
+        Document osdTimeErrFilter = new Document("$and", Arrays.asList(new Document("osdTimeCorrect", -1), importantTag));
         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),
@@ -574,10 +659,21 @@
                 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)
+                .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(onlineRate + "%");
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", rList);
         map.put("list", resultList);
@@ -594,7 +690,7 @@
     public Result videoCheckTimeAccuracy(DataCenterQuery params) {
 
         List<String> likeFileds = Arrays.asList("deviceId");
-        Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, OneMachineFileResult.class);
         List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
@@ -619,9 +715,8 @@
     @Override
     public Result videoImportantPointCheckTimeAccuracy(DataCenterQuery params) {
 
-        List<String> deptGBList = pointMapper.getDeptPointGB(1);
         List<String> likeFileds = Arrays.asList("deviceNo", "osdName");
-        Query query = MongoUtil.getQuery(params, "deviceNo", "checkTime", likeFileds, deptGBList);
+        Query query = MongoUtil.getQuery(params,"checkTime", likeFileds, 3);
 
         long total = mongoTemplate.count(query, OsdCheckResult.class);
         MongoUtil.setPage(query, params, "checkTime");
@@ -631,10 +726,11 @@
         MongoDatabase database = mongoTemplate.getDb();
         MongoCollection<Document> collection = database.getCollection("osd_check_result");
 
-        Document osdTimeFilter = new Document("osdTimeCorrect", 1);
-        Document osdTimeErrFilter = new Document("osdTimeCorrect", -1);
+        Document importantTag = new Document("importantTag", Boolean.TRUE);
+        Document osdTimeFilter = new Document("$and", Arrays.asList(new Document("osdTimeCorrect", 1), importantTag));
+        Document osdTimeErrFilter = new Document("$and", Arrays.asList(new Document("osdTimeCorrect", -1), importantTag));
         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),
@@ -649,9 +745,21 @@
                 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)
+                .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(onlineRate + "%");
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", rList);
         map.put("list", resultList);
@@ -668,7 +776,7 @@
     @Override
     public Result vehicleViewDockStable(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -683,7 +791,7 @@
         Document trFilter = new Document("resultType", 3);
         Document littleFilter = new Document("resultType", 4);
         List<Document> lists = Arrays.asList(normalFilter, noDataFilter, trFilter, littleFilter);
-        List<Integer> rList = lists.stream().map(filter -> {
+        List<String> rList = lists.stream().map(filter -> {
             // 鏋勫缓鑱氬悎绠¢亾
             List<Document> pipeline = Arrays.asList(
                     new Document("$match", filter),
@@ -698,9 +806,21 @@
                 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)
+                .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(onlineRate + "%");
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", rList);
         map.put("list", resultList);
@@ -716,7 +836,7 @@
     @Override
     public Result vehiclePointOnlineRate(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -727,8 +847,19 @@
         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)
+                .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 + "%", onlineRate + "%"));
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -742,7 +873,7 @@
     @Override
     public Result vehicleNetDeviceDirectoryConsistency(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("ip.showValue", "name.showValue", "serialNumber.showValue");
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, MonitorQualifyResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -758,7 +889,7 @@
         Document longitudeErrFilter = new Document("longitude.error", true);
 
         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),
@@ -773,9 +904,21 @@
                 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)
+                .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(onlineRate + "%");
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", rList);
         map.put("list", resultList);
@@ -791,7 +934,7 @@
     @Override
     public Result vehicleCollectionConsistency(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "crossName");
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, CrossDetailResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -807,7 +950,7 @@
         Document longitudeErrFilter = new Document("lalType", 4);
 
         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),
@@ -822,9 +965,21 @@
                 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)
+                .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(onlineRate + "%");
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", rList);
         map.put("list", resultList);
@@ -840,7 +995,7 @@
     @Override
     public Result vehicleCollectionDataIntegrity(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, DataIntegrityMonitoringResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -850,8 +1005,20 @@
         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)
+                .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(onlineRate + "%"));
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -865,14 +1032,25 @@
     @Override
     public Result vehicleCollectionDataCaptured(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, AttrRecognitionMonitorResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
         List<AttrRecognitionMonitorResult> resultList = mongoTemplate.find(query, AttrRecognitionMonitorResult.class);
-        // 缁熻鏁�
+
+        Date now = new Date();
+        List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
+                .select(CheckIndexCar::getVehicleCaptureAccuracy)
+                .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(onlineRate + "%"));
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -886,7 +1064,7 @@
     @Override
     public Result vehicleClockAccuracy(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, VehicleDeviceInspectionResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -902,7 +1080,7 @@
         Document longitudeErrFilter = new Document("snapResult", 4);
 
         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),
@@ -917,9 +1095,21 @@
                 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)
+                .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(onlineRate + "%");
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", rList);
         map.put("list", resultList);
@@ -935,14 +1125,26 @@
     @Override
     public Result vehicleTimelyUploadAccuracy(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, SnapshotDelayMonitorResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
         List<SnapshotDelayMonitorResult> resultList = mongoTemplate.find(query, SnapshotDelayMonitorResult.class);
+
         // 缁熻鏁�
+        Date now = new Date();
+        List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
+                .select(CheckIndexCar::getVehicleUploadTimeliness)
+                .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(onlineRate + "%"));
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -956,14 +1158,26 @@
     @Override
     public Result vehicleUrlAccuracy(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, PicAccessResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
         List<PicAccessResult> resultList = mongoTemplate.find(query, PicAccessResult.class);
+
         // 缁熻鏁�
+        Date now = new Date();
+        List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
+                .select(CheckIndexCar::getVehicleUrlAvailability)
+                .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(onlineRate + "%"));
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -977,14 +1191,26 @@
     @Override
     public Result vehicleBigImgAccuracy(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, VehicleDeviceSamplingResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
         List<VehicleDeviceSamplingResult> resultList = mongoTemplate.find(query, VehicleDeviceSamplingResult.class);
+
         // 缁熻鏁�
+        Date now = new Date();
+        List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
+                .select(CheckIndexCar::getVehiclePictureAvailability)
+                .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(onlineRate + "%"));
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -998,7 +1224,7 @@
     @Override
     public Result faceViewDockStable(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -1013,7 +1239,7 @@
         Document trFilter = new Document("resultType", 3);
         Document littleFilter = new Document("resultType", 4);
         List<Document> lists = Arrays.asList(normalFilter, noDataFilter, trFilter, littleFilter);
-        List<Integer> rList = lists.stream().map(filter -> {
+        List<String> rList = lists.stream().map(filter -> {
             // 鏋勫缓鑱氬悎绠¢亾
             List<Document> pipeline = Arrays.asList(
                     new Document("$match", filter),
@@ -1028,9 +1254,21 @@
                 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)
+                .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(onlineRate + "%");
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", rList);
         map.put("list", resultList);
@@ -1046,7 +1284,7 @@
     @Override
     public Result facePointOnlineRate(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -1061,7 +1299,7 @@
         Document trFilter = new Document("resultType", 3);
         Document littleFilter = new Document("resultType", 4);
         List<Document> lists = Arrays.asList(normalFilter, noDataFilter, trFilter, littleFilter);
-        List<Integer> rList = lists.stream().map(filter -> {
+        List<String> rList = lists.stream().map(filter -> {
             // 鏋勫缓鑱氬悎绠¢亾
             List<Document> pipeline = Arrays.asList(
                     new Document("$match", filter),
@@ -1076,9 +1314,21 @@
                 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)
+                .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(onlineRate + "%");
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", rList);
         map.put("list", resultList);
@@ -1094,7 +1344,7 @@
     @Override
     public Result faceDirectoryConsistency(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("serialNumber.showValue", "ip.showValue", "name.showValue");
-        Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, MonitorQualifyResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -1110,7 +1360,7 @@
         Document longitudeErrFilter = new Document("longitude.error", true);
 
         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),
@@ -1125,9 +1375,21 @@
                 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)
+                .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(onlineRate + "%");
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", rList);
         map.put("list", resultList);
@@ -1143,7 +1405,7 @@
     @Override
     public Result faceCollectionConsistency(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "crossName");
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, CrossDetailResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -1159,7 +1421,7 @@
         Document longitudeErrFilter = new Document("lalType", 4);
 
         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),
@@ -1174,9 +1436,21 @@
                 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)
+                .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(onlineRate + "%");
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", rList);
         map.put("list", resultList);
@@ -1192,7 +1466,7 @@
     @Override
     public Result faceImgQualification(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "cameraName");
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, MonitoringDetailResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -1208,7 +1482,7 @@
         Document longitudeErrFilter = new Document("lalType", 4);
 
         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),
@@ -1223,9 +1497,21 @@
                 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)
+                .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(onlineRate + "%");
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", rList);
         map.put("list", resultList);
@@ -1241,7 +1527,7 @@
     @Override
     public Result faceCapturesImagesAccuracy(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, FaceDeviceInspectionResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -1256,7 +1542,7 @@
         Document longitudeErrFilter = new Document("snapResult", 4);
 
         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),
@@ -1271,9 +1557,21 @@
                 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)
+                .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(onlineRate + "%");
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", rList);
         map.put("list", resultList);
@@ -1289,7 +1587,7 @@
     @Override
     public Result faceTimelyUpload(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, FaceDeviceInspectionResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -1304,7 +1602,7 @@
         Document longitudeErrFilter = new Document("snapResult", 4);
 
         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),
@@ -1319,9 +1617,21 @@
                 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)
+                .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(onlineRate + "%");
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", rList);
         map.put("list", resultList);
@@ -1337,14 +1647,26 @@
     @Override
     public Result faceAvailabilityOfLargeImg(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
-        Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null);
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
         long total = mongoTemplate.count(query, FaceDeviceSamplingResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
         List<FaceDeviceSamplingResult> resultList = mongoTemplate.find(query, FaceDeviceSamplingResult.class);
+
         // 缁熻鏁�
+        Date now = new Date();
+        List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
+                .select(CheckIndexFace::getFacePictureAvailability)
+                .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(onlineRate + "%"));
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }

--
Gitblit v1.8.0