From da426ecaf4fd047c6cb43cd9a0c1288e39c4e91d Mon Sep 17 00:00:00 2001
From: lohir <3399054449@qq.com>
Date: 星期三, 23 十月 2024 11:24:57 +0800
Subject: [PATCH] 完成运维考核-工单白名单-新增、删除

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java |  761 +++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 518 insertions(+), 243 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 7d463d4..f0c00c6 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
@@ -1,5 +1,6 @@
 package com.ycl.platform.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.github.pagehelper.Page;
@@ -10,6 +11,7 @@
 import com.ycl.platform.domain.entity.*;
 import com.ycl.platform.domain.query.DataCenterQuery;
 import com.ycl.platform.domain.result.HK.*;
+import com.ycl.platform.domain.result.SYS.TMonitorResult;
 import com.ycl.platform.domain.result.UY.*;
 import com.ycl.platform.domain.vo.PointDetailVO;
 import com.ycl.platform.mapper.ImageResourceSecurityDetailMapper;
@@ -19,12 +21,14 @@
 import com.ycl.system.page.PageUtil;
 import com.ycl.utils.DateUtils;
 import com.ycl.utils.MongoUtil;
+import constant.ApiConstants;
 import constant.CheckConstants;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.collections.CollectionUtils;
 import org.bson.Document;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.aggregation.*;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.TextCriteria;
@@ -66,19 +70,91 @@
      */
     @Override
     public Result videoPointOnlineRate(DataCenterQuery params) {
+        List<String> likeFileds = Arrays.asList("name", "no", "ip");
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+        //鏌ヨ棰戣澶�
+        query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+        //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
+        if(params.getOption()!=null) {
+            query.addCriteria(Criteria.where("online").is(params.getOption()));
+        }
+        // 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈�
+        query.with(Sort.by(Sort.Order.asc("pingOnline")));
+        //鍒嗛〉鏁伴噺
+        long total = mongoTemplate.count(query, TMonitorResult.class);
+        MongoUtil.setPage(query, params, TIME_FIELD);
+        List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
+        resultList.forEach(item -> {
+            if(item.getPingOnline() ==null){
+                item.setPingOnlineStr("鏈煡");
+            } else if (item.getPingOnline()) {
+                item.setPingOnlineStr("鍦ㄧ嚎");
+            } else if(!item.getPingOnline()){
+                item.setPingOnlineStr("绂荤嚎");
+            }
+            if(1== item.getOnline() ){
+                item.setOnlineStr("鍦ㄧ嚎");
+            }else if(-1==item.getOnline()){
+                item.setOnlineStr("绂荤嚎");
+            }else {
+                item.setOnlineStr("鏈煡");
+            }
+        });
         params.setDeptTag(-1);
         params.setDeviceType(1);
-        IPage<PointDetailVO> page = PageUtil.getPage(params, PointDetailVO.class);
-        pointMapper.dataCenterPage(page, params);
 
-        // 缁熻璁惧鏁伴噺
-        Integer distinctCount = pointMapper.distinctCount(params);
+        //鍗$墖缁熻
+        int totalCount =0;
+        int onlineCount =0;
+        int offlineCount =0;
+        int unknownCount =0;
+        //鏋勫缓鏉′欢
+        List<Criteria> criteriaList = new ArrayList<>();
+        // 娣诲姞鍥哄畾鏉′欢
+        criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+        criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
+        // 鏍规嵁dataType鍔ㄦ�佹坊鍔犳潯浠�
+        if (params.getDataType() == 1) {
+            criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE));
+        } else if (params.getDataType() == 2) {
+            criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
+        }
+        // 鏋勫缓match鎿嶄綔
+        MatchOperation match = Aggregation.match(
+                new Criteria().andOperator(criteriaList.toArray(new Criteria[0]))
+        );
+        GroupOperation group = Aggregation.group()
+                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Online)).then(1).otherwise(0)).as("onlineCount")
+                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Offline)).then(1).otherwise(0)).as("offlineCount")
+                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Unknown)).then(1).otherwise(0)).as("unknownCount");
+        // 灏嗗尮閰嶉樁娈靛拰鍒嗙粍闃舵缁勫悎璧锋潵
+        Aggregation aggregation = Aggregation.newAggregation(match, group);
+        // 鎵ц鑱氬悎鏌ヨ
+        AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class); // 鏇挎崲涓轰綘鐨勯泦鍚堝悕绉�
+        for (Map<String, Object> result : results.getMappedResults()) {
+            offlineCount =(Integer) result.getOrDefault("offlineCount",0L);
+            unknownCount =(Integer) result.getOrDefault("unknownCount",0L);
+            onlineCount = (Integer) result.getOrDefault("onlineCount",0L);
+            totalCount = offlineCount + unknownCount + onlineCount;
+        }
+        /** 鏌ヨ褰撳ぉ鍦ㄧ嚎鐜� */
+        // 鍒涘缓涓�涓猀ueryWrapper瀹炰緥
+        QueryWrapper<CheckIndexVideo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().select(CheckIndexVideo::getSiteOnline) // 閫夋嫨瑕佹煡璇㈢殑瀛楁
+                .between(CheckIndexVideo::getCreateTime, params.getStartTime(), params.getEndTime()); // 璁剧疆鏃堕棿鑼冨洿鏉′欢
+        if (params.getDataType() == 0) {
+            //鍖哄幙
+            queryWrapper.lambda().eq(CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_County);
+        }else if(params.getDataType() == 1){
+            //鐪佸巺
+            queryWrapper.lambda().eq(CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province);
+        }else if(params.getDataType() == 2){
+            //鍏畨閮�
+            queryWrapper.lambda().eq(CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept);
+        }
+        // 浣跨敤QueryWrapper鎵ц鏌ヨ
+        List<CheckIndexVideo> videoList = checkIndexVideoService.getBaseMapper().selectList(queryWrapper);
 
-        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);
@@ -86,9 +162,9 @@
             onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
         }
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", Arrays.asList(distinctCount + "",this.remove0(onlineRate)));
-        map.put("list", page.getRecords());
-        return Result.ok().data(map).total(page.getTotal());
+        map.put("count", Arrays.asList(totalCount + "",onlineCount +"",offlineCount+"" ,unknownCount+"", this.remove0(onlineRate)));
+        map.put("list", resultList);
+        return Result.ok().data(map).total(total);
     }
 
     /**
@@ -99,19 +175,79 @@
      */
     @Override
     public Result deptVideoPointOnlineRate(DataCenterQuery params) {
+        List<String> likeFileds = Arrays.asList("name", "no", "ip");
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+        //鏌ヨ棰戣澶�
+        query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+        query.addCriteria(Criteria.where("deptTag").is(Boolean.TRUE));
+        //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
+        if(params.getOption()!=null) {
+            query.addCriteria(Criteria.where("online").is(params.getOption()));
+        }
+        // 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈�
+        query.with(Sort.by(Sort.Order.asc("pingOnline")));
+        //鍒嗛〉鏁伴噺
+        long total = mongoTemplate.count(query, TMonitorResult.class);
+        MongoUtil.setPage(query, params, TIME_FIELD);
+        List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
+        resultList.forEach(item -> {
+            if(item.getPingOnline() ==null){
+                item.setPingOnlineStr("鏈煡");
+            } else if (item.getPingOnline()) {
+                item.setPingOnlineStr("鍦ㄧ嚎");
+            } else if(!item.getPingOnline()){
+                item.setPingOnlineStr("绂荤嚎");
+            }
+            if (1 == item.getOnline()) {
+                item.setOnlineStr("鍦ㄧ嚎");
+            } else if (-1 == item.getOnline()) {
+                item.setOnlineStr("绂荤嚎");
+            } else {
+                item.setOnlineStr("鏈煡");
+            }
+        });
+        // 缁熻璁惧鏁伴噺
+        //鍗$墖缁熻
+        int totalCount =0;
+        int onlineCount =0;
+        int offlineCount =0;
+        int unknownCount =0;
+        //鏋勫缓鏉′欢
+        List<Criteria> criteriaList = new ArrayList<>();
+        // 娣诲姞鍥哄畾鏉′欢
+        criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+        criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
+        // 鏍规嵁dataType鍔ㄦ�佹坊鍔犳潯浠�
+        if (params.getDataType() == 1) {
+            criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE));
+        } else if (params.getDataType() == 2) {
+            criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
+        }
+        // 鏋勫缓match鎿嶄綔
+        MatchOperation match = Aggregation.match(
+                new Criteria().andOperator(criteriaList.toArray(new Criteria[0]))
+        );
+        GroupOperation group = Aggregation.group()
+                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Online)).then(1).otherwise(0)).as("onlineCount")
+                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Offline)).then(1).otherwise(0)).as("offlineCount")
+                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Unknown)).then(1).otherwise(0)).as("unknownCount");
+        // 灏嗗尮閰嶉樁娈靛拰鍒嗙粍闃舵缁勫悎璧锋潵
+        Aggregation aggregation = Aggregation.newAggregation(match, group);
+        // 鎵ц鑱氬悎鏌ヨ
+        AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class); // 鏇挎崲涓轰綘鐨勯泦鍚堝悕绉�
+        for (Map<String, Object> result : results.getMappedResults()) {
+            offlineCount =(Integer) result.getOrDefault("offlineCount",0L);
+            unknownCount =(Integer) result.getOrDefault("unknownCount",0L);
+            onlineCount = (Integer) result.getOrDefault("onlineCount",0L);
+            totalCount = offlineCount + unknownCount + onlineCount;
+        }
+
         params.setDeptTag(1);
         params.setDeviceType(1);
-        IPage<PointDetailVO> page = PageUtil.getPage(params, PointDetailVO.class);
-        pointMapper.dataCenterPage(page, params);
-
-        // 缁熻璁惧鏁伴噺
-        Integer distinctCount = pointMapper.distinctCount(params);
-
-        Date now = new Date();
         List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
                 .select(CheckIndexVideo::getMinistrySiteOnline)
                 .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
-                .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+                .between(CheckIndexVideo::getCreateTime, params.getStartTime(),  params.getEndTime())
                 .list();
         BigDecimal onlineRate = BigDecimal.ZERO;
         if (CollectionUtils.isNotEmpty(videoList)) {
@@ -120,9 +256,9 @@
             onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
         }
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", Arrays.asList(distinctCount + "", this.remove0(onlineRate)));
-        map.put("list", page.getRecords());
-        return Result.ok().data(map).total(page.getTotal());
+        map.put("count", Arrays.asList(totalCount + "",onlineCount +"",offlineCount+"" ,unknownCount+"", this.remove0(onlineRate)));
+        map.put("list", resultList);
+        return Result.ok().data(map).total(total);
     }
 
     /**
@@ -133,19 +269,79 @@
      */
     @Override
     public Result videoImportantPointOnlineRate(DataCenterQuery params) {
+        List<String> likeFileds = Arrays.asList("name", "no", "ip");
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+        //鏌ヨ棰戣澶�
+        query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+        query.addCriteria(Criteria.where("importantTag").is(Boolean.TRUE));
+        //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
+        if(params.getOption()!=null) {
+            query.addCriteria(Criteria.where("online").is(params.getOption()));
+        }
+        // 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈�
+        query.with(Sort.by(Sort.Order.asc("pingOnline")));
+        //鍒嗛〉鏁伴噺
+        long total = mongoTemplate.count(query, TMonitorResult.class);
+        MongoUtil.setPage(query, params, TIME_FIELD);
+        List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
         params.setDeptTag(3);
         params.setDeviceType(1);
-        IPage<PointDetailVO> page = PageUtil.getPage(params, PointDetailVO.class);
-        pointMapper.dataCenterPage(page, params);
+        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("鏈煡");
+            }
+        });
 
         // 缁熻璁惧鏁伴噺
-        Integer distinctCount = pointMapper.distinctCount(params);
-
-        Date now = new Date();
+        //鍗$墖缁熻
+        int totalCount =0;
+        int onlineCount =0;
+        int offlineCount =0;
+        int unknownCount =0;
+        //鏋勫缓鏉′欢
+        List<Criteria> criteriaList = new ArrayList<>();
+        // 娣诲姞鍥哄畾鏉′欢
+        criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+        criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
+        // 鏍规嵁dataType鍔ㄦ�佹坊鍔犳潯浠�
+        if (params.getDataType() == 1) {
+            criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE));
+        } else if (params.getDataType() == 2) {
+            criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
+        }
+        // 鏋勫缓match鎿嶄綔
+        MatchOperation match = Aggregation.match(
+                new Criteria().andOperator(criteriaList.toArray(new Criteria[0]))
+        );
+        GroupOperation group = Aggregation.group()
+                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Online)).then(1).otherwise(0)).as("onlineCount")
+                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Offline)).then(1).otherwise(0)).as("offlineCount")
+                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Unknown)).then(1).otherwise(0)).as("unknownCount");
+        // 灏嗗尮閰嶉樁娈靛拰鍒嗙粍闃舵缁勫悎璧锋潵
+        Aggregation aggregation = Aggregation.newAggregation(match, group);
+        // 鎵ц鑱氬悎鏌ヨ
+        AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class); // 鏇挎崲涓轰綘鐨勯泦鍚堝悕绉�
+        for (Map<String, Object> result : results.getMappedResults()) {
+            offlineCount =(Integer) result.getOrDefault("offlineCount",0L);
+            unknownCount =(Integer) result.getOrDefault("unknownCount",0L);
+            onlineCount = (Integer) result.getOrDefault("onlineCount",0L);
+            totalCount = offlineCount + unknownCount + onlineCount;
+        }
         List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
                 .select(CheckIndexVideo::getKeySiteOnline)
                 .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
-                .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+                .between(CheckIndexVideo::getCreateTime, params.getStartTime(),  params.getEndTime())
                 .list();
         BigDecimal onlineRate = BigDecimal.ZERO;
         if (CollectionUtils.isNotEmpty(videoList)) {
@@ -154,9 +350,9 @@
             onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
         }
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", Arrays.asList(distinctCount + "", this.remove0(onlineRate)));
-        map.put("list", page.getRecords());
-        return Result.ok().data(map).total(page.getTotal());
+        map.put("count", Arrays.asList(totalCount + "",onlineCount +"",offlineCount+"" ,unknownCount+"", this.remove0(onlineRate)));
+        map.put("list", resultList);
+        return Result.ok().data(map).total(total);
     }
 
     /**
@@ -167,19 +363,81 @@
      */
     @Override
     public Result videoImportantPointImageOnlineRate(DataCenterQuery params) {
+        List<String> likeFileds = Arrays.asList("name", "no", "ip");
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+        //鏌ヨ棰戣澶�
+        query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+        query.addCriteria(Criteria.where("importantCommandImageTag").is(Boolean.TRUE));
+        //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
+        if(params.getOption()!=null) {
+            query.addCriteria(Criteria.where("online").is(params.getOption()));
+        }
+        // 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈�
+        query.with(Sort.by(Sort.Order.asc("pingOnline")));
+        //鍒嗛〉鏁伴噺
+        long total = mongoTemplate.count(query, TMonitorResult.class);
+        MongoUtil.setPage(query, params, TIME_FIELD);
+        List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
+
         params.setDeptTag(4);
         params.setDeviceType(1);
-        IPage<PointDetailVO> page = PageUtil.getPage(params, PointDetailVO.class);
-        pointMapper.dataCenterPage(page, params);
+        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("鏈煡");
+            }
+        });
 
         // 缁熻璁惧鏁伴噺
-        Integer distinctCount = pointMapper.distinctCount(params);
+        //鍗$墖缁熻
+        int totalCount =0;
+        int onlineCount =0;
+        int offlineCount =0;
+        int unknownCount =0;
+        //鏋勫缓鏉′欢
+        List<Criteria> criteriaList = new ArrayList<>();
+        // 娣诲姞鍥哄畾鏉′欢
+        criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+        criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
+        // 鏍规嵁dataType鍔ㄦ�佹坊鍔犳潯浠�
+        if (params.getDataType() == 1) {
+            criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE));
+        } else if (params.getDataType() == 2) {
+            criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
+        }
+        // 鏋勫缓match鎿嶄綔
+        MatchOperation match = Aggregation.match(
+                new Criteria().andOperator(criteriaList.toArray(new Criteria[0]))
+        );
+        GroupOperation group = Aggregation.group()
+                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Online)).then(1).otherwise(0)).as("onlineCount")
+                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Offline)).then(1).otherwise(0)).as("offlineCount")
+                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Unknown)).then(1).otherwise(0)).as("unknownCount");
+        // 灏嗗尮閰嶉樁娈靛拰鍒嗙粍闃舵缁勫悎璧锋潵
+        Aggregation aggregation = Aggregation.newAggregation(match, group);
+        // 鎵ц鑱氬悎鏌ヨ
+        AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class); // 鏇挎崲涓轰綘鐨勯泦鍚堝悕绉�
+        for (Map<String, Object> result : results.getMappedResults()) {
+            offlineCount =(Integer) result.getOrDefault("offlineCount",0L);
+            unknownCount =(Integer) result.getOrDefault("unknownCount",0L);
+            onlineCount = (Integer) result.getOrDefault("onlineCount",0L);
+            totalCount = offlineCount + unknownCount + onlineCount;
+        }
 
-        Date now = new Date();
         List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
                 .select(CheckIndexVideo::getKeyCommandImageOnline)
                 .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
-                .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+                .between(CheckIndexVideo::getCreateTime, params.getStartTime(),  params.getEndTime())
                 .list();
         BigDecimal onlineRate = BigDecimal.ZERO;
         if (CollectionUtils.isNotEmpty(videoList)) {
@@ -188,9 +446,9 @@
             onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
         }
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", Arrays.asList(distinctCount + "", this.remove0(onlineRate)));
-        map.put("list", page.getRecords());
-        return Result.ok().data(map).total(page.getTotal());
+        map.put("count", Arrays.asList(totalCount + "",onlineCount +"",offlineCount+"" ,unknownCount+"", this.remove0(onlineRate)));
+        map.put("list", resultList);
+        return Result.ok().data(map).total(total);
     }
 
     /**
@@ -214,24 +472,16 @@
 
         List<Document> dList1 = new ArrayList<>(2);
         dList1.add(new Document("ip.error", new Document("$eq", Boolean.TRUE)));
-        if (params.getDataType().equals(1)) {
-            dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList1);
         List<Document> dList2 = new ArrayList<>(2);
         dList2.add(new Document("macdz.error", new Document("$eq", Boolean.TRUE)));
-        if (params.getDataType().equals(1)) {
-            dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList2);
         List<Document> dList3 = new ArrayList<>(2);
         dList3.add(new Document("latitude.error", new Document("$eq", Boolean.TRUE)));
-        if (params.getDataType().equals(1)) {
-            dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList3);
         List<Document> dList4 = new ArrayList<>(2);
         dList4.add(new Document("longitude.error", new Document("$eq", Boolean.TRUE)));
-        if (params.getDataType().equals(1)) {
-            dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList4);
         Document ipErrFilter = new Document("$and", dList1);
         Document macdzErrFilter = new Document("$and", dList2);
         Document latitudeErrFilter = new Document("$and", dList3);
@@ -296,24 +546,16 @@
 
         List<Document> dList1 = new ArrayList<>(2);
         dList1.add(new Document("ip.error", new Document("$eq", Boolean.TRUE)));
-        if (params.getDataType().equals(1)) {
-            dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList1);
         List<Document> dList2 = new ArrayList<>(2);
         dList2.add(new Document("macdz.error", new Document("$eq", Boolean.TRUE)));
-        if (params.getDataType().equals(1)) {
-            dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList2);
         List<Document> dList3 = new ArrayList<>(2);
         dList3.add(new Document("latitude.error", new Document("$eq", Boolean.TRUE)));
-        if (params.getDataType().equals(1)) {
-            dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList3);
         List<Document> dList4 = new ArrayList<>(2);
         dList4.add(new Document("longitude.error", new Document("$eq", Boolean.TRUE)));
-        if (params.getDataType().equals(1)) {
-            dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList4);
         Document ipErrFilter = new Document("$and", dList1);
         Document macdzErrFilter = new Document("$and", dList2);
         Document latitudeErrFilter = new Document("$and", dList3);
@@ -365,7 +607,6 @@
      */
     @Override
     public Result videoAssessmentFileRatio(DataCenterQuery params) {
-        // TODO 鏂板涓�寮犺〃璁板綍姣忔鐨勬。妗堣�冩牳
         List<String> likeFileds = Arrays.asList("ip.showValue", "name.showValue", "serialNumber.showValue");
         Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
 
@@ -379,24 +620,16 @@
 
         List<Document> dList1 = new ArrayList<>(2);
         dList1.add(new Document("ip.error", new Document("$eq", Boolean.TRUE)));
-        if (params.getDataType().equals(1)) {
-            dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList1);
         List<Document> dList2 = new ArrayList<>(2);
         dList2.add(new Document("macdz.error", new Document("$eq", Boolean.TRUE)));
-        if (params.getDataType().equals(1)) {
-            dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList2);
         List<Document> dList3 = new ArrayList<>(2);
         dList3.add(new Document("latitude.error", new Document("$eq", Boolean.TRUE)));
-        if (params.getDataType().equals(1)) {
-            dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList3);
         List<Document> dList4 = new ArrayList<>(2);
         dList4.add(new Document("longitude.error", new Document("$eq", Boolean.TRUE)));
-        if (params.getDataType().equals(1)) {
-            dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList4);
         Document ipErrFilter = new Document("$and", dList1);
         Document macdzErrFilter = new Document("$and", dList2);
         Document latitudeErrFilter = new Document("$and", dList3);
@@ -437,7 +670,7 @@
     @Override
     public Result videoAvailabilityRate(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
-        Query query = MongoUtil.getQuery(params,"createTime", likeFileds, null);
+        Query query = MongoUtil.getQuery(params, "createTime", likeFileds, null);
 
         long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
         MongoUtil.setPage(query, params, "createTime");
@@ -450,9 +683,7 @@
         List<String> resultCount = status.stream().map(item -> {
             List<Document> dList = new ArrayList<>(2);
             dList.add(new Document("recordStatus", new Document("$eq", item)));
-            if (params.getDataType().equals(1)) {
-                dList.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-            }
+            setTag(params, dList);
             Document filter = new Document("$and", dList);
             // 鏋勫缓鑱氬悎绠¢亾
             List<Document> pipeline = Arrays.asList(
@@ -499,7 +730,7 @@
     @Override
     public Result deptVideoAvailabilityRate(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
-        Query query = MongoUtil.getQuery(params,"createTime", likeFileds, 1);
+        Query query = MongoUtil.getQuery(params, "createTime", likeFileds, 1);
 
         long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
         MongoUtil.setPage(query, params, "createTime");
@@ -512,10 +743,8 @@
         List<String> resultCount = status.stream().map(item -> {
             List<Document> dList = new ArrayList<>(4);
             dList.add(new Document("deptTag", new Document("$eq", Boolean.TRUE)));
-            dList.add(new Document("recordStatus",  new Document("$eq", item)));
-            if (params.getDataType().equals(1)) {
-                dList.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-            }
+            dList.add(new Document("recordStatus", new Document("$eq", item)));
+            setTag(params, dList);
             Document filter = new Document("$and", dList);
             // 鏋勫缓鑱氬悎绠¢亾
             List<Document> pipeline = Arrays.asList(
@@ -562,7 +791,7 @@
     @Override
     public Result videoImportantPointAvailabilityRate(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
-        Query query = MongoUtil.getQuery(params,"createTime", likeFileds, 3);
+        Query query = MongoUtil.getQuery(params, "createTime", likeFileds, 3);
 
         long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
         MongoUtil.setPage(query, params, "createTime");
@@ -576,9 +805,7 @@
             List<Document> dList = new ArrayList<>(4);
             dList.add(new Document("importantTag", new Document("$eq", Boolean.TRUE)));
             dList.add(new Document("recordStatus", new Document("$eq", item)));
-            if (params.getDataType().equals(1)) {
-                dList.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-            }
+            setTag(params, dList);
             Document filter = new Document("$and", dList);
             // 鏋勫缓鑱氬悎绠¢亾
             List<Document> pipeline = Arrays.asList(
@@ -594,7 +821,7 @@
                 uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
                 break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
             }
-            return uniqueDeviceIdCount + "%";
+            return uniqueDeviceIdCount + "";
         }).collect(Collectors.toList());
 
         Date now = new Date();
@@ -650,7 +877,7 @@
     @Override
     public Result videoImportantPointLabelingAccuracy(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("deviceNo", "osdName");
-        Query query = MongoUtil.getQuery(params,"checkTime", likeFileds, 3);
+        Query query = MongoUtil.getQuery(params, "checkTime", likeFileds, 3);
 
         long total = mongoTemplate.count(query, OsdCheckResult.class);
         MongoUtil.setPage(query, params, "checkTime");
@@ -663,27 +890,19 @@
         List<Document> dList1 = new ArrayList<>(2);
         dList1.add(new Document("importantTag", Boolean.TRUE));
         dList1.add(new Document("osdNameCorrect", new Document("$eq", 1)));
-        if (params.getDataType().equals(1)) {
-            dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList1);
         List<Document> dList2 = new ArrayList<>(2);
         dList2.add(new Document("importantTag", Boolean.TRUE));
         dList2.add(new Document("osdNameCorrect", new Document("$eq", -1)));
-        if (params.getDataType().equals(1)) {
-            dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList2);
         List<Document> dList3 = new ArrayList<>(2);
         dList3.add(new Document("importantTag", Boolean.TRUE));
         dList3.add(new Document("osdTimeCorrect", new Document("$eq", 1)));
-        if (params.getDataType().equals(1)) {
-            dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList3);
         List<Document> dList4 = new ArrayList<>(2);
         dList4.add(new Document("importantTag", Boolean.TRUE));
         dList4.add(new Document("osdTimeCorrect", new Document("$eq", -1)));
-        if (params.getDataType().equals(1)) {
-            dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList4);
         Document osdNameFilter = new Document("$and", dList1);
         Document osdNameErrFilter = new Document("$and", dList2);
         Document osdTimeFilter = new Document("$and", dList3);
@@ -762,7 +981,7 @@
     public Result videoImportantPointCheckTimeAccuracy(DataCenterQuery params) {
 
         List<String> likeFileds = Arrays.asList("deviceNo", "osdName");
-        Query query = MongoUtil.getQuery(params,"checkTime", likeFileds, 3);
+        Query query = MongoUtil.getQuery(params, "checkTime", likeFileds, 3);
 
         long total = mongoTemplate.count(query, OsdCheckResult.class);
         MongoUtil.setPage(query, params, "checkTime");
@@ -775,15 +994,11 @@
         List<Document> dList1 = new ArrayList<>(2);
         dList1.add(new Document("importantTag", Boolean.TRUE));
         dList1.add(new Document("osdTimeCorrect", new Document("$eq", 1)));
-        if (params.getDataType().equals(1)) {
-            dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList1);
         List<Document> dList2 = new ArrayList<>(2);
         dList2.add(new Document("importantTag", Boolean.TRUE));
         dList2.add(new Document("osdTimeCorrect", new Document("$eq", -1)));
-        if (params.getDataType().equals(1)) {
-            dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList2);
         Document osdTimeFilter = new Document("$and", dList1);
         Document osdTimeErrFilter = new Document("$and", dList2);
         List<Document> lists = Arrays.asList(osdTimeFilter, osdTimeErrFilter);
@@ -847,27 +1062,19 @@
         List<Document> dList1 = new ArrayList<>(2);
         dList1.add(new Document("importantTag", Boolean.TRUE));
         dList1.add(new Document("resultType", new Document("$eq", 1)));
-        if (params.getDataType().equals(1)) {
-            dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList1);
         List<Document> dList2 = new ArrayList<>(2);
         dList2.add(new Document("importantTag", Boolean.TRUE));
         dList2.add(new Document("resultType", new Document("$eq", 2)));
-        if (params.getDataType().equals(1)) {
-            dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList2);
         List<Document> dList3 = new ArrayList<>(2);
         dList3.add(new Document("importantTag", Boolean.TRUE));
         dList3.add(new Document("resultType", new Document("$eq", 3)));
-        if (params.getDataType().equals(1)) {
-            dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList3);
         List<Document> dList4 = new ArrayList<>(2);
         dList4.add(new Document("importantTag", Boolean.TRUE));
         dList4.add(new Document("resultType", new Document("$eq", 4)));
-        if (params.getDataType().equals(1)) {
-            dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList4);
         Document normalFilter = new Document("$and", dList1);
         Document noDataFilter = new Document("$and", dList2);
         Document trFilter = new Document("$and", dList3);
@@ -918,19 +1125,80 @@
      */
     @Override
     public Result vehiclePointOnlineRate(DataCenterQuery params) {
+        List<String> likeFileds = Arrays.asList("name", "no", "ip");
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+        //鏌ヨ溅杈嗚澶�
+        query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Car + ".*"));
+        //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
+        if(params.getOption()!=null) {
+            query.addCriteria(Criteria.where("online").is(params.getOption()));
+        }
+        // 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈�
+        query.with(Sort.by(Sort.Order.asc("pingOnline")));
+        //鍒嗛〉鏁伴噺
+        long total = mongoTemplate.count(query, TMonitorResult.class);
+        MongoUtil.setPage(query, params, TIME_FIELD);
+        //绯荤粺ping鐨勭粨鏋�
+        List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
         params.setDeptTag(-1);
         params.setDeviceType(2);
-        IPage<PointDetailVO> page = PageUtil.getPage(params, PointDetailVO.class);
-        pointMapper.dataCenterPage(page, params);
+        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("鏈煡");
+            }
+        });
 
         // 缁熻璁惧鏁伴噺
-        Integer distinctCount = pointMapper.distinctCount(params);
+        //鍗$墖缁熻
+        int totalCount =0;
+        int onlineCount =0;
+        int offlineCount =0;
+        int unknownCount =0;
+        //鏋勫缓鏉′欢
+        List<Criteria> criteriaList = new ArrayList<>();
+        // 娣诲姞鍥哄畾鏉′欢
+        criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Car + ".*"));
+        criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
+        // 鏍规嵁dataType鍔ㄦ�佹坊鍔犳潯浠�
+        if (params.getDataType() == 1) {
+            criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE));
+        } else if (params.getDataType() == 2) {
+            criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
+        }
+        // 鏋勫缓match鎿嶄綔
+        MatchOperation match = Aggregation.match(
+                new Criteria().andOperator(criteriaList.toArray(new Criteria[0]))
+        );
+        GroupOperation group = Aggregation.group()
+                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Online)).then(1).otherwise(0)).as("onlineCount")
+                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Offline)).then(1).otherwise(0)).as("offlineCount")
+                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Unknown)).then(1).otherwise(0)).as("unknownCount");
+        // 灏嗗尮閰嶉樁娈靛拰鍒嗙粍闃舵缁勫悎璧锋潵
+        Aggregation aggregation = Aggregation.newAggregation(match, group);
+        // 鎵ц鑱氬悎鏌ヨ
+        AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class); // 鏇挎崲涓轰綘鐨勯泦鍚堝悕绉�
+        for (Map<String, Object> result : results.getMappedResults()) {
+            offlineCount =(Integer) result.getOrDefault("offlineCount",0L);
+            unknownCount =(Integer) result.getOrDefault("unknownCount",0L);
+            onlineCount = (Integer) result.getOrDefault("onlineCount",0L);
+            totalCount = offlineCount + unknownCount + onlineCount;
+        }
 
-        Date now = new Date();
         List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
                 .select(CheckIndexCar::getSiteOnline)
                 .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
-                .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+                .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
                 .list();
         BigDecimal onlineRate = BigDecimal.ZERO;
         if (CollectionUtils.isNotEmpty(videoList)) {
@@ -939,9 +1207,9 @@
             onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
         }
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", Arrays.asList(distinctCount + "", this.remove0(onlineRate)));
-        map.put("list", page.getRecords());
-        return Result.ok().data(map).total(page.getTotal());
+        map.put("count", Arrays.asList(totalCount + "",onlineCount +"",offlineCount+"" ,unknownCount+"", this.remove0(onlineRate)));
+        map.put("list", resultList);
+        return Result.ok().data(map).total(total);
     }
 
     /**
@@ -965,24 +1233,16 @@
 
         List<Document> dList1 = new ArrayList<>(2);
         dList1.add(new Document("ip.error", new Document("$eq", Boolean.TRUE)));
-        if (params.getDataType().equals(1)) {
-            dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList1);
         List<Document> dList2 = new ArrayList<>(2);
         dList2.add(new Document("macdz.error", new Document("$eq", Boolean.TRUE)));
-        if (params.getDataType().equals(1)) {
-            dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList2);
         List<Document> dList3 = new ArrayList<>(2);
         dList3.add(new Document("latitude.error", new Document("$eq", Boolean.TRUE)));
-        if (params.getDataType().equals(1)) {
-            dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList3);
         List<Document> dList4 = new ArrayList<>(2);
         dList4.add(new Document("longitude.error", new Document("$eq", Boolean.TRUE)));
-        if (params.getDataType().equals(1)) {
-            dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList4);
         Document ipErrFilter = new Document("$and", dList1);
         Document macdzErrFilter = new Document("$and", dList2);
         Document latitudeErrFilter = new Document("$and", dList3);
@@ -1046,24 +1306,16 @@
 
         List<Document> dList1 = new ArrayList<>(2);
         dList1.add(new Document("lalType", new Document("$eq", 1)));
-        if (params.getDataType().equals(1)) {
-            dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList1);
         List<Document> dList2 = new ArrayList<>(2);
         dList2.add(new Document("lalType", new Document("$eq", 2)));
-        if (params.getDataType().equals(1)) {
-            dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList2);
         List<Document> dList3 = new ArrayList<>(2);
         dList3.add(new Document("lalType", new Document("$eq", 3)));
-        if (params.getDataType().equals(1)) {
-            dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList3);
         List<Document> dList4 = new ArrayList<>(2);
         dList4.add(new Document("lalType", new Document("$eq", 4)));
-        if (params.getDataType().equals(1)) {
-            dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList4);
         Document ipErrFilter = new Document("$and", dList1);
         Document macdzErrFilter = new Document("$and", dList2);
         Document latitudeErrFilter = new Document("$and", dList3);
@@ -1200,19 +1452,13 @@
 
         List<Document> dList1 = new ArrayList<>(2);
         dList1.add(new Document("snapResult", new Document("$eq", 1)));
-        if (params.getDataType().equals(1)) {
-            dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList1);
         List<Document> dList2 = new ArrayList<>(2);
         dList2.add(new Document("snapResult", new Document("$eq", 2)));
-        if (params.getDataType().equals(1)) {
-            dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList2);
         List<Document> dList3 = new ArrayList<>(2);
         dList3.add(new Document("snapResult", new Document("$eq", 4)));
-        if (params.getDataType().equals(1)) {
-            dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList3);
         Document ipErrFilter = new Document("$and", dList1);
         Document macdzErrFilter = new Document("$and", dList2);
         Document longitudeErrFilter = new Document("$and", dList3);
@@ -1378,24 +1624,16 @@
 
         List<Document> dList1 = new ArrayList<>(2);
         dList1.add(new Document("resultType", new Document("$eq", 1)));
-        if (params.getDataType().equals(1)) {
-            dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList1);
         List<Document> dList2 = new ArrayList<>(2);
         dList2.add(new Document("resultType", new Document("$eq", 2)));
-        if (params.getDataType().equals(1)) {
-            dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList2);
         List<Document> dList3 = new ArrayList<>(2);
         dList3.add(new Document("resultType", new Document("$eq", 3)));
-        if (params.getDataType().equals(1)) {
-            dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList3);
         List<Document> dList4 = new ArrayList<>(2);
         dList4.add(new Document("resultType", new Document("$eq", 4)));
-        if (params.getDataType().equals(1)) {
-            dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList4);
         Document normalFilter = new Document("$and", dList1);
         Document noDataFilter = new Document("$and", dList2);
         Document trFilter = new Document("$and", dList3);
@@ -1446,19 +1684,78 @@
      */
     @Override
     public Result facePointOnlineRate(DataCenterQuery params) {
+        List<String> likeFileds = Arrays.asList("name", "no", "ip");
+        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+        //鏌ヤ汉鑴歌澶�
+        query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Face + ".*"));
+        //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
+        if(params.getOption()!=null) {
+            query.addCriteria(Criteria.where("online").is(params.getOption()));
+        }
+        // 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈�
+        query.with(Sort.by(Sort.Order.asc("pingOnline")));
+        //鍒嗛〉鏁伴噺
+        long total = mongoTemplate.count(query, TMonitorResult.class);
+        MongoUtil.setPage(query, params, TIME_FIELD);
+        List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
+        resultList.forEach(item -> {
+            if(item.getPingOnline() ==null){
+                item.setPingOnlineStr("鏈煡");
+            } else if (item.getPingOnline()) {
+                item.setPingOnlineStr("鍦ㄧ嚎");
+            } else if(!item.getPingOnline()){
+                item.setPingOnlineStr("绂荤嚎");
+            }
+            if (1 == item.getOnline()) {
+                item.setOnlineStr("鍦ㄧ嚎");
+            } else if (-1 == item.getOnline()) {
+                item.setOnlineStr("绂荤嚎");
+            } else {
+                item.setOnlineStr("鏈煡");
+            }
+        });
         params.setDeptTag(-1);
         params.setDeviceType(3);
-        IPage<PointDetailVO> page = PageUtil.getPage(params, PointDetailVO.class);
-        pointMapper.dataCenterPage(page, params);
 
-        // 缁熻璁惧鏁伴噺
-        Integer distinctCount = pointMapper.distinctCount(params);
-
-        Date now = new Date();
+// 缁熻璁惧鏁伴噺
+        //鍗$墖缁熻
+        int totalCount =0;
+        int onlineCount =0;
+        int offlineCount =0;
+        int unknownCount =0;
+        //鏋勫缓鏉′欢
+        List<Criteria> criteriaList = new ArrayList<>();
+        // 娣诲姞鍥哄畾鏉′欢
+        criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Face + ".*"));
+        criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
+        // 鏍规嵁dataType鍔ㄦ�佹坊鍔犳潯浠�
+        if (params.getDataType() == 1) {
+            criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE));
+        } else if (params.getDataType() == 2) {
+            criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
+        }
+        // 鏋勫缓match鎿嶄綔
+        MatchOperation match = Aggregation.match(
+                new Criteria().andOperator(criteriaList.toArray(new Criteria[0]))
+        );
+        GroupOperation group = Aggregation.group()
+                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Online)).then(1).otherwise(0)).as("onlineCount")
+                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Offline)).then(1).otherwise(0)).as("offlineCount")
+                .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Unknown)).then(1).otherwise(0)).as("unknownCount");
+        // 灏嗗尮閰嶉樁娈靛拰鍒嗙粍闃舵缁勫悎璧锋潵
+        Aggregation aggregation = Aggregation.newAggregation(match, group);
+        // 鎵ц鑱氬悎鏌ヨ
+        AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class); // 鏇挎崲涓轰綘鐨勯泦鍚堝悕绉�
+        for (Map<String, Object> result : results.getMappedResults()) {
+            offlineCount =(Integer) result.getOrDefault("offlineCount",0L);
+            unknownCount =(Integer) result.getOrDefault("unknownCount",0L);
+            onlineCount = (Integer) result.getOrDefault("onlineCount",0L);
+            totalCount = offlineCount + unknownCount + onlineCount;
+        }
         List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
                 .select(CheckIndexFace::getSiteOnline)
                 .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
-                .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+                .between(CheckIndexFace::getCreateTime, params.getStartTime(),  params.getEndTime())
                 .list();
         BigDecimal onlineRate = BigDecimal.ZERO;
         if (CollectionUtils.isNotEmpty(videoList)) {
@@ -1466,13 +1763,11 @@
             BigDecimal count = BigDecimal.valueOf(videoList.size());
             onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
         }
-        List<String> rList = new ArrayList<>(2);
-        rList.add(distinctCount + "");
-        rList.add(this.remove0(onlineRate));
+
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", rList);
-        map.put("list", page.getRecords());
-        return Result.ok().data(map).total(page.getTotal());
+        map.put("count", Arrays.asList(totalCount + "",onlineCount +"",offlineCount+"" ,unknownCount+"", this.remove0(onlineRate)));
+        map.put("list", resultList);
+        return Result.ok().data(map).total(total);
     }
 
     /**
@@ -1496,24 +1791,16 @@
 
         List<Document> dList1 = new ArrayList<>(2);
         dList1.add(new Document("ip.error", new Document("$eq", Boolean.TRUE)));
-        if (params.getDataType().equals(1)) {
-            dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList1);
         List<Document> dList2 = new ArrayList<>(2);
         dList2.add(new Document("macdz.error", new Document("$eq", Boolean.TRUE)));
-        if (params.getDataType().equals(1)) {
-            dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList2);
         List<Document> dList3 = new ArrayList<>(2);
         dList3.add(new Document("latitude.error", new Document("$eq", Boolean.TRUE)));
-        if (params.getDataType().equals(1)) {
-            dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList3);
         List<Document> dList4 = new ArrayList<>(2);
         dList4.add(new Document("longitude.error", new Document("$eq", Boolean.TRUE)));
-        if (params.getDataType().equals(1)) {
-            dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList4);
         Document ipErrFilter = new Document("$and", dList1);
         Document macdzErrFilter = new Document("$and", dList2);
         Document latitudeErrFilter = new Document("$and", dList3);
@@ -1577,24 +1864,16 @@
 
         List<Document> dList1 = new ArrayList<>(2);
         dList1.add(new Document("lalType", new Document("$eq", 1)));
-        if (params.getDataType().equals(1)) {
-            dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList1);
         List<Document> dList2 = new ArrayList<>(2);
         dList2.add(new Document("lalType", new Document("$eq", 2)));
-        if (params.getDataType().equals(1)) {
-            dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList2);
         List<Document> dList3 = new ArrayList<>(2);
         dList3.add(new Document("lalType", new Document("$eq", 3)));
-        if (params.getDataType().equals(1)) {
-            dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList3);
         List<Document> dList4 = new ArrayList<>(2);
         dList4.add(new Document("lalType", new Document("$eq", 4)));
-        if (params.getDataType().equals(1)) {
-            dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList4);
         Document ipErrFilter = new Document("$and", dList1);
         Document macdzErrFilter = new Document("$and", dList2);
         Document latitudeErrFilter = new Document("$and", dList3);
@@ -1658,24 +1937,16 @@
 
         List<Document> dList1 = new ArrayList<>(2);
         dList1.add(new Document("lalType", new Document("$eq", 1)));
-        if (params.getDataType().equals(1)) {
-            dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList1);
         List<Document> dList2 = new ArrayList<>(2);
         dList2.add(new Document("lalType", new Document("$eq", 2)));
-        if (params.getDataType().equals(1)) {
-            dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList2);
         List<Document> dList3 = new ArrayList<>(2);
         dList3.add(new Document("lalType", new Document("$eq", 3)));
-        if (params.getDataType().equals(1)) {
-            dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList3);
         List<Document> dList4 = new ArrayList<>(2);
         dList4.add(new Document("lalType", new Document("$eq", 4)));
-        if (params.getDataType().equals(1)) {
-            dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList4);
         Document ipErrFilter = new Document("$and", dList1);
         Document macdzErrFilter = new Document("$and", dList2);
         Document latitudeErrFilter = new Document("$and", dList3);
@@ -1740,19 +2011,13 @@
 
         List<Document> dList1 = new ArrayList<>(2);
         dList1.add(new Document("snapResult", new Document("$eq", 1)));
-        if (params.getDataType().equals(1)) {
-            dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList1);
         List<Document> dList2 = new ArrayList<>(2);
         dList2.add(new Document("snapResult", new Document("$eq", 2)));
-        if (params.getDataType().equals(1)) {
-            dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList2);
         List<Document> dList3 = new ArrayList<>(2);
         dList3.add(new Document("snapResult", new Document("$eq", 4)));
-        if (params.getDataType().equals(1)) {
-            dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList3);
         Document ipErrFilter = new Document("$and", dList1);
         Document macdzErrFilter = new Document("$and", dList2);
         Document longitudeErrFilter = new Document("$and", dList3);
@@ -1816,19 +2081,13 @@
 
         List<Document> dList1 = new ArrayList<>(2);
         dList1.add(new Document("snapResult", new Document("$eq", 1)));
-        if (params.getDataType().equals(1)) {
-            dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList1);
         List<Document> dList2 = new ArrayList<>(2);
         dList2.add(new Document("snapResult", new Document("$eq", 2)));
-        if (params.getDataType().equals(1)) {
-            dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList2);
         List<Document> dList3 = new ArrayList<>(2);
         dList3.add(new Document("snapResult", new Document("$eq", 4)));
-        if (params.getDataType().equals(1)) {
-            dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
-        }
+        setTag(params, dList3);
         Document ipErrFilter = new Document("$and", dList1);
         Document macdzErrFilter = new Document("$and", dList2);
         Document longitudeErrFilter = new Document("$and", dList3);
@@ -1905,6 +2164,7 @@
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
+
     /**
      * 瑙嗛锛氳棰戝浘鍍忚祫婧愬畨鍏ㄧ鐞�
      *
@@ -1926,6 +2186,7 @@
 
     /**
      * 鍒犻櫎灏鹃儴鐨�0
+     *
      * @param rate
      * @return
      */
@@ -1933,4 +2194,18 @@
         DF.setDecimalSeparatorAlwaysShown(false);
         return DF.format(rate) + "%";
     }
+
+    /**
+     * 璁剧疆鏍囩鎼滅储鏉′欢
+     *
+     * @param params
+     * @param dList
+     */
+    private void setTag(DataCenterQuery params, List<Document> dList) {
+        if (params.getDataType().equals(1)) {
+            dList.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+        } else if (params.getDataType().equals(2)) {
+            dList.add(new Document("deptTag", new Document("$eq", Boolean.TRUE)));
+        }
+    }
 }

--
Gitblit v1.8.0