From 71f61d13531b3e2a0099ba5afe3f268c99c5bacf Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 29 五月 2025 18:13:33 +0800
Subject: [PATCH] 修改大屏录像可用率指标,点位在线指标,数据中心录像可用率,

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java |  806 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 730 insertions(+), 76 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 65358a2..aff9843 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
@@ -2,8 +2,6 @@
 
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
-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;
 import com.github.pagehelper.PageHelper;
@@ -11,8 +9,6 @@
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
 import com.ycl.platform.domain.entity.*;
-import com.ycl.platform.domain.excel.RecordingAvailabilityExport;
-import com.ycl.platform.domain.excel.TMonitorExp;
 import com.ycl.platform.domain.form.UpdateDynamicValueForm;
 import com.ycl.platform.domain.query.DataCenterQuery;
 import com.ycl.platform.domain.result.HK.*;
@@ -22,22 +18,19 @@
 import com.ycl.platform.domain.vo.DataCenter.MonitorQualifyResultVO;
 import com.ycl.platform.domain.vo.DataCenter.SnapClockVO;
 import com.ycl.platform.domain.vo.DynamicColumnVO;
-import com.ycl.platform.domain.vo.PointDetailVO;
-import com.ycl.platform.domain.vo.home.HomeFaceVO;
 import com.ycl.platform.mapper.DynamicColumnMapper;
 import com.ycl.platform.mapper.ImageResourceSecurityDetailMapper;
+import com.ycl.platform.mapper.TMonitorMapper;
 import com.ycl.platform.mapper.YwPointMapper;
 import com.ycl.platform.service.*;
 import com.ycl.system.Result;
-import com.ycl.system.page.PageUtil;
+import com.ycl.system.service.ISysConfigService;
 import com.ycl.utils.DateUtils;
 import com.ycl.utils.MongoUtil;
 import com.ycl.utils.StringUtils;
 import com.ycl.utils.bean.BeanUtils;
 import com.ycl.utils.poi.ExcelUtil;
-import constant.ApiConstants;
-import constant.CheckConstants;
-import constant.RecordingAvailability;
+import constant.*;
 import enumeration.general.AreaDeptEnum;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
@@ -49,7 +42,6 @@
 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;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
@@ -75,7 +67,6 @@
     private final MongoTemplate mongoTemplate;
     private final ImageResourceSecurityDetailMapper securityDetailMapper;
     private final YwPointMapper pointMapper;
-    private final ICheckIndexVideoService checkIndexVideoService;
     private final ICheckIndexCarService checkIndexCarService;
     private final ICheckIndexFaceService checkIndexFaceService;
     private final DynamicColumnMapper dynamicColumnMapper;
@@ -86,37 +77,69 @@
 
     private static DecimalFormat DF = new DecimalFormat("#.####");
 
+
+
+    public Map<String,List<DynamicColumnVO>> getDynamicByConditions(DataCenterQuery params,List<DynamicColumnVO> list){
+        //鑾峰緱鍒板搴攊d锛屼笖鍖呭惈浼犲叆瀛楃涓� 鍔ㄦ�佸垪闆嗗悎
+        List<DynamicColumnVO> likeFieldDynamicColumnVOList = list.stream()
+                .filter(dynamicColumnVO ->
+                    dynamicColumnVO.getLabelId().equals(params.getDyId()) &&
+                            dynamicColumnVO.getColumnValue().contains(params.getDyValue())
+        ).collect(Collectors.toList());
+        //鑾峰緱婊¤冻鏉′欢鐨刬d闆嗗悎
+        List<String> ids = likeFieldDynamicColumnVOList.stream().map(DynamicColumnVO::getRefStringId).toList();
+        Map<String,List<DynamicColumnVO>> groupByRefStringIdMap = list.stream().collect(Collectors.groupingBy(DynamicColumnVO::getRefStringId));
+        Set<String> removeSet = new HashSet<>(ids);
+        //绉婚櫎鎺変笉绗﹀悎鏉′欢鐨刱ey
+        groupByRefStringIdMap.keySet().retainAll(removeSet);
+
+        return groupByRefStringIdMap;
+    }
+
     @Override
     public void recordingAvailabilityExport(HttpServletResponse response,DataCenterQuery params) throws IOException {
+
         List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
         Query query = MongoUtil.getQuery(params, "createTime", likeFileds, null);
         //涓嬫媺妗嗗綍鍍忔儏鍐垫煡璇㈡潯浠�
         if (params.getOption() != null) {
             query.addCriteria(Criteria.where("recordStatus").is(params.getOption()));
         }
+        MongoUtil.setNoPage(query, params, TIME_FIELD);
         List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
-        List<DynamicColumnVO> dynamicColumnVOList = dynamicColumnMapper.getDynamicColumnByTableName("uy_record_meta_d_sum");
         //缈昏瘧琛屾斂鍖哄煙
         resultList.forEach(item -> {
             String areaCode = item.getArealayername().substring(0, 6);
             AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromCode(areaCode);
             if (areaDeptEnum != null) item.setArealayername(areaDeptEnum.getName());
         });
-        Map<String,List<DynamicColumnVO>> groupByRefStringIdMap = dynamicColumnVOList.stream().collect(Collectors.groupingBy(DynamicColumnVO::getRefStringId));
-        //鎻愰偅瀹跺浐瀹氳〃澶�
+        //鑾峰緱鍔ㄦ�佸垪鏁版嵁
+        List<DynamicColumnVO> dynamicColumnVOList = dynamicColumnMapper.getDynamicColumnByTableName(TableNameConstants.COLUMN_NAME_VIDEO);
+
+        //鍒ゆ柇鏄惁鏈夋煡璇㈡潯浠�
+        boolean conditions = false;
+        Map<String,List<DynamicColumnVO>> groupByRefStringIdMap = new HashMap<>();
+        if (params.getDyId() != null && StringUtils.isNotEmpty(params.getDyValue())){
+            conditions = true;
+            //鑾峰緱鍔ㄦ�佸垪闆嗗悎涓寘鍚簡鐨勫瓧绗︿覆鍊肩殑闆嗗悎 鍖哄垎澶у皬鍐�
+            groupByRefStringIdMap = getDynamicByConditions(params,dynamicColumnVOList);
+        }else{
+            groupByRefStringIdMap = dynamicColumnVOList.stream().collect(Collectors.groupingBy(DynamicColumnVO::getRefStringId));
+        }
+        //鍥哄畾琛ㄥご
         LinkedHashSet<String> headers = new LinkedHashSet<>();
-        headers.add(RecordingAvailability.arealayername);
-        headers.add(RecordingAvailability.arealayerno);
-        headers.add(RecordingAvailability.createTime);
-        headers.add(RecordingAvailability.deviceId);
-        headers.add(RecordingAvailability.missDuration);
-        headers.add(RecordingAvailability.platId);
-        headers.add(RecordingAvailability.recordDuration);
-        headers.add(RecordingAvailability.recordStatusText);
-        headers.add(RecordingAvailability.statTime);
+        headers.add(RecordingAvailabilityHeaders.arealayername);
+        headers.add(RecordingAvailabilityHeaders.arealayerno);
+        headers.add(RecordingAvailabilityHeaders.createTime);
+        headers.add(RecordingAvailabilityHeaders.deviceId);
+        headers.add(RecordingAvailabilityHeaders.missDuration);
+        headers.add(RecordingAvailabilityHeaders.platId);
+        headers.add(RecordingAvailabilityHeaders.recordDuration);
+        headers.add(RecordingAvailabilityHeaders.recordStatusText);
+        headers.add(RecordingAvailabilityHeaders.statTime);
 
         List<String> headersList = new LinkedList<>();
-        List<String> dynamicsHeaders = dynamicColumnMapper.getHeader("uy_record_meta_d_sum");
+        List<String> dynamicsHeaders = dynamicColumnMapper.getHeader(TableNameConstants.COLUMN_NAME_VIDEO);
 
         //娣诲姞鍔ㄦ�佽〃澶�
         if (!org.springframework.util.CollectionUtils.isEmpty(dynamicsHeaders)) {
@@ -124,21 +147,28 @@
             headersList.addAll(dynamicsHeaders);
             headers.addAll(headersList);
         }
-        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
-        SimpleDateFormat dateFormat2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
+//        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        //鏌ヨ鍒版湁鍔ㄦ�佸垪鏌ヨ鏉′欢
+        //鑾峰緱瀵瑰簲鍔ㄦ�佸垪涓璻ef鐨勫璞d 涓� 鏌ヨ缁撴灉id杩囨护
+        if (conditions){
+            Map<String, List<DynamicColumnVO>> finalGroupByRefStringIdMap = groupByRefStringIdMap;
+            resultList = resultList.stream()
+                    .filter(obj -> finalGroupByRefStringIdMap.containsKey(obj.getId()))
+                    .collect(Collectors.toList());
+        }
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         List<List<Object>> data = new ArrayList<>();
         for (RecordMetaDSumResult result : resultList){
             List<Object> row = new ArrayList<>();
             row.add(result.getArealayername());
             row.add(result.getArealayerno());
-            row.add(dateFormat2.format(result.getCreateTime()));
+            row.add(dateFormat.format(result.getCreateTime()));
             row.add(result.getDeviceId());
             row.add(result.getMissDuration());
             row.add(result.getPlatId());
             row.add(result.getRecordDuration());
             row.add(result.getRecordStatusText());
-            row.add(dateFormat2.format(result.getCreateTime()));
+            row.add(dateFormat.format(result.getCreateTime()));
             //娣诲姞鍔ㄦ�佸垪鏁版嵁
             for (String header : headersList){
                 boolean flag = false;
@@ -168,8 +198,398 @@
     }
 
     @Override
-    public void pointOnlineExport(HttpServletResponse response,DataCenterQuery query) throws IOException  {
+    public void pointOnlineFaceExport(HttpServletResponse response, DataCenterQuery params) throws IOException {
+        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()));
+        }
+        Sort sort = Sort.by(
+                Sort.Order.asc("pingOnline"), // 棣栧厛鎸夌収 pingOnline 鍗囧簭鎺掑簭
+                Sort.Order.desc("offLineCount") // 棣栧厛鎸夌収 pingOnline 鍗囧簭鎺掑簭
+        );
+        // 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈�
+        query.with(sort);
+        MongoUtil.setNoPage(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)) {
+                //鍚庣画鍙互鏀规垚閰嶇疆鐨勭绾挎鏁�(鎻愬彇鍓峮娆★紝n涓洪厤缃殑绂荤嚎娆℃暟)
+                if (offLineTime.size() > 1) {
+                    offLineTime = offLineTime.subList(0, 2);
+                }
+                item.setOffLineTimeStr(offLineTime);
+            }
+        });
 
+
+
+        List<DynamicColumnVO> dynamicColumnVOList = dynamicColumnMapper.getDynamicColumnByTableName(TableNameConstants.COLUMN_NAME_FACE_POINT);
+
+
+        //鍒ゆ柇鏄惁鏈夋煡璇㈡潯浠�
+        boolean conditions = false;
+        Map<String,List<DynamicColumnVO>> groupByRefStringIdMap = new HashMap<>();
+        if (params.getDyId() != null && StringUtils.isNotEmpty(params.getDyValue())){
+            conditions = true;
+            //鑾峰緱鍔ㄦ�佸垪闆嗗悎涓寘鍚簡鐨勫瓧绗︿覆鍊肩殑闆嗗悎 鍖哄垎澶у皬鍐�
+            groupByRefStringIdMap = getDynamicByConditions(params,dynamicColumnVOList);
+        }else{
+            groupByRefStringIdMap = dynamicColumnVOList.stream().collect(Collectors.groupingBy(DynamicColumnVO::getRefStringId));
+        }
+
+        //鍥哄畾琛ㄥご
+        LinkedHashSet<String> headers = new LinkedHashSet<>();
+        headers.add(PointOnlineHeaders.no);
+        headers.add(PointOnlineHeaders.name);
+        headers.add(PointOnlineHeaders.ip);
+        headers.add(PointOnlineHeaders.onlineStr);
+        headers.add(PointOnlineHeaders.pingOnlineStr);
+        headers.add(PointOnlineHeaders.checkCount);
+        headers.add(PointOnlineHeaders.offLineCount);
+        headers.add(PointOnlineHeaders.offLineTimeStr);
+        headers.add(PointOnlineHeaders.mongoCreateTime);
+
+        List<String> headersList = new LinkedList<>();
+        List<String> dynamicsHeaders = dynamicColumnMapper.getHeader(TableNameConstants.COLUMN_NAME_FACE_POINT);
+
+        //娣诲姞鍔ㄦ�佽〃澶�
+        if (!org.springframework.util.CollectionUtils.isEmpty(dynamicsHeaders)) {
+            //浣跨敤閾捐〃淇濊瘉鍚庣画琛ュ厖鏁版嵁鏃惰幏鍙栨暟鎹『搴忎竴鑷�
+            headersList.addAll(dynamicsHeaders);
+            headers.addAll(headersList);
+        }
+
+        if (conditions){
+            Map<String, List<DynamicColumnVO>> finalGroupByRefStringIdMap = groupByRefStringIdMap;
+            resultList = resultList.stream()
+                    .filter(obj -> finalGroupByRefStringIdMap.containsKey(obj.getNo()))
+                    .collect(Collectors.toList());
+        }
+
+        List<List<Object>> data = new ArrayList<>();
+        for (TMonitorResult result : resultList){
+            List<Object> row = new ArrayList<>();
+            row.add(result.getNo());
+            row.add(result.getName());
+            row.add(result.getIp());
+            row.add(result.getOnlineStr());
+            row.add(result.getPingOnlineStr());
+            row.add(result.getCheckCount());
+            row.add(result.getOffLineCount());
+            if (CollectionUtils.isEmpty(result.getOffLineTimeStr())){
+                row.add(null);
+            }else {
+                row.add(result.getOffLineTimeStr().toString());
+            }
+            row.add(result.getMongoCreateTime());
+            //娣诲姞鍔ㄦ�佸垪鏁版嵁
+            for (String header : headersList){
+                boolean flag = false;
+                List<DynamicColumnVO> columnVOS = groupByRefStringIdMap.get(result.getNo());
+                if (!CollectionUtils.isEmpty(columnVOS)) {
+                    for (DynamicColumnVO columnVO : columnVOS) {
+                        if (header.equals(columnVO.getLabelValue())) {
+                            row.add(columnVO.getColumnValue());
+                            flag = true;
+                        }
+                    }
+                }
+                //娌℃壘鍒扮敤绌轰覆鍗犱綅
+                if (!flag) row.add("");
+            }
+            data.add(row);
+        }
+
+        List<List<String>> headList = new ArrayList<>();
+        for (String header : headers) {
+            headList.add(Collections.singletonList(header));
+        }
+
+        EasyExcel.write(response.getOutputStream())
+                .head(headList) // 璁剧疆琛ㄥご
+                .sheet("浜鸿劯鐐逛綅鍦ㄧ嚎鐜�") // 璁剧疆sheet鍚嶇О
+                .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+                .doWrite(data); // 鍐欏叆鏁版嵁
+    }
+
+    @Override
+    public void pointOnlineVideoExport(HttpServletResponse response, DataCenterQuery params) throws IOException {
+        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()));
+        }
+        Sort sort = Sort.by(
+                Sort.Order.asc("pingOnline"), // 棣栧厛鎸夌収 pingOnline 鍗囧簭鎺掑簭
+                Sort.Order.desc("offLineCount") // 棣栧厛鎸夌収 pingOnline 鍗囧簭鎺掑簭
+        );
+        // 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈�
+        query.with(sort);
+        MongoUtil.setNoPage(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> dynamicColumnVOList = dynamicColumnMapper.getDynamicColumnByTableName(TableNameConstants.COLUMN_NAME_VIDEO_POINT);
+        //鍒ゆ柇鏄惁鏈夋煡璇㈡潯浠�
+        boolean conditions = false;
+        Map<String,List<DynamicColumnVO>> groupByRefStringIdMap = new HashMap<>();
+        if (params.getDyId() != null && StringUtils.isNotEmpty(params.getDyValue())){
+            conditions = true;
+            //鑾峰緱鍔ㄦ�佸垪闆嗗悎涓寘鍚簡鐨勫瓧绗︿覆鍊肩殑闆嗗悎 鍖哄垎澶у皬鍐�
+            groupByRefStringIdMap = getDynamicByConditions(params,dynamicColumnVOList);
+        }else{
+            groupByRefStringIdMap = dynamicColumnVOList.stream().collect(Collectors.groupingBy(DynamicColumnVO::getRefStringId));
+        }
+        //鍥哄畾琛ㄥご
+        LinkedHashSet<String> headers = new LinkedHashSet<>();
+        headers.add(PointOnlineHeaders.no);
+        headers.add(PointOnlineHeaders.name);
+        headers.add(PointOnlineHeaders.ip);
+        headers.add(PointOnlineHeaders.onlineStr);
+        headers.add(PointOnlineHeaders.pingOnlineStr);
+        headers.add(PointOnlineHeaders.checkCount);
+        headers.add(PointOnlineHeaders.offLineCount);
+        headers.add(PointOnlineHeaders.offLineTimeStr);
+        headers.add(PointOnlineHeaders.mongoCreateTime);
+
+        List<String> headersList = new LinkedList<>();
+        List<String> dynamicsHeaders = dynamicColumnMapper.getHeader(TableNameConstants.COLUMN_NAME_VIDEO_POINT);
+
+        //娣诲姞鍔ㄦ�佽〃澶�
+        if (!org.springframework.util.CollectionUtils.isEmpty(dynamicsHeaders)) {
+            //浣跨敤閾捐〃淇濊瘉鍚庣画琛ュ厖鏁版嵁鏃惰幏鍙栨暟鎹『搴忎竴鑷�
+            headersList.addAll(dynamicsHeaders);
+            headers.addAll(headersList);
+        }
+
+
+        if (conditions){
+            Map<String, List<DynamicColumnVO>> finalGroupByRefStringIdMap = groupByRefStringIdMap;
+            resultList = resultList.stream()
+                    .filter(obj -> finalGroupByRefStringIdMap.containsKey(obj.getNo()))
+                    .collect(Collectors.toList());
+        }
+
+        List<List<Object>> data = new ArrayList<>();
+        for (TMonitorResult result : resultList){
+            List<Object> row = new ArrayList<>();
+            row.add(result.getNo());
+            row.add(result.getName());
+            row.add(result.getIp());
+            row.add(result.getOnlineStr());
+            row.add(result.getPingOnlineStr());
+            row.add(result.getCheckCount());
+            row.add(result.getOffLineCount());
+            if (CollectionUtils.isEmpty(result.getOffLineTimeStr())){
+                row.add(null);
+            }else {
+                row.add(result.getOffLineTimeStr().toString());
+            }
+            row.add(result.getMongoCreateTime());
+            //娣诲姞鍔ㄦ�佸垪鏁版嵁
+            for (String header : headersList){
+                boolean flag = false;
+                List<DynamicColumnVO> columnVOS = groupByRefStringIdMap.get(result.getNo());
+                if (!CollectionUtils.isEmpty(columnVOS)) {
+                    for (DynamicColumnVO columnVO : columnVOS) {
+                        if (header.equals(columnVO.getLabelValue())) {
+                            row.add(columnVO.getColumnValue());
+                            flag = true;
+                        }
+                    }
+                }
+                //娌℃壘鍒扮敤绌轰覆鍗犱綅
+                if (!flag) row.add("");
+            }
+            data.add(row);
+        }
+
+        List<List<String>> headList = new ArrayList<>();
+        for (String header : headers) {
+            headList.add(Collections.singletonList(header));
+        }
+
+        EasyExcel.write(response.getOutputStream())
+                .head(headList) // 璁剧疆琛ㄥご
+                .sheet("瑙嗛鐐逛綅鍦ㄧ嚎鐜�") // 璁剧疆sheet鍚嶇О
+                .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+                .doWrite(data); // 鍐欏叆鏁版嵁
+
+
+    }
+
+    @Override
+    public void pointOnlineCarExport(HttpServletResponse response, DataCenterQuery params) throws IOException {
+        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()));
+        }
+        Sort sort = Sort.by(
+                Sort.Order.asc("pingOnline"), // 棣栧厛鎸夌収 pingOnline 鍗囧簭鎺掑簭
+                Sort.Order.desc("offLineCount") // 棣栧厛鎸夌収 pingOnline 鍗囧簭鎺掑簭
+        );
+        // 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈�
+        query.with(sort);
+        //鍒嗛〉鏁伴噺
+        //绯荤粺ping鐨勭粨鏋�
+        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)) {
+                //鍚庣画鍙互鏀规垚閰嶇疆鐨勭绾挎鏁�(鎻愬彇鍓峮娆★紝n涓洪厤缃殑绂荤嚎娆℃暟)
+                if (offLineTime.size() > 1) {
+                    offLineTime = offLineTime.subList(0, 2);
+                }
+                item.setOffLineTimeStr(offLineTime);
+            }
+        });
+        List<DynamicColumnVO> dynamicColumnVOList = dynamicColumnMapper.getDynamicColumnByTableName(TableNameConstants.COLUMN_NAME_CAR_POINT);
+        //鍒ゆ柇鏄惁鏈夋煡璇㈡潯浠�
+        boolean conditions = false;
+        Map<String,List<DynamicColumnVO>> groupByRefStringIdMap = new HashMap<>();
+        if (params.getDyId() != null && StringUtils.isNotEmpty(params.getDyValue())){
+            conditions = true;
+            //鑾峰緱鍔ㄦ�佸垪闆嗗悎涓寘鍚簡鐨勫瓧绗︿覆鍊肩殑闆嗗悎 鍖哄垎澶у皬鍐�
+            groupByRefStringIdMap = getDynamicByConditions(params,dynamicColumnVOList);
+        }else{
+            groupByRefStringIdMap = dynamicColumnVOList.stream().collect(Collectors.groupingBy(DynamicColumnVO::getRefStringId));
+        }
+        //鍥哄畾琛ㄥご
+        LinkedHashSet<String> headers = new LinkedHashSet<>();
+        headers.add(PointOnlineHeaders.no);
+        headers.add(PointOnlineHeaders.name);
+        headers.add(PointOnlineHeaders.ip);
+        headers.add(PointOnlineHeaders.onlineStr);
+        headers.add(PointOnlineHeaders.pingOnlineStr);
+        headers.add(PointOnlineHeaders.checkCount);
+        headers.add(PointOnlineHeaders.offLineCount);
+        headers.add(PointOnlineHeaders.offLineTimeStr);
+        headers.add(PointOnlineHeaders.mongoCreateTime);
+
+        List<String> headersList = new LinkedList<>();
+        List<String> dynamicsHeaders = dynamicColumnMapper.getHeader(TableNameConstants.COLUMN_NAME_CAR_POINT);
+
+        //娣诲姞鍔ㄦ�佽〃澶�
+        if (!org.springframework.util.CollectionUtils.isEmpty(dynamicsHeaders)) {
+            //浣跨敤閾捐〃淇濊瘉鍚庣画琛ュ厖鏁版嵁鏃惰幏鍙栨暟鎹『搴忎竴鑷�
+            headersList.addAll(dynamicsHeaders);
+            headers.addAll(headersList);
+        }
+
+
+        if (conditions){
+            Map<String, List<DynamicColumnVO>> finalGroupByRefStringIdMap = groupByRefStringIdMap;
+            resultList = resultList.stream()
+                    .filter(obj -> finalGroupByRefStringIdMap.containsKey(obj.getNo()))
+                    .collect(Collectors.toList());
+        }
+
+        List<List<Object>> data = new ArrayList<>();
+        for (TMonitorResult result : resultList){
+            List<Object> row = new ArrayList<>();
+            row.add(result.getNo());
+            row.add(result.getName());
+            row.add(result.getIp());
+            row.add(result.getOnlineStr());
+            row.add(result.getPingOnlineStr());
+            row.add(result.getCheckCount());
+            row.add(result.getOffLineCount());
+            if (CollectionUtils.isEmpty(result.getOffLineTimeStr())){
+                row.add(null);
+            }else {
+                row.add(result.getOffLineTimeStr().toString());
+            }
+            row.add(result.getMongoCreateTime());
+            //娣诲姞鍔ㄦ�佸垪鏁版嵁
+            for (String header : headersList){
+                boolean flag = false;
+                List<DynamicColumnVO> columnVOS = groupByRefStringIdMap.get(result.getNo());
+                if (!CollectionUtils.isEmpty(columnVOS)) {
+                    for (DynamicColumnVO columnVO : columnVOS) {
+                        if (header.equals(columnVO.getLabelValue())) {
+                            row.add(columnVO.getColumnValue());
+                            flag = true;
+                        }
+                    }
+                }
+                //娌℃壘鍒扮敤绌轰覆鍗犱綅
+                if (!flag) row.add("");
+            }
+            data.add(row);
+        }
+
+        List<List<String>> headList = new ArrayList<>();
+        for (String header : headers) {
+            headList.add(Collections.singletonList(header));
+        }
+
+        EasyExcel.write(response.getOutputStream())
+                .head(headList) // 璁剧疆琛ㄥご
+                .sheet("杞﹁締鐐逛綅鍦ㄧ嚎鐜�") // 璁剧疆sheet鍚嶇О
+                .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+                .doWrite(data); // 鍐欏叆鏁版嵁
     }
 
     @Override
@@ -212,6 +632,50 @@
 
     }
 
+    //zxl
+    @Override
+    public BigDecimal videoPointOnlineRateCount(DataCenterQuery 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;
+        }
+        BigDecimal onlineRate = BigDecimal.ZERO;
+        if (totalCount!=0) {
+            onlineRate = new BigDecimal(onlineCount).divide(new BigDecimal(totalCount), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
+        }
+        return onlineRate;
+    }
+
     /**
      * 瑙嗛锛氱偣浣嶅湪绾跨巼
      *
@@ -238,6 +702,7 @@
         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("鏈煡");
@@ -260,7 +725,12 @@
                 }
                 item.setOffLineTimeStr(offLineTime);
             }
+            //娣诲姞鍔ㄦ�佹暟鎹�
+            List<DynamicColumnVO> list = dynamicColumnMapper.getDynamicColumnByTable(TableNameConstants.COLUMN_NAME_VIDEO_POINT,item.getNo());
+            item.setDynamicColumnList(list);
         });
+
+
         params.setDeptTag(-1);
         params.setDeviceType(1);
 
@@ -929,44 +1399,38 @@
         return Result.ok().data(map).total(total);
     }
 
-    /**
-     * 瑙嗛锛氬綍鍍忓彲鐢ㄧ巼
-     *
-     * @param params
-     * @return
-     */
-    @Override
+    private final ISysConfigService configService;
 
-    public Result videoAvailabilityRate(DataCenterQuery params) {
-        List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
-        Query query = MongoUtil.getQuery(params, "createTime", likeFileds, null);
-        //涓嬫媺妗嗗綍鍍忔儏鍐垫煡璇㈡潯浠�
-        if (params.getOption() != null) {
-            query.addCriteria(Criteria.where("recordStatus").is(params.getOption()));
+    public double getSySMinTime(){
+        //鑾峰彇绯荤粺鍙傛暟
+        String dictLabel =  configService.selectConfigByKey("recording_min_time");
+        double recordingMinTime;
+        try {
+            recordingMinTime = Double.parseDouble(dictLabel) / 60; // 濡傛灉 dictLabel 鏄互灏忔椂涓哄崟浣嶏紝鍒欐棤闇�闄や互 60
+        } catch (Exception e) {
+            log.error("閰嶇疆鐨勫垹闄ゆ椂闂磋寖鍥存牸寮忎笉姝g‘: {}", dictLabel, e);
+            return  12.0; // 榛樿 12 灏忔椂锛堜互灏忔椂涓哄崟浣嶏級
         }
-        long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
-        MongoUtil.setPage(query, params, "createTime");
-        List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
-        //鏌ヨ鍔ㄦ�佸垪鏁版嵁
-        //鏌ヨ鍔ㄦ�佸垪鏁版嵁鏇村叿id鏌ヨ
-//        List<DynamicColumnVO> dynamicColumnNames = dynamicColumnMapper.getDynamicColumnByTableName("uy_record_meta_d_sum");
-        //缈昏瘧琛屾斂鍖哄煙
-        resultList.forEach(item -> {
-            String areaCode = item.getArealayername().substring(0, 6);
-            AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromCode(areaCode);
-            if (areaDeptEnum != null) item.setArealayername(areaDeptEnum.getName());
 
-            List<DynamicColumnVO> list = dynamicColumnMapper.getDynamicColumnByTable("uy_record_meta_d_sum",item.getId());
-            item.setDynamicColumnList(list);
+        return recordingMinTime;
+    }
+    private final TMonitorMapper tMonitorMapper;
 
-        });
+    //zxl
+    @Override
+    public BigDecimal videoAvailabilityRateCount(DataCenterQuery params){
+        System.out.println("------------------------------------------------------------------------------------");
+        System.out.println(params);
         // 缁熻鏁伴噺
+        List<String> noString = tMonitorMapper.getIdListVideo();
         MongoDatabase database = mongoTemplate.getDb();
         MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum");
         List<Integer> status = Arrays.asList(1, 0, -1);
         List<String> resultCount = status.stream().map(item -> {
             List<Document> dList = new ArrayList<>(2);
+
             dList.add(new Document("recordStatus", new Document("$eq", item)));
+            dList.add(new Document("no", new Document("$in", noString)));
             setTag(params, dList);
             Document filter = new Document("$and", dList);
             // 鏋勫缓鑱氬悎绠¢亾
@@ -985,19 +1449,35 @@
             }
             return uniqueDeviceIdCount + "";
         }).collect(Collectors.toList());
-//        List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
-//                .select(CheckIndexVideo::getVideoAvailable)
-//                .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::getVideoAvailable).reduce(BigDecimal.ZERO, BigDecimal::add);
-//            BigDecimal count = BigDecimal.valueOf(videoList.size());
-//            onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
-//        }
-        //鍔犱竴涓�绘暟
+
+        //璁$畻褰曞儚鍙敤鐜�
+        MongoDatabase databaes2 = mongoTemplate.getDb();
+        MongoCollection<Document> collection2 = databaes2.getCollection("uy_record_meta_d_sum");
+
+        double finalRecordingMinTime = getSySMinTime();
+
+        List<Document> documentList = new ArrayList<>(2);
+        documentList.add(new Document("no", new Document("$in", noString)));
+        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 鍙細浜х敓涓�涓粨鏋�
+        }
         int totalCount = 0;
         for (String s : resultCount) {
             totalCount += Integer.parseInt(s);
@@ -1007,13 +1487,126 @@
         BigDecimal onlineRate = BigDecimal.ZERO;
 //        1锛氬畬鏁� 0锛氶棿姝� -1锛氬紓甯� |
         if (!StringUtils.isEmpty(resultCount.get(0)) && !"0".equals(resultCount.get(0))) {
-            //resultCount.get(0)
-            onlineRate = new BigDecimal(resultCount.get(1)).divide(new BigDecimal(resultCount.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
+            //resultCount.get(0)鏄�绘暟 uniqueDeviceIdCount鏄洿鍏风郴缁熷弬鏁版煡璇㈠埌mongodb涓ぇ浜庣瓑浜� recordDuration瀛楁鐨勬�绘暟
+            onlineRate = new BigDecimal(uniqueDeviceIdCount).divide(new BigDecimal(resultCount.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
+        }
+        System.out.println(resultCount);
+        System.out.println(onlineRate);
+        return onlineRate;
+    }
+
+
+
+
+    /**
+     * 瑙嗛锛氬綍鍍忓彲鐢ㄧ巼
+     *
+     * @param params
+     * @return
+     */
+    @Override
+    public Result videoAvailabilityRate(DataCenterQuery params) {
+        List<String> noString = tMonitorMapper.getIdListVideo();
+
+        List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
+        Query 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()));
+        }
+        long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
+        MongoUtil.setPage(query, params, "createTime");
+
+        List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
+        //鏌ヨ鍔ㄦ�佸垪鏁版嵁
+        //鏌ヨ鍔ㄦ�佸垪鏁版嵁鏇村叿id鏌ヨ
+//        List<DynamicColumnVO> dynamicColumnNames = dynamicColumnMapper.getDynamicColumnByTableName("uy_record_meta_d_sum");
+        //缈昏瘧琛屾斂鍖哄煙
+        resultList.forEach(item -> {
+            String areaCode = item.getArealayername().substring(0, 6);
+            AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromCode(areaCode);
+            if (areaDeptEnum != null) item.setArealayername(areaDeptEnum.getName());
+
+            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);
+        List<String> resultCount = status.stream().map(item -> {
+            List<Document> dList = new ArrayList<>(2);
+
+            dList.add(new Document("recordStatus", new Document("$eq", item)));
+            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);
+        documentList.add(new Document("no", new Document("$in", noString)));
+        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<>();
-        log.error("resultCount:{}",resultCount.get(3));
         map.put("count", resultCount);
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
@@ -1069,6 +1662,35 @@
             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);
+        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)
@@ -1089,7 +1711,7 @@
         resultCount.add(0, totalCount + "");
         BigDecimal onlineRate = BigDecimal.ZERO;
         if (!StringUtils.isEmpty(resultCount.get(0)) && !"0".equals(resultCount.get(0))) {
-            onlineRate = new BigDecimal(resultCount.get(1)).divide(new BigDecimal(resultCount.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
+            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<>();
@@ -1148,6 +1770,32 @@
             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);
+        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)
@@ -1168,7 +1816,7 @@
         resultCount.add(0, totalCount + "");
         BigDecimal onlineRate = BigDecimal.ZERO;
         if (!StringUtils.isEmpty(resultCount.get(0)) && !"0".equals(resultCount.get(0))) {
-            onlineRate = new BigDecimal(resultCount.get(1)).divide(new BigDecimal(resultCount.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
+            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<>();
@@ -1712,6 +2360,9 @@
                 }
                 item.setOffLineTimeStr(offLineTime);
             }
+            //娣诲姞鍔ㄦ�佹暟鎹�
+            List<DynamicColumnVO> list = dynamicColumnMapper.getDynamicColumnByTable(TableNameConstants.COLUMN_NAME_CAR_POINT,item.getNo());
+            item.setDynamicColumnList(list);
         });
 
         // 缁熻璁惧鏁伴噺
@@ -2583,6 +3234,9 @@
                 }
                 item.setOffLineTimeStr(offLineTime);
             }
+            //娣诲姞鍔ㄦ�佹暟鎹�
+            List<DynamicColumnVO> list = dynamicColumnMapper.getDynamicColumnByTable(TableNameConstants.COLUMN_NAME_FACE_POINT,item.getNo());
+            item.setDynamicColumnList(list);
         });
         params.setDeptTag(-1);
         params.setDeviceType(3);

--
Gitblit v1.8.0