From 0d243e7f5dc593cdc6e0608bb52cd635f8fc6982 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 19 九月 2025 11:59:44 +0800
Subject: [PATCH] 新需求

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 1577 +++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 1,009 insertions(+), 568 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 331ec29..ff6e689 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
@@ -35,17 +35,21 @@
 import com.ycl.utils.bean.BeanUtils;
 import com.ycl.utils.poi.ExcelUtil;
 import constant.*;
+import enumeration.DataCenterMethodNameEnum;
 import enumeration.general.AreaDeptEnum;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.bson.Document;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.aggregation.*;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
@@ -54,6 +58,9 @@
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+import java.util.concurrent.ExecutionException;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
@@ -75,7 +82,9 @@
     private final ICheckIndexFaceService checkIndexFaceService;
     private final DynamicColumnMapper dynamicColumnMapper;
 
-
+    @Qualifier("threadPoolTaskExecutor")
+    @Autowired
+    private ThreadPoolTaskExecutor taskExecutor;
 
     private final static String TIME_FIELD = "mongoCreateTime";
 
@@ -690,155 +699,439 @@
 
     }
 
-
-
     /**
-     * 瑙嗛锛氱偣浣嶅湪绾跨巼
-     *
-     * @param params
-     * @return
+     * 鍐呴儴绫伙細瀛樺偍缁熻缁撴灉锛堥伩鍏嶉浂鏁ｅ彉閲忎紶閫掞級
      */
-    @Override
-    public Result videoPointOnlineRate(DataCenterQuery params) {
-        List<String> likeFileds = Arrays.asList("name", "no", "ip");
-        //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
-        Query query = null;
-        SysDept sysDept = getSysDeptByLoginUser();
-        AreaDeptEnum areaDeptEnum = null;
-        if (sysDept !=null){
-            areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
-            if (areaDeptEnum != null){
-                query = MongoUtil.getQueryDataCenter(areaDeptEnum.getCode(),params,TIME_FIELD,likeFileds,null,"no");
+    private static class StatisticsResult {
+        int totalCount;
+        int onlineCount;
+        int offlineCount;
+        int unknownCount;
+        BigDecimal onlineRate;
 
-            }else{
-                query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
-            }
-        }else {
-            query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+        public StatisticsResult(int totalCount, int onlineCount, int offlineCount, int unknownCount, BigDecimal onlineRate) {
+            this.totalCount = totalCount;
+            this.onlineCount = onlineCount;
+            this.offlineCount = offlineCount;
+            this.unknownCount = unknownCount;
+            this.onlineRate = onlineRate;
         }
-        //鏌ヨ棰戣澶�
-        query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
-        //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
-        if (params.getOption() != null) {
-            query.addCriteria(Criteria.where("online").is(params.getOption()));
-        }
-        Sort sort = Sort.by(
-                Sort.Order.asc("pingOnline"), // 棣栧厛鎸夌収 pingOnline 鍗囧簭鎺掑簭
-                Sort.Order.desc("offLineCount") // 棣栧厛鎸夌収 pingOnline 鍗囧簭鎺掑簭
-        );
-        // 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈�
-        query.with(sort);
-        //鍒嗛〉鏁伴噺
-        long total = mongoTemplate.count(query, TMonitorResult.class);
-        MongoUtil.setPage(query, params, TIME_FIELD);
-        List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
-
-        resultList.forEach(item -> {
-            if (item.getPingOnline() == null) {
-                item.setPingOnlineStr("鏈煡");
-            } else if (item.getPingOnline()) {
-                item.setPingOnlineStr("鍦ㄧ嚎");
-            } else if (!item.getPingOnline()) {
-                item.setPingOnlineStr("绂荤嚎");
-            }
-            if (1 == item.getOnline()) {
-                item.setOnlineStr("鍦ㄧ嚎");
-            } else if (-1 == item.getOnline()) {
-                item.setOnlineStr("绂荤嚎");
-            } else {
-                item.setOnlineStr("鏈煡");
-            }
-            List<String> offLineTime = item.getOffLineTimeStr();
-            if (!CollectionUtils.isEmpty(offLineTime)) {
-                if (offLineTime.size() > 1) {
-                    offLineTime = offLineTime.subList(offLineTime.size() - 2, offLineTime.size());
+    }
+    /**
+     * 鍒楄〃鏁版嵁鏍煎紡鍖�
+     */
+    private void formatResultList(List<TMonitorResult> resultList,String tag) {
+        if(DataCenterMethodNameEnum.VIDEO_POINT_ONLINE_RATE.name().equals(tag)){
+            resultList.forEach(item -> {
+                // pingOnline 鐘舵�佽浆鎹�
+                if (item.getPingOnline() == null) {
+                    item.setPingOnlineStr("鏈煡");
+                } else if (item.getPingOnline()) {
+                    item.setPingOnlineStr("鍦ㄧ嚎");
+                } else {
+                    item.setPingOnlineStr("绂荤嚎");
                 }
-                item.setOffLineTimeStr(offLineTime);
-            }
-            //娣诲姞鍔ㄦ�佹暟鎹�
-            List<DynamicColumnVO> list = dynamicColumnMapper.getDynamicColumnByTable(TableNameConstants.COLUMN_NAME_VIDEO_POINT,item.getNo());
-            item.setDynamicColumnList(list);
-        });
 
+                // online 鐘舵�佽浆鎹�
+                if (1 == item.getOnline()) {
+                    item.setOnlineStr("鍦ㄧ嚎");
+                } else if (-1 == item.getOnline()) {
+                    item.setOnlineStr("绂荤嚎");
+                } else {
+                    item.setOnlineStr("鏈煡");
+                }
 
-        params.setDeptTag(-1);
-        params.setDeviceType(1);
+                // 绂荤嚎鏃堕棿鎴柇锛堜繚鐣欐渶鍚�2鏉★級
+                List<String> offLineTime = item.getOffLineTimeStr();
+                if (!CollectionUtils.isEmpty(offLineTime) && offLineTime.size() > 1) {
+                    item.setOffLineTimeStr(offLineTime.subList(offLineTime.size() - 2, offLineTime.size()));
+                }
 
-        //鍗＄墖缁熻
-        int totalCount = 0;
-        int onlineCount = 0;
-        int offlineCount = 0;
-        int unknownCount = 0;
-        //鏋勫缓鏉′欢
-        List<Criteria> criteriaList = new ArrayList<>();
-        // 娣诲姞鍥哄畾鏉′欢
-        criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
-        criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
-        //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
-        if (areaDeptEnum != null){
-            criteriaList.add(Criteria.where("no").regex("^" +areaDeptEnum.getCode()));
+                // 娣诲姞鍔ㄦ�佸垪鏁版嵁
+                List<DynamicColumnVO> dynamicColumns = dynamicColumnMapper.getDynamicColumnByTable(
+                        TableNameConstants.COLUMN_NAME_VIDEO_POINT,
+                        item.getNo()
+                );
+                item.setDynamicColumnList(dynamicColumns);
+            });
         }
-        // 鏍规嵁dataType鍔ㄦ�佹坊鍔犳潯浠�
-        if (params.getDataType() == 1) {
-            criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE));
-        } else if (params.getDataType() == 2) {
-            criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
+        else if (DataCenterMethodNameEnum.DEPT_VIDEO_POINT_ONLINE_RATE.name().equals(tag)
+        || DataCenterMethodNameEnum.VIDEO_IMPORTANT_POINT_ONLINE_RATE.name().equals(tag)){
+            resultList.forEach(item -> {
+                if (item.getPingOnline() == null) {
+                    item.setPingOnlineStr("鏈煡");
+                } else if (item.getPingOnline()) {
+                    item.setPingOnlineStr("鍦ㄧ嚎");
+                } else if (!item.getPingOnline()) {
+                    item.setPingOnlineStr("绂荤嚎");
+                }
+                if (1 == item.getOnline()) {
+                    item.setOnlineStr("鍦ㄧ嚎");
+                } else if (-1 == item.getOnline()) {
+                    item.setOnlineStr("绂荤嚎");
+                } else {
+                    item.setOnlineStr("鏈煡");
+                }
+            });
         }
-        // 鏋勫缓match鎿嶄綔
-        MatchOperation match = Aggregation.match(
-                new Criteria().andOperator(criteriaList.toArray(new Criteria[0]))
-        );
-        GroupOperation group = Aggregation.group()
-                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Online)).then(1).otherwise(0)).as("onlineCount")
-                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Offline)).then(1).otherwise(0)).as("offlineCount")
-                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Unknown)).then(1).otherwise(0)).as("unknownCount");
-        // 灏嗗尮閰嶉樁娈靛拰鍒嗙粍闃舵缁勫悎璧锋潵
-        Aggregation aggregation = Aggregation.newAggregation(match, group);
-        // 鎵ц鑱氬悎鏌ヨ
-        AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class); // 鏇挎崲涓轰綘鐨勯泦鍚堝悕绉�
-        for (Map<String, Object> result : results.getMappedResults()) {
-            offlineCount = (Integer) result.getOrDefault("offlineCount", 0L);
-            unknownCount = (Integer) result.getOrDefault("unknownCount", 0L);
-            onlineCount = (Integer) result.getOrDefault("onlineCount", 0L);
-            totalCount = offlineCount + unknownCount + onlineCount;
-        }
-        BigDecimal onlineRate = BigDecimal.ZERO;
-        if (totalCount!=0) {
-            onlineRate = new BigDecimal(onlineCount).divide(new BigDecimal(totalCount), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
-        }
-//        /** 鏌ヨ褰撳ぉ鍦ㄧ嚎鐜� */
-//        List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
-//                .select(CheckIndexVideo::getSiteOnline)
-//                .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
-//                .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
-//                .between(CheckIndexVideo::getCreateTime, params.getStartTime(), params.getEndTime())
-//                .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(totalCount + "", onlineCount + "", offlineCount + "", unknownCount + "", this.remove0(onlineRate)));
-        map.put("list", resultList);
-        return Result.ok().data(map).total(total);
+
     }
 
     /**
-     * 瑙嗛锛氶儴绾х偣浣嶅湪绾跨巼
+     * 鍗＄墖缁熻璁＄畻
+     */
+    private StatisticsResult calculateStatistics(DataCenterQuery params, AreaDeptEnum areaDeptEnum,String tag) {
+        int totalCount = 0, onlineCount = 0, offlineCount = 0, unknownCount = 0;
+
+        // 璁＄畻鍦ㄧ嚎鐜�
+        BigDecimal onlineRate = BigDecimal.ZERO;
+        if (DataCenterMethodNameEnum.VIDEO_POINT_ONLINE_RATE.name().equals(tag)){
+            // 鏋勫缓缁熻鏉′欢
+            List<Criteria> criteriaList = new ArrayList<>();
+            criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+            criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
+
+            // 鏉冮檺杩囨护
+            if (areaDeptEnum != null) {
+                criteriaList.add(Criteria.where("no").regex("^" + areaDeptEnum.getCode()));
+            }
+            // 鏁版嵁绫诲瀷杩囨护锛堢渷/閮ㄩ棬鏍囩锛�
+            if (params.getDataType() == 1) {
+                criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE));
+            } else if (params.getDataType() == 2) {
+                criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
+            }
+
+            // MongoDB 鑱氬悎鏌ヨ
+            MatchOperation match = Aggregation.match(new Criteria().andOperator(criteriaList.toArray(new Criteria[0])));
+            GroupOperation group = Aggregation.group()
+                    .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Online)).then(1).otherwise(0)).as("onlineCount")
+                    .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Offline)).then(1).otherwise(0)).as("offlineCount")
+                    .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Unknown)).then(1).otherwise(0)).as("unknownCount");
+
+            Aggregation aggregation = Aggregation.newAggregation(match, group);
+            AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class);
+
+            // 澶勭悊缁熻缁撴灉
+            for (Map<String, Object> result : results.getMappedResults()) {
+                onlineCount = (Integer) result.getOrDefault("onlineCount", 0);
+                offlineCount = (Integer) result.getOrDefault("offlineCount", 0);
+                unknownCount = (Integer) result.getOrDefault("unknownCount", 0);
+                totalCount = onlineCount + offlineCount + unknownCount;
+            }
+
+            if (totalCount != 0) {
+                onlineRate = new BigDecimal(onlineCount)
+                        .divide(new BigDecimal(totalCount), 3, RoundingMode.DOWN)
+                        .multiply(new BigDecimal("100"));
+            }
+        }
+        else if (DataCenterMethodNameEnum.DEPT_VIDEO_POINT_ONLINE_RATE.name().equals(tag)) {
+            // 鏋勫缓缁熻鏉′欢
+            List<Criteria> criteriaList = new ArrayList<>();
+            criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+            criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
+            //閮ㄧ骇瑙嗛鏍囩 宸紓鐐�
+            criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
+            // 鏉冮檺杩囨护
+            if (areaDeptEnum != null) {
+                criteriaList.add(Criteria.where("no").regex("^" + areaDeptEnum.getCode()));
+            }
+            // 鏁版嵁绫诲瀷杩囨护锛堢渷/閮ㄩ棬鏍囩锛�
+            if (params.getDataType() == 1) {
+                criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE));
+            } else if (params.getDataType() == 2) {
+                criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
+            }
+
+            // MongoDB 鑱氬悎鏌ヨ
+            MatchOperation match = Aggregation.match(new Criteria().andOperator(criteriaList.toArray(new Criteria[0])));
+            GroupOperation group = Aggregation.group()
+                    .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Online)).then(1).otherwise(0)).as("onlineCount")
+                    .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Offline)).then(1).otherwise(0)).as("offlineCount")
+                    .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Unknown)).then(1).otherwise(0)).as("unknownCount");
+
+            Aggregation aggregation = Aggregation.newAggregation(match, group);
+            AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class);
+
+            // 澶勭悊缁熻缁撴灉
+            for (Map<String, Object> result : results.getMappedResults()) {
+                onlineCount = (Integer) result.getOrDefault("onlineCount", 0);
+                offlineCount = (Integer) result.getOrDefault("offlineCount", 0);
+                unknownCount = (Integer) result.getOrDefault("unknownCount", 0);
+                totalCount = onlineCount + offlineCount + unknownCount;
+            }
+
+
+            if (totalCount != 0) {
+                onlineRate = new BigDecimal(onlineCount)
+                        .divide(new BigDecimal(totalCount), 3, RoundingMode.DOWN)
+                        .multiply(new BigDecimal("100"));
+            }
+
+        }
+        else if (DataCenterMethodNameEnum.VIDEO_IMPORTANT_POINT_ONLINE_RATE.name().equals(tag)){
+            // 鏋勫缓缁熻鏉′欢
+            List<Criteria> criteriaList = new ArrayList<>();
+            criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+            criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
+            criteriaList.add(Criteria.where("importantTag").is(Boolean.TRUE));
+
+            // 鏉冮檺杩囨护
+            if (areaDeptEnum != null) {
+                criteriaList.add(Criteria.where("no").regex("^" + areaDeptEnum.getCode()));
+            }
+            // 鏁版嵁绫诲瀷杩囨护锛堢渷/閮ㄩ棬鏍囩锛�
+            if (params.getDataType() == 1) {
+                criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE));
+            } else if (params.getDataType() == 2) {
+                criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
+            }
+
+            // MongoDB 鑱氬悎鏌ヨ
+            MatchOperation match = Aggregation.match(new Criteria().andOperator(criteriaList.toArray(new Criteria[0])));
+            GroupOperation group = Aggregation.group()
+                    .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Online)).then(1).otherwise(0)).as("onlineCount")
+                    .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Offline)).then(1).otherwise(0)).as("offlineCount")
+                    .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Unknown)).then(1).otherwise(0)).as("unknownCount");
+
+            Aggregation aggregation = Aggregation.newAggregation(match, group);
+            AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class);
+
+            // 澶勭悊缁熻缁撴灉
+            for (Map<String, Object> result : results.getMappedResults()) {
+                onlineCount = (Integer) result.getOrDefault("onlineCount", 0);
+                offlineCount = (Integer) result.getOrDefault("offlineCount", 0);
+                unknownCount = (Integer) result.getOrDefault("unknownCount", 0);
+                totalCount = onlineCount + offlineCount + unknownCount;
+            }
+
+            if (totalCount != 0) {
+                onlineRate = new BigDecimal(onlineCount)
+                        .divide(new BigDecimal(totalCount), 3, RoundingMode.DOWN)
+                        .multiply(new BigDecimal("100"));
+            }
+        }
+
+        return new StatisticsResult(totalCount, onlineCount, offlineCount, unknownCount, onlineRate);
+    }
+
+    /**
+     * 瑙嗛锛氱偣浣嶅湪绾跨巼浼樺寲绾跨▼
      *
      * @param params
      * @return
      */
     @Override
-    public Result deptVideoPointOnlineRate(DataCenterQuery params) {
+   public Result videoPointOnlineRate(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("name", "no", "ip");
-        //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
-        Query query = null;
+        final Query query;
         SysDept sysDept = getSysDeptByLoginUser();
-        AreaDeptEnum areaDeptEnum = null;
+        final AreaDeptEnum areaDeptEnum; // 澹版槑涓篺inal
+
+        if (sysDept != null) {
+
+            areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
+            if (areaDeptEnum != null) {
+                query = MongoUtil.getQueryDataCenter(areaDeptEnum.getCode(), params, TIME_FIELD, likeFileds, null, "no");
+            } else {
+                query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+            }
+        } else {
+            //闇�瑕佸垵濮嬪寲 涓嶇劧涓嬫柟寮曞叆 澶氱嚎绋嬩細鎶ユ湭鍒濆鍖�
+            areaDeptEnum = null;
+            query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+        }
+
+
+        query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+        if (params.getOption() != null) {
+            query.addCriteria(Criteria.where("online").is(params.getOption()));
+        }
+
+        Sort sort = Sort.by(
+                Sort.Order.asc("pingOnline"),
+                Sort.Order.desc("offLineCount")
+        );
+        query.with(sort);
+
+        long total = mongoTemplate.count(query, TMonitorResult.class);
+        //杩愯鍒嗛〉鏌ヨ绾跨▼
+        CompletableFuture<List<TMonitorResult>> listFuture = CompletableFuture.supplyAsync(() -> {
+            try {
+                MongoUtil.setPage(query, params, TIME_FIELD);
+                List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
+                //鏋勫缓鍒楄〃鏁版嵁
+                formatResultList(resultList,DataCenterMethodNameEnum.VIDEO_POINT_ONLINE_RATE.name());
+                return resultList;
+            } catch (Exception e) {
+                throw new CompletionException("瑙嗛璁惧鍒楄〃鏌ヨ澶辫触锛�" + e.getMessage(), e);
+            }
+        }, taskExecutor);
+        //杩愯缁熻绾跨▼
+        CompletableFuture<StatisticsResult> statsFuture = CompletableFuture.supplyAsync(() -> {
+            try {
+                return calculateStatistics(params, areaDeptEnum,DataCenterMethodNameEnum.VIDEO_POINT_ONLINE_RATE.name()); // 鐜板湪鍙畨鍏ㄥ紩鐢�
+            } catch (Exception e) {
+                throw new CompletionException("瑙嗛璁惧鐘舵�佺粺璁″け璐ワ細" + e.getMessage(), e);
+            }
+        }, taskExecutor);
+
+        try {
+            CompletableFuture.allOf(listFuture, statsFuture).join();
+            List<TMonitorResult> resultList = listFuture.get();
+            StatisticsResult statsResult = statsFuture.get();
+
+            HashMap<String, Object> map = new HashMap<>();
+            map.put("count", Arrays.asList(
+                    String.valueOf(statsResult.totalCount),
+                    String.valueOf(statsResult.onlineCount),
+                    String.valueOf(statsResult.offlineCount),
+                    String.valueOf(statsResult.unknownCount),
+                    this.remove0(statsResult.onlineRate)
+            ));
+            map.put("list", resultList);
+
+            return Result.ok().data(map).total(total);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            return Result.error("鏌ヨ琚腑鏂紝璇风◢鍚庨噸璇�");
+        } catch (ExecutionException e) {
+            Throwable rootCause = e.getCause();
+            String errorMsg = rootCause != null ? rootCause.getMessage() : "瑙嗛璁惧鏁版嵁鏌ヨ澶辫触";
+            return Result.error(errorMsg);
+        }
+    }
+
+//    @Override
+//    public Result videoPointOnlineRate(DataCenterQuery params) {
+//        List<String> likeFileds = Arrays.asList("name", "no", "ip");
+//        //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
+//        Query query = null;
+//        SysDept sysDept = getSysDeptByLoginUser();
+//        AreaDeptEnum areaDeptEnum = null;
+//        if (sysDept !=null){
+//            areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
+//            if (areaDeptEnum != null){
+//                query = MongoUtil.getQueryDataCenter(areaDeptEnum.getCode(),params,TIME_FIELD,likeFileds,null,"no");
+//
+//            }else{
+//                query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+//            }
+//        }else {
+//            query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+//        }
+//
+//        //鏌ヨ棰戣澶�
+//        query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+//        //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
+//        if (params.getOption() != null) {
+//            query.addCriteria(Criteria.where("online").is(params.getOption()));
+//        }
+//        Sort sort = Sort.by(
+//                Sort.Order.asc("pingOnline"), // 棣栧厛鎸夌収 pingOnline 鍗囧簭鎺掑簭
+//                Sort.Order.desc("offLineCount") // 棣栧厛鎸夌収 pingOnline 鍗囧簭鎺掑簭
+//        );
+//        // 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈�
+//        query.with(sort);
+//        //鍒嗛〉鏁伴噺
+//        long total = mongoTemplate.count(query, TMonitorResult.class);
+//
+//
+//
+//        MongoUtil.setPage(query, params, TIME_FIELD);
+//        List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
+//
+//        resultList.forEach(item -> {
+//            if (item.getPingOnline() == null) {
+//                item.setPingOnlineStr("鏈煡");
+//            } else if (item.getPingOnline()) {
+//                item.setPingOnlineStr("鍦ㄧ嚎");
+//            } else if (!item.getPingOnline()) {
+//                item.setPingOnlineStr("绂荤嚎");
+//            }
+//            if (1 == item.getOnline()) {
+//                item.setOnlineStr("鍦ㄧ嚎");
+//            } else if (-1 == item.getOnline()) {
+//                item.setOnlineStr("绂荤嚎");
+//            } else {
+//                item.setOnlineStr("鏈煡");
+//            }
+//            List<String> offLineTime = item.getOffLineTimeStr();
+//            if (!CollectionUtils.isEmpty(offLineTime)) {
+//                if (offLineTime.size() > 1) {
+//                    offLineTime = offLineTime.subList(offLineTime.size() - 2, offLineTime.size());
+//                }
+//                item.setOffLineTimeStr(offLineTime);
+//            }
+//            //娣诲姞鍔ㄦ�佹暟鎹�
+//            List<DynamicColumnVO> list = dynamicColumnMapper.getDynamicColumnByTable(TableNameConstants.COLUMN_NAME_VIDEO_POINT,item.getNo());
+//            item.setDynamicColumnList(list);
+//        });
+//
+//
+//        params.setDeptTag(-1);
+//        params.setDeviceType(1);
+//
+//        //鍗＄墖缁熻
+//        int totalCount = 0;
+//        int onlineCount = 0;
+//        int offlineCount = 0;
+//        int unknownCount = 0;
+//        //鏋勫缓鏉′欢
+//        List<Criteria> criteriaList = new ArrayList<>();
+//        // 娣诲姞鍥哄畾鏉′欢
+//        criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+//        criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
+//        //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
+//        if (areaDeptEnum != null){
+//            criteriaList.add(Criteria.where("no").regex("^" +areaDeptEnum.getCode()));
+//        }
+//        // 鏍规嵁dataType鍔ㄦ�佹坊鍔犳潯浠�
+//        if (params.getDataType() == 1) {
+//            criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE));
+//        } else if (params.getDataType() == 2) {
+//            criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
+//        }
+//        // 鏋勫缓match鎿嶄綔
+//        MatchOperation match = Aggregation.match(
+//                new Criteria().andOperator(criteriaList.toArray(new Criteria[0]))
+//        );
+//        GroupOperation group = Aggregation.group()
+//                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Online)).then(1).otherwise(0)).as("onlineCount")
+//                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Offline)).then(1).otherwise(0)).as("offlineCount")
+//                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Unknown)).then(1).otherwise(0)).as("unknownCount");
+//        // 灏嗗尮閰嶉樁娈靛拰鍒嗙粍闃舵缁勫悎璧锋潵
+//        Aggregation aggregation = Aggregation.newAggregation(match, group);
+//        // 鎵ц鑱氬悎鏌ヨ
+//        AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class); // 鏇挎崲涓轰綘鐨勯泦鍚堝悕绉�
+//        for (Map<String, Object> result : results.getMappedResults()) {
+//            offlineCount = (Integer) result.getOrDefault("offlineCount", 0L);
+//            unknownCount = (Integer) result.getOrDefault("unknownCount", 0L);
+//            onlineCount = (Integer) result.getOrDefault("onlineCount", 0L);
+//            totalCount = offlineCount + unknownCount + onlineCount;
+//        }
+//        BigDecimal onlineRate = BigDecimal.ZERO;
+//        if (totalCount!=0) {
+//            onlineRate = new BigDecimal(onlineCount).divide(new BigDecimal(totalCount), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
+//        }
+//        HashMap<String, Object> map = new HashMap<>();
+//        map.put("count", Arrays.asList(totalCount + "", onlineCount + "", offlineCount + "", unknownCount + "", this.remove0(onlineRate)));
+//        map.put("list", resultList);
+//        return Result.ok().data(map).total(total);
+//    }
+    /**
+     * 瑙嗛锛氶儴绾х偣浣嶅湪绾跨巼浼樺寲绾跨▼
+     *
+     * @param params
+     * @return
+     */
+    @Override
+    public Result deptVideoPointOnlineRate(DataCenterQuery params){
+        List<String> likeFileds  =Arrays.asList("name","no","ip");
+        final Query query;
+        SysDept sysDept = getSysDeptByLoginUser();
+        final AreaDeptEnum areaDeptEnum;
         if (sysDept !=null){
             areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
             if (areaDeptEnum != null){
@@ -848,9 +1141,9 @@
                 query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
             }
         }else {
+            areaDeptEnum = null;
             query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
         }
-        //鏌ヨ棰戣澶�
         query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
         query.addCriteria(Criteria.where("deptTag").is(Boolean.TRUE));
         //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
@@ -861,88 +1154,258 @@
         query.with(Sort.by(Sort.Order.asc("pingOnline")));
         //鍒嗛〉鏁伴噺
         long total = mongoTemplate.count(query, TMonitorResult.class);
-        MongoUtil.setPage(query, params, TIME_FIELD);
-        List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
-        resultList.forEach(item -> {
-            if (item.getPingOnline() == null) {
-                item.setPingOnlineStr("鏈煡");
-            } else if (item.getPingOnline()) {
-                item.setPingOnlineStr("鍦ㄧ嚎");
-            } else if (!item.getPingOnline()) {
-                item.setPingOnlineStr("绂荤嚎");
+
+        CompletableFuture<List<TMonitorResult>> listFuture = CompletableFuture.supplyAsync(() ->{
+            MongoUtil.setPage(query,params,TIME_FIELD);
+            List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
+            formatResultList(resultList,DataCenterMethodNameEnum.DEPT_VIDEO_POINT_ONLINE_RATE.name());
+            return resultList;
+        },taskExecutor);
+
+        CompletableFuture<StatisticsResult> statsFuture = CompletableFuture.supplyAsync(()->{
+            try {
+                return calculateStatistics(params, areaDeptEnum,DataCenterMethodNameEnum.DEPT_VIDEO_POINT_ONLINE_RATE.name()); // 鐜板湪鍙畨鍏ㄥ紩鐢�
+            } catch (Exception e) {
+                throw new CompletionException("瑙嗛璁惧鐘舵�佺粺璁″け璐ワ細" + e.getMessage(), e);
             }
-            if (1 == item.getOnline()) {
-                item.setOnlineStr("鍦ㄧ嚎");
-            } else if (-1 == item.getOnline()) {
-                item.setOnlineStr("绂荤嚎");
-            } else {
-                item.setOnlineStr("鏈煡");
-            }
-        });
-        // 缁熻璁惧鏁伴噺
-        //鍗＄墖缁熻
-        int totalCount = 0;
-        int onlineCount = 0;
-        int offlineCount = 0;
-        int unknownCount = 0;
-        //鏋勫缓鏉′欢
-        List<Criteria> criteriaList = new ArrayList<>();
-        //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
-        if (areaDeptEnum != null){
-            criteriaList.add(Criteria.where("no").regex("^" +areaDeptEnum.getCode()));
+        },taskExecutor);
+
+        try {
+            CompletableFuture.allOf(listFuture, statsFuture).join();
+            List<TMonitorResult> resultList = listFuture.get();
+            StatisticsResult statsResult = statsFuture.get();
+
+            HashMap<String, Object> map = new HashMap<>();
+            map.put("count", Arrays.asList(
+                    String.valueOf(statsResult.totalCount),
+                    String.valueOf(statsResult.onlineCount),
+                    String.valueOf(statsResult.offlineCount),
+                    String.valueOf(statsResult.unknownCount),
+                    this.remove0(statsResult.onlineRate)
+            ));
+            map.put("list", resultList);
+
+            return Result.ok().data(map).total(total);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            return Result.error("鏌ヨ琚腑鏂紝璇风◢鍚庨噸璇�");
+        } catch (ExecutionException e) {
+            Throwable rootCause = e.getCause();
+            String errorMsg = rootCause != null ? rootCause.getMessage() : "瑙嗛璁惧鏁版嵁鏌ヨ澶辫触";
+            return Result.error(errorMsg);
         }
-        // 娣诲姞鍥哄畾鏉′欢
-        criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
-        criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
-        criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
-        // 鏍规嵁dataType鍔ㄦ�佹坊鍔犳潯浠�
-        if (params.getDataType() == 1) {
-            criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE));
-        } else if (params.getDataType() == 2) {
-            criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
-        }
-        // 鏋勫缓match鎿嶄綔
-        MatchOperation match = Aggregation.match(
-                new Criteria().andOperator(criteriaList.toArray(new Criteria[0]))
-        );
-        GroupOperation group = Aggregation.group()
-                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Online)).then(1).otherwise(0)).as("onlineCount")
-                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Offline)).then(1).otherwise(0)).as("offlineCount")
-                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Unknown)).then(1).otherwise(0)).as("unknownCount");
-        // 灏嗗尮閰嶉樁娈靛拰鍒嗙粍闃舵缁勫悎璧锋潵
-        Aggregation aggregation = Aggregation.newAggregation(match, group);
-        // 鎵ц鑱氬悎鏌ヨ
-        AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class); // 鏇挎崲涓轰綘鐨勯泦鍚堝悕绉�
-        for (Map<String, Object> result : results.getMappedResults()) {
-            offlineCount = (Integer) result.getOrDefault("offlineCount", 0L);
-            unknownCount = (Integer) result.getOrDefault("unknownCount", 0L);
-            onlineCount = (Integer) result.getOrDefault("onlineCount", 0L);
-            totalCount = offlineCount + unknownCount + onlineCount;
-        }
-        BigDecimal onlineRate = BigDecimal.ZERO;
-        if (totalCount!=0) {
-            onlineRate = new BigDecimal(onlineCount).divide(new BigDecimal(totalCount), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
-        }
-//        params.setDeptTag(1);
-//        params.setDeviceType(1);
-//        List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
-//                .select(CheckIndexVideo::getMinistrySiteOnline)
-//                .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
-//                .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
-//                .between(CheckIndexVideo::getCreateTime, params.getStartTime(), params.getEndTime())
-//                .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(totalCount + "", onlineCount + "", offlineCount + "", unknownCount + "", this.remove0(onlineRate)));
-        map.put("list", resultList);
-        return Result.ok().data(map).total(total);
     }
 
+//    @Override
+//    public Result deptVideoPointOnlineRate(DataCenterQuery params) {
+//        List<String> likeFileds = Arrays.asList("name", "no", "ip");
+//        //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
+//        Query query = null;
+//        SysDept sysDept = getSysDeptByLoginUser();
+//        AreaDeptEnum areaDeptEnum = null;
+//        if (sysDept !=null){
+//            areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
+//            if (areaDeptEnum != null){
+//                query = MongoUtil.getQueryDataCenter(areaDeptEnum.getCode(),params,TIME_FIELD,likeFileds,null,"no");
+//
+//            }else{
+//                query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+//            }
+//        }else {
+//            query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+//        }
+//        //鏌ヨ棰戣澶�
+//        query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+//        query.addCriteria(Criteria.where("deptTag").is(Boolean.TRUE));
+//        //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
+//        if (params.getOption() != null) {
+//            query.addCriteria(Criteria.where("online").is(params.getOption()));
+//        }
+//        // 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈�
+//        query.with(Sort.by(Sort.Order.asc("pingOnline")));
+//        //鍒嗛〉鏁伴噺
+//        long total = mongoTemplate.count(query, TMonitorResult.class);
+//        MongoUtil.setPage(query, params, TIME_FIELD);
+//        List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
+//        resultList.forEach(item -> {
+//            if (item.getPingOnline() == null) {
+//                item.setPingOnlineStr("鏈煡");
+//            } else if (item.getPingOnline()) {
+//                item.setPingOnlineStr("鍦ㄧ嚎");
+//            } else if (!item.getPingOnline()) {
+//                item.setPingOnlineStr("绂荤嚎");
+//            }
+//            if (1 == item.getOnline()) {
+//                item.setOnlineStr("鍦ㄧ嚎");
+//            } else if (-1 == item.getOnline()) {
+//                item.setOnlineStr("绂荤嚎");
+//            } else {
+//                item.setOnlineStr("鏈煡");
+//            }
+//        });
+//        // 缁熻璁惧鏁伴噺
+//        //鍗＄墖缁熻
+//        int totalCount = 0;
+//        int onlineCount = 0;
+//        int offlineCount = 0;
+//        int unknownCount = 0;
+//        //鏋勫缓鏉′欢
+//        List<Criteria> criteriaList = new ArrayList<>();
+//        //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
+//        if (areaDeptEnum != null){
+//            criteriaList.add(Criteria.where("no").regex("^" +areaDeptEnum.getCode()));
+//        }
+//        // 娣诲姞鍥哄畾鏉′欢
+//        criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+//        criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
+//        criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
+//        // 鏍规嵁dataType鍔ㄦ�佹坊鍔犳潯浠�
+//        if (params.getDataType() == 1) {
+//            criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE));
+//        } else if (params.getDataType() == 2) {
+//            criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
+//        }
+//        // 鏋勫缓match鎿嶄綔
+//        MatchOperation match = Aggregation.match(
+//                new Criteria().andOperator(criteriaList.toArray(new Criteria[0]))
+//        );
+//        GroupOperation group = Aggregation.group()
+//                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Online)).then(1).otherwise(0)).as("onlineCount")
+//                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Offline)).then(1).otherwise(0)).as("offlineCount")
+//                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Unknown)).then(1).otherwise(0)).as("unknownCount");
+//        // 灏嗗尮閰嶉樁娈靛拰鍒嗙粍闃舵缁勫悎璧锋潵
+//        Aggregation aggregation = Aggregation.newAggregation(match, group);
+//        // 鎵ц鑱氬悎鏌ヨ
+//        AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class); // 鏇挎崲涓轰綘鐨勯泦鍚堝悕绉�
+//        for (Map<String, Object> result : results.getMappedResults()) {
+//            offlineCount = (Integer) result.getOrDefault("offlineCount", 0L);
+//            unknownCount = (Integer) result.getOrDefault("unknownCount", 0L);
+//            onlineCount = (Integer) result.getOrDefault("onlineCount", 0L);
+//            totalCount = offlineCount + unknownCount + onlineCount;
+//        }
+//        BigDecimal onlineRate = BigDecimal.ZERO;
+//        if (totalCount!=0) {
+//            onlineRate = new BigDecimal(onlineCount).divide(new BigDecimal(totalCount), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
+//        }
+////        params.setDeptTag(1);
+////        params.setDeviceType(1);
+////        List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
+////                .select(CheckIndexVideo::getMinistrySiteOnline)
+////                .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
+////                .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
+////                .between(CheckIndexVideo::getCreateTime, params.getStartTime(), params.getEndTime())
+////                .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(totalCount + "", onlineCount + "", offlineCount + "", unknownCount + "", this.remove0(onlineRate)));
+//        map.put("list", resultList);
+//        return Result.ok().data(map).total(total);
+//    }
+
+//    @Override
+//    public Result videoImportantPointOnlineRate(DataCenterQuery params) {
+//        List<String> likeFileds = Arrays.asList("name", "no", "ip");
+//        //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
+//        Query query = null;
+//        SysDept sysDept = getSysDeptByLoginUser();
+//        AreaDeptEnum areaDeptEnum = null;
+//        if (sysDept !=null){
+//            areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
+//            if (areaDeptEnum != null){
+//                query = MongoUtil.getQueryDataCenter(areaDeptEnum.getCode(),params,TIME_FIELD,likeFileds,null,"no");
+//
+//            }else{
+//                query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+//            }
+//        }else {
+//            query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+//        }
+//        //鏌ヨ棰戣澶�
+//        query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+//        query.addCriteria(Criteria.where("importantTag").is(Boolean.TRUE));
+//        //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
+//        if (params.getOption() != null) {
+//            query.addCriteria(Criteria.where("online").is(params.getOption()));
+//        }
+//        // 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈�
+//        query.with(Sort.by(Sort.Order.asc("pingOnline")));
+//        //鍒嗛〉鏁伴噺
+//        long total = mongoTemplate.count(query, TMonitorResult.class);
+//        MongoUtil.setPage(query, params, TIME_FIELD);
+//        List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
+//        params.setDeptTag(3);
+//        params.setDeviceType(1);
+//        resultList.forEach(item -> {
+//            if (item.getPingOnline() == null) {
+//                item.setPingOnlineStr("鏈煡");
+//            } else if (item.getPingOnline()) {
+//                item.setPingOnlineStr("鍦ㄧ嚎");
+//            } else if (!item.getPingOnline()) {
+//                item.setPingOnlineStr("绂荤嚎");
+//            }
+//            if (1 == item.getOnline()) {
+//                item.setOnlineStr("鍦ㄧ嚎");
+//            } else if (-1 == item.getOnline()) {
+//                item.setOnlineStr("绂荤嚎");
+//            } else {
+//                item.setOnlineStr("鏈煡");
+//            }
+//        });
+//
+//        // 缁熻璁惧鏁伴噺
+//        //鍗＄墖缁熻
+//        int totalCount = 0;
+//        int onlineCount = 0;
+//        int offlineCount = 0;
+//        int unknownCount = 0;
+//        //鏋勫缓鏉′欢
+//        List<Criteria> criteriaList = new ArrayList<>();
+//        //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
+//        if (areaDeptEnum != null){
+//            criteriaList.add(Criteria.where("no").regex("^" +areaDeptEnum.getCode()));
+//        }
+//        // 娣诲姞鍥哄畾鏉′欢
+//        criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+//        criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
+//        criteriaList.add(Criteria.where("importantTag").is(Boolean.TRUE));
+//        // 鏍规嵁dataType鍔ㄦ�佹坊鍔犳潯浠�
+//        if (params.getDataType() == 1) {
+//            criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE));
+//        } else if (params.getDataType() == 2) {
+//            criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
+//        }
+//        // 鏋勫缓match鎿嶄綔
+//        MatchOperation match = Aggregation.match(
+//                new Criteria().andOperator(criteriaList.toArray(new Criteria[0]))
+//        );
+//        GroupOperation group = Aggregation.group()
+//                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Online)).then(1).otherwise(0)).as("onlineCount")
+//                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Offline)).then(1).otherwise(0)).as("offlineCount")
+//                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Unknown)).then(1).otherwise(0)).as("unknownCount");
+//        // 灏嗗尮閰嶉樁娈靛拰鍒嗙粍闃舵缁勫悎璧锋潵
+//        Aggregation aggregation = Aggregation.newAggregation(match, group);
+//        // 鎵ц鑱氬悎鏌ヨ
+//        AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class); // 鏇挎崲涓轰綘鐨勯泦鍚堝悕绉�
+//        for (Map<String, Object> result : results.getMappedResults()) {
+//            offlineCount = (Integer) result.getOrDefault("offlineCount", 0L);
+//            unknownCount = (Integer) result.getOrDefault("unknownCount", 0L);
+//            onlineCount = (Integer) result.getOrDefault("onlineCount", 0L);
+//            totalCount = offlineCount + unknownCount + onlineCount;
+//        }
+//        BigDecimal onlineRate = BigDecimal.ZERO;
+//        if (totalCount!=0) {
+//            onlineRate = new BigDecimal(onlineCount).divide(new BigDecimal(totalCount), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
+//        }
+//        HashMap<String, Object> map = new HashMap<>();
+//        map.put("count", Arrays.asList(totalCount + "", onlineCount + "", offlineCount + "", unknownCount + "", this.remove0(onlineRate)));
+//        map.put("list", resultList);
+//        return Result.ok().data(map).total(total);
+//    }
     /**
      * 瑙嗛锛氶噸鐐圭偣浣嶅湪绾跨巼
      *
@@ -950,12 +1413,12 @@
      * @return
      */
     @Override
-    public Result videoImportantPointOnlineRate(DataCenterQuery params) {
+    public Result videoImportantPointOnlineRate(DataCenterQuery params){
         List<String> likeFileds = Arrays.asList("name", "no", "ip");
         //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
-        Query query = null;
+        final Query query;
         SysDept sysDept = getSysDeptByLoginUser();
-        AreaDeptEnum areaDeptEnum = null;
+        final AreaDeptEnum areaDeptEnum;
         if (sysDept !=null){
             areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
             if (areaDeptEnum != null){
@@ -965,6 +1428,7 @@
                 query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
             }
         }else {
+            areaDeptEnum = null;
             query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
         }
         //鏌ヨ棰戣澶�
@@ -976,89 +1440,53 @@
         }
         // 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈�
         query.with(Sort.by(Sort.Order.asc("pingOnline")));
-        //鍒嗛〉鏁伴噺
         long total = mongoTemplate.count(query, TMonitorResult.class);
-        MongoUtil.setPage(query, params, TIME_FIELD);
-        List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
-        params.setDeptTag(3);
-        params.setDeviceType(1);
-        resultList.forEach(item -> {
-            if (item.getPingOnline() == null) {
-                item.setPingOnlineStr("鏈煡");
-            } else if (item.getPingOnline()) {
-                item.setPingOnlineStr("鍦ㄧ嚎");
-            } else if (!item.getPingOnline()) {
-                item.setPingOnlineStr("绂荤嚎");
-            }
-            if (1 == item.getOnline()) {
-                item.setOnlineStr("鍦ㄧ嚎");
-            } else if (-1 == item.getOnline()) {
-                item.setOnlineStr("绂荤嚎");
-            } else {
-                item.setOnlineStr("鏈煡");
-            }
-        });
 
-        // 缁熻璁惧鏁伴噺
-        //鍗＄墖缁熻
-        int totalCount = 0;
-        int onlineCount = 0;
-        int offlineCount = 0;
-        int unknownCount = 0;
-        //鏋勫缓鏉′欢
-        List<Criteria> criteriaList = new ArrayList<>();
-        //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
-        if (areaDeptEnum != null){
-            criteriaList.add(Criteria.where("no").regex("^" +areaDeptEnum.getCode()));
+        CompletableFuture<List<TMonitorResult>> listFuture = CompletableFuture.supplyAsync(()->{
+            try {
+                MongoUtil.setPage(query, params, TIME_FIELD);
+                List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
+                //鏋勫缓鍒楄〃鏁版嵁
+                formatResultList(resultList,DataCenterMethodNameEnum.VIDEO_IMPORTANT_POINT_ONLINE_RATE.name());
+
+                return resultList;
+            } catch (Exception e) {
+                throw new CompletionException("瑙嗛璁惧鍒楄〃鏌ヨ澶辫触锛�" + e.getMessage(), e);
+            }
+        },taskExecutor);
+
+        CompletableFuture<StatisticsResult> statsFuture = CompletableFuture.supplyAsync(()->{
+            try {
+                return calculateStatistics(params, areaDeptEnum, DataCenterMethodNameEnum.VIDEO_IMPORTANT_POINT_ONLINE_RATE.name());
+            }catch (Exception e){
+                throw new CompletionException("瑙嗛璁惧鐘舵�佺粺璁″け璐ワ細" + e.getMessage(), e);
+            }
+        },taskExecutor);
+        try {
+            CompletableFuture.allOf(listFuture, statsFuture).join();
+            List<TMonitorResult> resultList = listFuture.get();
+            StatisticsResult statsResult = statsFuture.get();
+
+            HashMap<String, Object> map = new HashMap<>();
+            map.put("count", Arrays.asList(
+                    String.valueOf(statsResult.totalCount),
+                    String.valueOf(statsResult.onlineCount),
+                    String.valueOf(statsResult.offlineCount),
+                    String.valueOf(statsResult.unknownCount),
+                    this.remove0(statsResult.onlineRate)
+            ));
+            map.put("list", resultList);
+
+            return Result.ok().data(map).total(total);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            return Result.error("鏌ヨ琚腑鏂紝璇风◢鍚庨噸璇�");
+        } catch (ExecutionException e) {
+            Throwable rootCause = e.getCause();
+            String errorMsg = rootCause != null ? rootCause.getMessage() : "瑙嗛璁惧鏁版嵁鏌ヨ澶辫触";
+            return Result.error(errorMsg);
         }
-        // 娣诲姞鍥哄畾鏉′欢
-        criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
-        criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
-        criteriaList.add(Criteria.where("importantTag").is(Boolean.TRUE));
-        // 鏍规嵁dataType鍔ㄦ�佹坊鍔犳潯浠�
-        if (params.getDataType() == 1) {
-            criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE));
-        } else if (params.getDataType() == 2) {
-            criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
-        }
-        // 鏋勫缓match鎿嶄綔
-        MatchOperation match = Aggregation.match(
-                new Criteria().andOperator(criteriaList.toArray(new Criteria[0]))
-        );
-        GroupOperation group = Aggregation.group()
-                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Online)).then(1).otherwise(0)).as("onlineCount")
-                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Offline)).then(1).otherwise(0)).as("offlineCount")
-                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Unknown)).then(1).otherwise(0)).as("unknownCount");
-        // 灏嗗尮閰嶉樁娈靛拰鍒嗙粍闃舵缁勫悎璧锋潵
-        Aggregation aggregation = Aggregation.newAggregation(match, group);
-        // 鎵ц鑱氬悎鏌ヨ
-        AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class); // 鏇挎崲涓轰綘鐨勯泦鍚堝悕绉�
-        for (Map<String, Object> result : results.getMappedResults()) {
-            offlineCount = (Integer) result.getOrDefault("offlineCount", 0L);
-            unknownCount = (Integer) result.getOrDefault("unknownCount", 0L);
-            onlineCount = (Integer) result.getOrDefault("onlineCount", 0L);
-            totalCount = offlineCount + unknownCount + onlineCount;
-        }
-        BigDecimal onlineRate = BigDecimal.ZERO;
-        if (totalCount!=0) {
-            onlineRate = new BigDecimal(onlineCount).divide(new BigDecimal(totalCount), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
-        }
-//        List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
-//                .select(CheckIndexVideo::getKeySiteOnline)
-//                .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
-//                .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
-//                .between(CheckIndexVideo::getCreateTime, params.getStartTime(), params.getEndTime())
-//                .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(totalCount + "", onlineCount + "", offlineCount + "", unknownCount + "", this.remove0(onlineRate)));
-        map.put("list", resultList);
-        return Result.ok().data(map).total(total);
+
     }
 
     /**
@@ -1439,18 +1867,6 @@
         if (!StringUtils.isEmpty(rList.get(0)) && !"0".equals(rList.get(0))) {
             onlineRate = new BigDecimal(rList.get(1)).divide(new BigDecimal(rList.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
         }
-//        List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
-//                .select(CheckIndexVideo::getMonitorQualification)
-//                .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
-//                .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
-//                .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
-//                .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);
@@ -1601,104 +2017,222 @@
 
             List<DynamicColumnVO> list = dynamicColumnMapper.getDynamicColumnByTable(TableNameConstants.COLUMN_NAME_VIDEO,item.getId());
             item.setDynamicColumnList(list);
-
         });
-        // 缁熻鏁伴噺
 
-        MongoDatabase database = mongoTemplate.getDb();
-        MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum");
-        List<Integer> status = Arrays.asList(1, 0, -1);
+//        // 缁熻鏁伴噺
+//        MongoDatabase database = mongoTemplate.getDb();
+//        MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum");
+//
+//        List<Integer> status = Arrays.asList(1, 0, -1);
+//        AreaDeptEnum finalAreaDeptEnum = areaDeptEnum;
+//        List<String> resultCount = status.stream().map(item -> {
+//            List<Document> dList = new ArrayList<>(2);
+//
+//            dList.add(new Document("recordStatus", new Document("$eq", item)));
+//            if(finalAreaDeptEnum != null){
+//                dList.add(new Document("$and", Arrays.asList(
+//                        new Document("no", new Document("$in", noString)),
+//                        new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
+//                )));
+//            }else {
+//                dList.add(new Document("no", new Document("$in", noString)));
+//            }
+//
+//            setTag(params, dList);
+//            Document filter = new Document("$and", dList);
+//            // 鏋勫缓鑱氬悎绠￠亾
+//            List<Document> pipeline = Arrays.asList(
+//                    new Document("$match", filter),
+//                    // $group 鍘婚噸
+//                    new Document("$group", new Document("_id", "$deviceId")),
+//                    new Document("$count", "uniqueDeviceIds")
+//            );
+//            // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+//            AggregateIterable<Document> result = collection.aggregate(pipeline);
+//            Integer uniqueDeviceIdCount = 0;
+//            for (Document doc : result) {
+//                uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
+//                break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
+//            }
+//            return uniqueDeviceIdCount + "";
+//        }).collect(Collectors.toList());
+//
+//        //璁＄畻褰曞儚鍙敤鐜�
+//        MongoDatabase databaes2 = mongoTemplate.getDb();
+//        MongoCollection<Document> collection2 = databaes2.getCollection("uy_record_meta_d_sum");
+//
+//        double finalRecordingMinTime = getSySMinTime();
+//
+//        List<Document> documentList = new ArrayList<>(2);
+//        if(finalAreaDeptEnum != null){
+//            documentList.add(new Document("$and", Arrays.asList(
+//                    new Document("no", new Document("$in", noString)),
+//                    new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
+//            )));
+//        }else {
+//            documentList.add(new Document("no", new Document("$in", noString)));
+//        }
+//        //        documentList.add(new Document("$and", Arrays.asList(
+//        //                new Document("no", new Document("$in", noString)),
+//        //                new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
+//        //        )));
+//        setTag(params, documentList);
+//        Document recording = new Document("missDuration",new Document("$lte", finalRecordingMinTime));
+//        documentList.add(recording);
+//
+//        Document filter = new Document("$and", documentList);
+//        // 鏋勫缓鑱氬悎绠￠亾
+//        List<Document> pipeline = Arrays.asList(
+//                new Document("$match", filter),
+//                // $group 鍘婚噸
+//                new Document("$group", new Document("_id", "$deviceId")),
+//                new Document("$count", "uniqueDeviceIds")
+//        );
+//        AggregateIterable<Document> result = collection2.aggregate(pipeline);
+//
+//
+//        Integer uniqueDeviceIdCount = 0;
+//        for (Document doc : result) {
+//            uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
+//            break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
+//        }
+//        log.error("褰曞儚鍙敤鐜囨墦鍗帮細{}",uniqueDeviceIdCount);
+//        int totalCount = 0;
+//        for (String s : resultCount) {
+//            totalCount += Integer.parseInt(s);
+//        }
+//        resultCount.add(0, totalCount + "");
+//
+//        BigDecimal onlineRate = BigDecimal.ZERO;
+//        //        1锛氬畬鏁� 0锛氶棿姝� -1锛氬紓甯� |
+//        if (!StringUtils.isEmpty(resultCount.get(0)) && !"0".equals(resultCount.get(0))) {
+//            //resultCount.get(0)鏄�绘暟 uniqueDeviceIdCount鏄牴鎹郴缁熷弬鏁版煡璇㈠埌mongodb涓ぇ浜庣瓑浜� recordDuration瀛楁鐨勬�绘暟
+//            onlineRate = new BigDecimal(uniqueDeviceIdCount).divide(new BigDecimal(resultCount.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
+//        }
+//        resultCount.add(this.remove0(onlineRate));
+
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("count", this.buildCount(areaDeptEnum,noString,params,DataCenterMethodNameEnum.VIDEO_AVAILABILITY_RATE.name()));
+        map.put("list", resultList);
+        return Result.ok().data(map).total(total);
+    }
+    public List<String> buildCount(AreaDeptEnum areaDeptEnum,List<String> noString,DataCenterQuery params,String tag){
+        MongoDatabase databaes= mongoTemplate.getDb();
+        MongoCollection<Document> collection = databaes.getCollection("uy_record_meta_d_sum");
         AreaDeptEnum finalAreaDeptEnum = areaDeptEnum;
-        List<String> resultCount = status.stream().map(item -> {
-            List<Document> dList = new ArrayList<>(2);
-
-            dList.add(new Document("recordStatus", new Document("$eq", item)));
-            if(finalAreaDeptEnum != null){
-                dList.add(new Document("$and", Arrays.asList(
-                        new Document("no", new Document("$in", noString)),
-                        new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
-                )));
-            }else {
-                dList.add(new Document("no", new Document("$in", noString)));
-            }
-
-            setTag(params, dList);
-            Document filter = new Document("$and", dList);
-            // 鏋勫缓鑱氬悎绠￠亾
-            List<Document> pipeline = Arrays.asList(
-                    new Document("$match", filter),
-                    // $group 鍘婚噸
-                    new Document("$group", new Document("_id", "$deviceId")),
-                    new Document("$count", "uniqueDeviceIds")
-            );
-            // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
-            AggregateIterable<Document> result = collection.aggregate(pipeline);
-            Integer uniqueDeviceIdCount = 0;
-            for (Document doc : result) {
-                uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
-                break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
-            }
-            return uniqueDeviceIdCount + "";
-        }).collect(Collectors.toList());
-
-        //璁＄畻褰曞儚鍙敤鐜�
-        MongoDatabase databaes2 = mongoTemplate.getDb();
-        MongoCollection<Document> collection2 = databaes2.getCollection("uy_record_meta_d_sum");
-
         double finalRecordingMinTime = getSySMinTime();
+        // 2. 鏋勫缓鑱氬悎绠￠亾锛堟牳蹇冿細涓�娆＄閬撶粺璁℃墍鏈夋寚鏍囷級
+        List<Document> pipeline = new ArrayList<>();
 
-        List<Document> documentList = new ArrayList<>(2);
-        if(finalAreaDeptEnum != null){
-            documentList.add(new Document("$and", Arrays.asList(
+        // 闃舵1锛�$match - 鍩虹杩囨护锛堝鐢ㄤ袱娆℃煡璇㈢殑鍏卞悓鏉′欢锛�
+        List<Document> baseFilterList = new ArrayList<>();
+        if (DataCenterMethodNameEnum.DEPT_VIDEO_POINT_ONLINE_RATE.name().equals(tag)){
+            baseFilterList.add(new Document("deptTag", new Document("$eq", Boolean.TRUE)));
+        }
+        if (DataCenterMethodNameEnum.VIDEO_IMPORTANT_POINT_AVAILABILITY_RATE.name().equals(tag)){
+            baseFilterList.add(new Document("importantTag", new Document("$eq", Boolean.TRUE)));
+        }
+
+        // 鏉′欢1锛歯o鐨勮繃婊わ紙in + 鍙�夊墠缂�鍖归厤锛屽拰浣犲師浠ｇ爜閫昏緫涓�鑷达級
+        if (finalAreaDeptEnum != null) {
+            baseFilterList.add(new Document("$and", Arrays.asList(
                     new Document("no", new Document("$in", noString)),
                     new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
             )));
-        }else {
-            documentList.add(new Document("no", new Document("$in", noString)));
+        } else {
+            baseFilterList.add(new Document("no", new Document("$in", noString)));
         }
-//        documentList.add(new Document("$and", Arrays.asList(
-//                new Document("no", new Document("$in", noString)),
-//                new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
-//        )));
-        setTag(params, documentList);
-        Document recording = new Document("missDuration",new Document("$lte", finalRecordingMinTime));
-        documentList.add(recording);
-
-        Document filter = new Document("$and", documentList);
-        // 鏋勫缓鑱氬悎绠￠亾
-        List<Document> pipeline = Arrays.asList(
-                new Document("$match", filter),
-                // $group 鍘婚噸
-                new Document("$group", new Document("_id", "$deviceId")),
-                new Document("$count", "uniqueDeviceIds")
+        setTag(params, baseFilterList);
+        Document matchStage = new Document("$match", new Document("$and", baseFilterList));
+        pipeline.add(matchStage);
+        // 闃舵2锛�$group - 鎸塪eviceId鍘婚噸锛屾爣璁板悇鏉′欢鏄惁婊¤冻
+        // --------------------------
+        // 閫昏緫锛氭瘡涓澶囧彧缁熻涓�娆★紝鐢�$cond鏍囪鈥滄槸鍚︾鍚堟煇鏉′欢鈥濓紙绗﹀悎=1锛屼笉绗﹀悎=0锛�
+        Document groupByDeviceStage = new Document("$group",
+                new Document("_id", "$deviceId") // 鎸夎澶嘔D鍒嗙粍锛堝幓閲嶆牳蹇冿級
+                        // 鏍囪锛氳璁惧鏄惁婊¤冻 recordStatus=1
+                        .append("status1Flag", new Document("$sum",
+                                new Document("$cond", Arrays.asList(
+                                        new Document("$eq", Arrays.asList("$recordStatus", 1)), // 鍒ゆ柇鏉′欢
+                                        1, // 绗﹀悎锛氳1
+                                        0  // 涓嶇鍚堬細璁�0
+                                ))
+                        ))
+                        // 鏍囪锛氳璁惧鏄惁婊¤冻 recordStatus=0
+                        .append("status0Flag", new Document("$sum",
+                                new Document("$cond", Arrays.asList(
+                                        new Document("$eq", Arrays.asList("$recordStatus", 0)),
+                                        1,
+                                        0
+                                ))
+                        ))
+                        // 鏍囪锛氳璁惧鏄惁婊¤冻 recordStatus=-1
+                        .append("statusMinus1Flag", new Document("$sum",
+                                new Document("$cond", Arrays.asList(
+                                        new Document("$eq", Arrays.asList("$recordStatus", -1)),
+                                        1,
+                                        0
+                                ))
+                        ))
+                        // 鏍囪锛氳璁惧鏄惁婊¤冻 missDuration 鈮� finalRecordingMinTime锛堝師绗簩娈垫煡璇㈡潯浠讹級
+                        .append("missOkFlag", new Document("$sum",
+                                new Document("$cond", Arrays.asList(
+                                        new Document("$lte", Arrays.asList("$missDuration", finalRecordingMinTime)),
+                                        1,
+                                        0
+                                ))
+                        ))
         );
-        AggregateIterable<Document> result = collection2.aggregate(pipeline);
+        pipeline.add(groupByDeviceStage);
+        // --------------------------
+        // 闃舵3锛�$group - 鍏ㄥ眬缁熻锛堢疮鍔犳墍鏈夎澶囩殑鏍囪锛屽緱鍒版渶缁堟暟閲忥級
+        // --------------------------
+        // 閫昏緫锛氭棤鍒嗙粍閿紙_id: null锛夛紝灏嗘墍鏈夎澶囩殑鏍囪绱姞锛屽緱鍒版�昏鏁�
+        Document groupGlobalStage = new Document("$group",
+                new Document("_id", null) // 鍏ㄥ眬鍒嗙粍锛堢粺璁℃墍鏈夎澶囷級
+                        // 鍘熺涓�娈垫煡璇㈢粨鏋�1锛歴tatus=1鐨勮澶囨暟
+                        .append("status1Count", new Document("$sum", "$status1Flag"))
+                        // 鍘熺涓�娈垫煡璇㈢粨鏋�2锛歴tatus=0鐨勮澶囨暟
+                        .append("status0Count", new Document("$sum", "$status0Flag"))
+                        // 鍘熺涓�娈垫煡璇㈢粨鏋�3锛歴tatus=-1鐨勮澶囨暟
+                        .append("statusMinus1Count", new Document("$sum", "$statusMinus1Flag"))
+                        // 鍘熺浜屾鏌ヨ缁撴灉锛歮issDuration绗﹀悎鏉′欢鐨勮澶囨暟
+                        .append("missOkCount", new Document("$sum", "$missOkFlag"))
+        );
+        pipeline.add(groupGlobalStage);
 
-
-        Integer uniqueDeviceIdCount = 0;
-        for (Document doc : result) {
-            uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
-            break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
+        // --------------------------
+        // 鎵ц鑱氬悎鏌ヨ锛屾彁鍙栨墍鏈夌粺璁＄粨鏋�
+        // --------------------------
+        AggregateIterable<Document> aggregateResult = collection.aggregate(pipeline);
+        Document statDoc = null;
+        for (Document doc : aggregateResult) { // 鍏ㄥ眬鍒嗙粍鍙細杩斿洖1鏉＄粨鏋�
+            statDoc = doc;
+            break;
         }
-        log.error("褰曞儚鍙敤鐜囨墦鍗帮細{}",uniqueDeviceIdCount);
-        int totalCount = 0;
-        for (String s : resultCount) {
-            totalCount += Integer.parseInt(s);
-        }
-        resultCount.add(0, totalCount + "");
 
+        // 鍒濆鍖栭粯璁ゅ�硷紙閬垮厤绌烘寚閽堬級
+        int status1Count = 0, status0Count = 0, statusMinus1Count = 0, missOkCount = 0;
+        if (statDoc != null) {
+            status1Count = statDoc.getInteger("status1Count", 0);
+            status0Count = statDoc.getInteger("status0Count", 0);
+            statusMinus1Count = statDoc.getInteger("statusMinus1Count", 0);
+            missOkCount = statDoc.getInteger("missOkCount", 0);
+        }
+        int total = status1Count + status0Count + statusMinus1Count;
         BigDecimal onlineRate = BigDecimal.ZERO;
-//        1锛氬畬鏁� 0锛氶棿姝� -1锛氬紓甯� |
-        if (!StringUtils.isEmpty(resultCount.get(0)) && !"0".equals(resultCount.get(0))) {
-            //resultCount.get(0)鏄�绘暟 uniqueDeviceIdCount鏄洿鍏风郴缁熷弬鏁版煡璇㈠埌mongodb涓ぇ浜庣瓑浜� recordDuration瀛楁鐨勬�绘暟
-            onlineRate = new BigDecimal(uniqueDeviceIdCount).divide(new BigDecimal(resultCount.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
+        if (total != 0) { // 鍙湁褰搕otal涓嶄负0鏃讹紝鎵嶈绠楁瘮鐜�
+            onlineRate = new BigDecimal(missOkCount)
+                    .divide(new BigDecimal(total), 3, RoundingMode.DOWN)
+                    .multiply(new BigDecimal("100"));
         }
-        resultCount.add(this.remove0(onlineRate));
-
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("count", resultCount);
-        map.put("list", resultList);
-        return Result.ok().data(map).total(total);
+        List<String> list = new ArrayList<>();
+        list.add(total +"");
+        list.add(status1Count +"");
+        list.add(status0Count +"");
+        list.add(statusMinus1Count +"");
+        list.add(this.remove0(onlineRate));
+        return list;
     }
 
     /**
@@ -1709,6 +2243,7 @@
      */
     @Override
     public Result deptVideoAvailabilityRate(DataCenterQuery params) {
+        List<String> noString = tMonitorMapper.getIdListVideo();
         List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
         SysDept sysDept = getSysDeptByLoginUser();
         AreaDeptEnum areaDeptEnum = null;
@@ -1723,10 +2258,15 @@
         }else {
             query = MongoUtil.getQuery(params, "createTime", likeFileds, null);
         }
+        if (CollectionUtils.isNotEmpty(noString)) { // 闃叉绌洪泦鍚堝紓甯�
+            query.addCriteria(Criteria.where("no").in(noString));
+        }
         //涓嬫媺妗嗗綍鍍忔儏鍐垫煡璇㈡潯浠�
         if (params.getOption() != null) {
             query.addCriteria(Criteria.where("recordStatus").is(params.getOption()));
         }
+        //鏂板閮ㄧ骇鍒ゆ柇
+        query.addCriteria(Criteria.where("deptTag").is(Boolean.TRUE));
         long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
         MongoUtil.setPage(query, params, "createTime");
         List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
@@ -1736,104 +2276,12 @@
             AreaDeptEnum areaDeptEnumInfo = AreaDeptEnum.fromCode(areaCode);
             if (areaDeptEnumInfo != null) item.setArealayername(areaDeptEnumInfo.getName());
         });
-        // 缁熻鏁伴噺
-        MongoDatabase database = mongoTemplate.getDb();
-        MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum");
-        List<Integer> status = Arrays.asList(1, 0, -1);
-        AreaDeptEnum finalAreaDeptEnum = areaDeptEnum;
-        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)));
-            setTag(params, dList);
-            if (finalAreaDeptEnum != null){
-                dList.add(new Document("$and", Arrays.asList(
-//                    new Document("no", new Document("$in", noString)),
-                        new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
-                )));
-            }
-            Document filter = new Document("$and", dList);
-            // 鏋勫缓鑱氬悎绠￠亾
-            List<Document> pipeline = Arrays.asList(
-                    new Document("$match", filter),
-                    // $group 鍘婚噸
-                    new Document("$group", new Document("_id", "$deviceId")),
-                    new Document("$count", "uniqueDeviceIds")
-            );
-            // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
-            AggregateIterable<Document> result = collection.aggregate(pipeline);
-            Integer uniqueDeviceIdCount = 0;
-            for (Document doc : result) {
-                uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
-                break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
-            }
-            return uniqueDeviceIdCount + "";
-        }).collect(Collectors.toList());
 
-
-        //璁＄畻閮ㄧ骇褰曞儚鍙敤鐜�
-        MongoDatabase database2 = mongoTemplate.getDb();
-        MongoCollection<Document> collection2 = database2.getCollection("uy_record_meta_d_sum");
-        double finalRecordingMinTime = getSySMinTime();
-
-        List<Document> documentList = new ArrayList<>(4);
-        documentList.add(new Document("deptTag", new Document("$eq", Boolean.TRUE)));
-        setTag(params, documentList);
-        Document recording = new Document("missDuration",new Document("$lte", finalRecordingMinTime));
-        documentList.add(recording);
-        if (finalAreaDeptEnum != null){
-            documentList.add(new Document("$and", Arrays.asList(
-//                    new Document("no", new Document("$in", noString)),
-                    new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
-            )));
-        }
-        Document filter = new Document("$and", documentList);
-        // 鏋勫缓鑱氬悎绠￠亾
-        List<Document> pipeline = Arrays.asList(
-                new Document("$match", filter),
-                // $group 鍘婚噸
-                new Document("$group", new Document("_id", "$deviceId")),
-                new Document("$count", "uniqueDeviceIds")
-        );
-        AggregateIterable<Document> result = collection2.aggregate(pipeline);
-        Integer uniqueDeviceIdCount = 0;
-        for (Document doc : result) {
-            uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
-            break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
-        }
-        log.error("閮ㄧ骇褰曞儚鍙敤鐜噞}:",uniqueDeviceIdCount);
-
-
-
-//        List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
-//                .select(CheckIndexVideo::getMinistryVideoAvailable)
-//                .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
-//                .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
-//                .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
-//                .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));
-//        }
-        //鍔犱竴涓�绘暟
-        int totalCount = 0;
-        for (String s : resultCount) {
-            totalCount += Integer.parseInt(s);
-        }
-        resultCount.add(0, totalCount + "");
-        BigDecimal onlineRate = BigDecimal.ZERO;
-        if (!StringUtils.isEmpty(resultCount.get(0)) && !"0".equals(resultCount.get(0))) {
-            onlineRate = new BigDecimal(uniqueDeviceIdCount).divide(new BigDecimal(resultCount.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
-        }
-        resultCount.add(this.remove0(onlineRate));
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", resultCount);
+        map.put("count", this.buildCount(areaDeptEnum,noString,params,DataCenterMethodNameEnum.DEPT_VIDEO_POINT_ONLINE_RATE.name()));
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
-
     /**
      * 瑙嗛锛氶噸鐐圭偣浣嶅綍鍍忓彲鐢ㄧ巼
      *
@@ -1842,6 +2290,7 @@
      */
     @Override
     public Result videoImportantPointAvailabilityRate(DataCenterQuery params) {
+        List<String> noString = tMonitorMapper.getIdListVideo();
         List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
         SysDept sysDept = getSysDeptByLoginUser();
         AreaDeptEnum areaDeptEnum = null;
@@ -1857,10 +2306,14 @@
             query = MongoUtil.getQuery(params, "createTime", likeFileds, null);
         }
         query.addCriteria(Criteria.where("importantTag").is(Boolean.TRUE));
+        if (CollectionUtils.isNotEmpty(noString)) { // 闃叉绌洪泦鍚堝紓甯�
+            query.addCriteria(Criteria.where("no").in(noString));
+        }
         //涓嬫媺妗嗗綍鍍忔儏鍐垫煡璇㈡潯浠�
         if (params.getOption() != null) {
             query.addCriteria(Criteria.where("recordStatus").is(params.getOption()));
         }
+
         long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
         MongoUtil.setPage(query, params, "createTime");
         List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
@@ -1871,96 +2324,84 @@
             if (areaDeptEnumInfo != null) item.setArealayername(areaDeptEnumInfo.getName());
         });
         // 缁熻鏁伴噺
-        MongoDatabase database = mongoTemplate.getDb();
-        MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum");
-        List<Integer> status = Arrays.asList(1, 0, -1);
-        AreaDeptEnum finalAreaDeptEnum = areaDeptEnum;
-        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)));
-            setTag(params, dList);
-            if (finalAreaDeptEnum != null){
-                dList.add(new Document("$and", Arrays.asList(
-//                    new Document("no", new Document("$in", noString)),
-                        new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
-                )));
-            }
-            Document filter = new Document("$and", dList);
-            // 鏋勫缓鑱氬悎绠￠亾
-            List<Document> pipeline = Arrays.asList(
-                    new Document("$match", filter),
-                    // $group 鍘婚噸
-                    new Document("$group", new Document("_id", "$deviceId")),
-                    new Document("$count", "uniqueDeviceIds")
-            );
-            // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
-            AggregateIterable<Document> result = collection.aggregate(pipeline);
-            Integer uniqueDeviceIdCount = 0;
-            for (Document doc : result) {
-                uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
-                break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
-            }
-            return uniqueDeviceIdCount + "";
-        }).collect(Collectors.toList());
-
-        //璁＄畻閲嶇偣鐐逛綅褰曞儚鍙敤鐜�
-        MongoDatabase database2 = mongoTemplate.getDb();
-        MongoCollection<Document> collection2 = database2.getCollection("uy_record_meta_d_sum");
-        double finalRecordingMinTime = getSySMinTime();
-
-        List<Document> documentList = new ArrayList<>(4);
-        documentList.add(new Document("importantTag", new Document("$eq", Boolean.TRUE)));
-        setTag(params, documentList);
-        Document recording = new Document("missDuration",new Document("$lte", finalRecordingMinTime));
-        documentList.add(recording);
-        if (finalAreaDeptEnum != null){
-            documentList.add(new Document("$and", Arrays.asList(
-//                    new Document("no", new Document("$in", noString)),
-                    new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
-            )));
-        }
-        Document filter = new Document("$and", documentList);
-        // 鏋勫缓鑱氬悎绠￠亾
-        List<Document> pipeline = Arrays.asList(
-                new Document("$match", filter),
-                // $group 鍘婚噸
-                new Document("$group", new Document("_id", "$deviceId")),
-                new Document("$count", "uniqueDeviceIds")
-        );
-        AggregateIterable<Document> result = collection2.aggregate(pipeline);
-        Integer uniqueDeviceIdCount = 0;
-        for (Document doc : result) {
-            uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
-            break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
-        }
-        log.error("閲嶇偣鐐逛綅褰曞儚鍙敤鐜噞}:",uniqueDeviceIdCount);
-
-//        List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
-//                .select(CheckIndexVideo::getKeyVideoAvailable)
-//                .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
-//                .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
-//                .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
-//                .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));
+//        MongoDatabase database = mongoTemplate.getDb();
+//        MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum");
+//        List<Integer> status = Arrays.asList(1, 0, -1);
+//        AreaDeptEnum finalAreaDeptEnum = areaDeptEnum;
+//        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)));
+//            setTag(params, dList);
+//            if (finalAreaDeptEnum != null){
+//                dList.add(new Document("$and", Arrays.asList(
+////                    new Document("no", new Document("$in", noString)),
+//                        new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
+//                )));
+//            }
+//            Document filter = new Document("$and", dList);
+//            // 鏋勫缓鑱氬悎绠￠亾
+//            List<Document> pipeline = Arrays.asList(
+//                    new Document("$match", filter),
+//                    // $group 鍘婚噸
+//                    new Document("$group", new Document("_id", "$deviceId")),
+//                    new Document("$count", "uniqueDeviceIds")
+//            );
+//            // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+//            AggregateIterable<Document> result = collection.aggregate(pipeline);
+//            Integer uniqueDeviceIdCount = 0;
+//            for (Document doc : result) {
+//                uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
+//                break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
+//            }
+//            return uniqueDeviceIdCount + "";
+//        }).collect(Collectors.toList());
+//
+//        //璁＄畻閲嶇偣鐐逛綅褰曞儚鍙敤鐜�
+//        MongoDatabase database2 = mongoTemplate.getDb();
+//        MongoCollection<Document> collection2 = database2.getCollection("uy_record_meta_d_sum");
+//        double finalRecordingMinTime = getSySMinTime();
+//
+//        List<Document> documentList = new ArrayList<>(4);
+//        documentList.add(new Document("importantTag", new Document("$eq", Boolean.TRUE)));
+//        setTag(params, documentList);
+//        Document recording = new Document("missDuration",new Document("$lte", finalRecordingMinTime));
+//        documentList.add(recording);
+//        if (finalAreaDeptEnum != null){
+//            documentList.add(new Document("$and", Arrays.asList(
+////                    new Document("no", new Document("$in", noString)),
+//                    new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
+//            )));
 //        }
-        //鍔犱竴涓�绘暟
-        int totalCount = 0;
-        for (String s : resultCount) {
-            totalCount += Integer.parseInt(s);
-        }
-        resultCount.add(0, totalCount + "");
-        BigDecimal onlineRate = BigDecimal.ZERO;
-        if (!StringUtils.isEmpty(resultCount.get(0)) && !"0".equals(resultCount.get(0))) {
-            onlineRate = new BigDecimal(uniqueDeviceIdCount).divide(new BigDecimal(resultCount.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
-        }
-        resultCount.add(this.remove0(onlineRate));
+//        Document filter = new Document("$and", documentList);
+//        // 鏋勫缓鑱氬悎绠￠亾
+//        List<Document> pipeline = Arrays.asList(
+//                new Document("$match", filter),
+//                // $group 鍘婚噸
+//                new Document("$group", new Document("_id", "$deviceId")),
+//                new Document("$count", "uniqueDeviceIds")
+//        );
+//        AggregateIterable<Document> result = collection2.aggregate(pipeline);
+//        Integer uniqueDeviceIdCount = 0;
+//        for (Document doc : result) {
+//            uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
+//            break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
+//        }
+//        log.error("閲嶇偣鐐逛綅褰曞儚鍙敤鐜噞}:",uniqueDeviceIdCount);
+//
+//        //鍔犱竴涓�绘暟
+//        int totalCount = 0;
+//        for (String s : resultCount) {
+//            totalCount += Integer.parseInt(s);
+//        }
+//        resultCount.add(0, totalCount + "");
+//        BigDecimal onlineRate = BigDecimal.ZERO;
+//        if (!StringUtils.isEmpty(resultCount.get(0)) && !"0".equals(resultCount.get(0))) {
+//            onlineRate = new BigDecimal(uniqueDeviceIdCount).divide(new BigDecimal(resultCount.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
+//        }
+//        resultCount.add(this.remove0(onlineRate));
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", resultCount);
+        map.put("count", this.buildCount(areaDeptEnum,noString,params,DataCenterMethodNameEnum.VIDEO_IMPORTANT_POINT_AVAILABILITY_RATE.name()));
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }

--
Gitblit v1.8.0