From e9af9f5cfeddbe5c0b33a3060b8ea6364c51e744 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 15 十一月 2024 11:37:10 +0800
Subject: [PATCH] 白名单故障类型

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java |  900 +++++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 649 insertions(+), 251 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 fb05624..781bf2b 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
@@ -13,8 +13,11 @@
 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.DataCenter.BigPicUsefulVO;
 import com.ycl.platform.domain.vo.DataCenter.MonitorQualifyResultVO;
+import com.ycl.platform.domain.vo.DataCenter.SnapClockVO;
 import com.ycl.platform.domain.vo.PointDetailVO;
+import com.ycl.platform.domain.vo.home.HomeFaceVO;
 import com.ycl.platform.mapper.ImageResourceSecurityDetailMapper;
 import com.ycl.platform.mapper.YwPointMapper;
 import com.ycl.platform.service.*;
@@ -40,7 +43,9 @@
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 /**
@@ -81,8 +86,12 @@
         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.by(Sort.Order.asc("pingOnline")));
+        query.with(sort);
         //鍒嗛〉鏁伴噺
         long total = mongoTemplate.count(query, TMonitorResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -101,6 +110,14 @@
                 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);
             }
         });
         params.setDeptTag(-1);
@@ -609,10 +626,8 @@
         setTag(params,dList2);
         Document qualifyFilter = new Document("$and",dList2);
         //涓嶅悎鏍兼暟
-        Document mongoCreateTimeRange = new Document()
-                .append("$gte", params.getStartTime())
-                .append("$lt", params.getEndTime());
-        Document mongoCreateTime = new Document("mongoCreateTime", mongoCreateTimeRange);
+        List<Document> dList3  = new ArrayList<>(2);
+        setTag(params,dList3);
         List<Document> errorConditions = new ArrayList<>();
         errorConditions.add(new Document("serialNumber.error", new Document("$eq", Boolean.TRUE)));
         errorConditions.add(new Document("name.error", new Document("$eq", Boolean.TRUE)));
@@ -627,7 +642,8 @@
         errorConditions.add(new Document("sxjcjqy.error", new Document("$eq", Boolean.TRUE)));
         errorConditions.add(new Document("sxjgnlx.error", new Document("$eq", Boolean.TRUE)));
         Document errorFilter = new Document("$or", errorConditions);
-        Document unQualifyFilter = new Document("$and", Arrays.asList(mongoCreateTime, errorFilter));
+        dList3.add(errorFilter);
+        Document unQualifyFilter = new Document("$and", dList3);
 
         List<Document> lists = Arrays.asList(totalFilter, qualifyFilter, unQualifyFilter);
         List<String> rList = lists.stream().map(filter -> {
@@ -1003,7 +1019,7 @@
     @Override
     public Result videoImportantPointLabelingAccuracy(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("deviceNo", "osdName");
-        List<Criteria> andCriteria = MongoUtil.getAndCriteria(params, "checkTime", likeFileds, 3);
+        List<Criteria> andCriteria = MongoUtil.getAndCriteria(params, "checkTime", likeFileds, null);
         Query query = new Query();
         Criteria and = new Criteria();
         and.andOperator(andCriteria);
@@ -1065,11 +1081,10 @@
         setTag(params, dList1);
         Document osdCorrectFilter = new Document("$and", dList1);
         //寮傚父鏁�
+        List<Document> dList2 = new ArrayList<>(2);
+        setTag(params,dList2);
         Document importantTagCondition = new Document("importantTag", Boolean.TRUE);
-        Document mongoCreateTimeRange = new Document()
-                .append("$gte", params.getStartTime())
-                .append("$lt", params.getEndTime());
-        Document mongoCreateTime = new Document("mongoCreateTime", mongoCreateTimeRange);
+        dList2.add(importantTagCondition);
         List<Document> errorConditions = new ArrayList<>();
         errorConditions.add(new Document("osdNameCorrect", new Document("$eq", -1)));
         errorConditions.add(new Document("osdTimeCorrect", new Document("$eq", -1)));
@@ -1077,8 +1092,12 @@
         errorConditions.add(new Document("osdCityCorrect", new Document("$eq", -1)));
         errorConditions.add(new Document("osdPartCorrect", new Document("$eq", -1)));
         Document errorFilter = new Document("$or", errorConditions);
-        Document osdErrorFilter = new Document("$and", Arrays.asList(importantTagCondition,mongoCreateTime, errorFilter));
+        dList2.add(errorFilter);
+        Document osdErrorFilter = new Document("$and", dList2);
         //TODO锛氭湭鐭ユ暟  鏂板0鐨勭姸鎬�
+        List<Document> dList3 = new ArrayList<>(2);
+        setTag(params,dList3);
+        dList3.add(importantTagCondition);
         List<Document> unknownConditions = new ArrayList<>();
         unknownConditions.add(new Document("osdNameCorrect", new Document("$eq", 0)));
         unknownConditions.add(new Document("osdTimeCorrect", new Document("$eq", 0)));
@@ -1087,7 +1106,8 @@
         unknownConditions.add(new Document("osdPartCorrect", new Document("$eq", 0)));
         // 浣跨敤$or閫昏緫缁勫悎鍓╀綑鐨勬潯浠�
         Document unknownFilter = new Document("$or", unknownConditions);
-        Document osdUnknownFilter = new Document("$and", Arrays.asList(importantTagCondition, mongoCreateTime,unknownFilter));
+        dList3.add(unknownFilter);
+        Document osdUnknownFilter = new Document("$and", dList3);
 
         List<Document> lists = Arrays.asList(osdFilter, osdCorrectFilter, osdErrorFilter,osdUnknownFilter);
         List<String> rList = lists.stream().map(filter -> {
@@ -1200,11 +1220,10 @@
         setTag(params, dList1);
         Document osdCorrectFilter = new Document("$and", dList1);
         //寮傚父鏁�
+        List<Document> dList2 = new ArrayList<>(2);
+        setTag(params,dList2);
         Document importantTagCondition = new Document("importantTag", Boolean.TRUE);
-        Document mongoCreateTimeRange = new Document()
-                .append("$gte", params.getStartTime())
-                .append("$lt", params.getEndTime());
-        Document mongoCreateTime = new Document("mongoCreateTime", mongoCreateTimeRange);
+        dList2.add(importantTagCondition);
         List<Document> errorConditions = new ArrayList<>();
         errorConditions.add(new Document("osdNameCorrect", new Document("$eq", -1)));
         errorConditions.add(new Document("osdTimeCorrect", new Document("$eq", -1)));
@@ -1212,8 +1231,12 @@
         errorConditions.add(new Document("osdCityCorrect", new Document("$eq", -1)));
         errorConditions.add(new Document("osdPartCorrect", new Document("$eq", -1)));
         Document errorFilter = new Document("$or", errorConditions);
-        Document osdErrorFilter = new Document("$and", Arrays.asList(importantTagCondition,mongoCreateTime, errorFilter));
+        dList2.add(errorFilter);
+        Document osdErrorFilter = new Document("$and", dList2);
         //TODO锛氭湭鐭ユ暟  鏂板0鐨勭姸鎬�
+        List<Document> dList3 = new ArrayList<>(2);
+        setTag(params,dList3);
+        dList3.add(importantTagCondition);
         List<Document> unknownConditions = new ArrayList<>();
         unknownConditions.add(new Document("osdNameCorrect", new Document("$eq", 0)));
         unknownConditions.add(new Document("osdTimeCorrect", new Document("$eq", 0)));
@@ -1222,7 +1245,8 @@
         unknownConditions.add(new Document("osdPartCorrect", new Document("$eq", 0)));
         // 浣跨敤$or閫昏緫缁勫悎鍓╀綑鐨勬潯浠�
         Document unknownFilter = new Document("$or", unknownConditions);
-        Document osdUnknownFilter = new Document("$and", Arrays.asList(importantTagCondition, mongoCreateTime,unknownFilter));
+        dList3.add(unknownFilter);
+        Document osdUnknownFilter = new Document("$and", dList3);
 
         List<Document> lists = Arrays.asList(osdFilter, osdCorrectFilter, osdErrorFilter,osdUnknownFilter);
         List<String> rList = lists.stream().map(filter -> {
@@ -1273,36 +1297,39 @@
     public Result vehicleViewDockStable(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
         Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
-
+        //鍔燚ataType涓鸿溅杈�
+        query.addCriteria(Criteria.where("dataType").is(ApiConstants.HK_DataType_CAR));
+        if(params.getOption()!=null){
+            if(ApiConstants.HK_SnapCount_ResultType_Normal.equals(params.getOption())) {
+                query.addCriteria(Criteria.where("resultType").is(ApiConstants.HK_SnapCount_ResultType_Normal));
+            }else if(ApiConstants.HK_SnapCount_ResultType_Null.equals(params.getOption())){
+                query.addCriteria(Criteria.where("resultType").is(ApiConstants.HK_SnapCount_ResultType_Null));
+            }else if(ApiConstants.HK_SnapCount_ResultType_Descent.equals(params.getOption())){
+                query.addCriteria(Criteria.where("resultType").is(ApiConstants.HK_SnapCount_ResultType_Descent));
+            }else if(ApiConstants.HK_SnapCount_ResultType_Low.equals(params.getOption())){
+                query.addCriteria(Criteria.where("resultType").is(ApiConstants.HK_SnapCount_ResultType_Low));
+            }
+        }
         long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
         List<SnapshotDataMonitorResult> resultList = mongoTemplate.find(query, SnapshotDataMonitorResult.class);
-
+        resultList.forEach(item ->item.setResultTypeText(item.getResultTypeText()));
         // 缁熻鏁伴噺
         MongoDatabase database = mongoTemplate.getDb();
         MongoCollection<Document> collection = database.getCollection("hk_snapshot_data_monitor");
 
-        List<Document> dList1 = new ArrayList<>(2);
-        dList1.add(new Document("importantTag", Boolean.TRUE));
-        dList1.add(new Document("resultType", new Document("$eq", 1)));
-        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)));
+        dList2.add(new Document("resultType", new Document("$eq", 1)));
+        dList2.add(new Document("dataType", new Document("$eq", ApiConstants.HK_DataType_CAR)));
         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)));
+        dList3.add(new Document("resultType", new Document("$eq", 2)));
+        dList3.add(new Document("dataType", new Document("$eq", ApiConstants.HK_DataType_CAR)));
         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)));
-        setTag(params, dList4);
-        Document normalFilter = new Document("$and", dList1);
+
         Document noDataFilter = new Document("$and", dList2);
         Document trFilter = new Document("$and", dList3);
-        Document littleFilter = new Document("$and", dList4);
-        List<Document> lists = Arrays.asList(normalFilter, noDataFilter, trFilter, littleFilter);
+        List<Document> lists = Arrays.asList(noDataFilter, trFilter);
         List<String> rList = lists.stream().map(filter -> {
             // 鏋勫缓鑱氬悎绠￠亾
             List<Document> pipeline = Arrays.asList(
@@ -1320,17 +1347,32 @@
             }
             return uniqueDeviceIdCount + "";
         }).collect(Collectors.toList());
-
-        Date now = new Date();
-        List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
+        // 鏋勫缓鍩烘湰鐨�$match鏉′欢
+        List<Document> matchConditions = new ArrayList<>();
+        setTag(params, matchConditions);
+        matchConditions.add(new Document("dataType", new Document("$eq", ApiConstants.HK_DataType_CAR)));
+        List<Document> pipeline = Arrays.asList(
+                new Document("$match", new Document("$and", matchConditions)),
+                new Document("$group", new Document("_id", "$mongoCreateTime")
+                        .append("dataCount", new Document("$sum", "$dataCount"))
+                ));
+        // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+        AggregateIterable<Document> result = collection.aggregate(pipeline);
+        int dataCount = 0;
+        for (Document doc : result) {
+            dataCount = doc.getInteger("dataCount");
+        }
+        rList.add(0,dataCount+"");
+        List<CheckIndexCar> carList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
                 .select(CheckIndexCar::getViewConnectStability)
                 .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
-                .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+                .eq(params.getDataType().equals(2), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Dept)
+                .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
                 .list();
         BigDecimal onlineRate = BigDecimal.ZERO;
-        if (CollectionUtils.isNotEmpty(videoList)) {
-            BigDecimal sum = videoList.stream().map(CheckIndexCar::getViewConnectStability).reduce(BigDecimal.ZERO, BigDecimal::add);
-            BigDecimal count = BigDecimal.valueOf(videoList.size());
+        if (CollectionUtils.isNotEmpty(carList)) {
+            BigDecimal sum = carList.stream().map(CheckIndexCar::getViewConnectStability).reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal count = BigDecimal.valueOf(carList.size());
             onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
         }
         rList.add(this.remove0(onlineRate));
@@ -1356,8 +1398,12 @@
         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.by(Sort.Order.asc("pingOnline")));
+        query.with(sort);
         //鍒嗛〉鏁伴噺
         long total = mongoTemplate.count(query, TMonitorResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -1379,6 +1425,14 @@
                 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);
             }
         });
 
@@ -1445,33 +1499,45 @@
     @Override
     public Result vehicleNetDeviceDirectoryConsistency(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("ip.showValue", "name.showValue", "serialNumber.showValue");
-        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
-
+        List<Criteria> andCriteria = MongoUtil.getAndCriteria(params, TIME_FIELD, likeFileds, null);
+        // 1/2/3 瑙嗛/杞﹁締/浜鸿劯
+        Pattern pattern = Pattern.compile(".*2.*");
+        andCriteria.add(Criteria.where("sxjgnlx.value").regex(pattern));
+        Query query = new Query();
+        Criteria and = new Criteria();
+        if(params.getOption()!=null){
+            if(params.getOption() ==1){
+                andCriteria.add(Criteria.where("newDevice").is(Boolean.TRUE));
+            }else if(params.getOption() ==-1){
+                andCriteria.add(Criteria.where("newDevice").is(Boolean.FALSE));
+            }
+        }
+        and.andOperator(andCriteria);
+        query = Query.query(and);
         long total = mongoTemplate.count(query, MonitorQualifyResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
         List<MonitorQualifyResult> resultList = mongoTemplate.find(query, MonitorQualifyResult.class);
-
-        // 缁熻鏁伴噺
+        List<MonitorQualifyResultVO> resultVOS = new ArrayList<>();
+        for (MonitorQualifyResult result : resultList) {
+            MonitorQualifyResultVO vo = MonitorQualifyResult.getVO(result);
+            resultVOS.add(vo);
+        }
+        //缁熻鏁伴噺
         MongoDatabase database = mongoTemplate.getDb();
         MongoCollection<Document> collection = database.getCollection("uy_monitor_qualify");
-
+        //鎬绘暟
         List<Document> dList1 = new ArrayList<>(2);
-        dList1.add(new Document("ip.error", new Document("$eq", Boolean.TRUE)));
         setTag(params, dList1);
+        dList1.add(new Document("sxjgnlx.value", new Document("$regex", ".*2.*")));
+        Document totalFilter = new Document("$and",dList1);
+        //鏂拌澶囨暟
         List<Document> dList2 = new ArrayList<>(2);
-        dList2.add(new Document("macdz.error", 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)));
-        setTag(params, dList3);
-        List<Document> dList4 = new ArrayList<>(2);
-        dList4.add(new Document("longitude.error", 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);
-        Document longitudeErrFilter = new Document("$and", dList4);
-        List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter);
+        dList2.add(new Document("sxjgnlx.value", new Document("$regex", ".*2.*")));
+        dList2.add(new Document("newDevice",Boolean.TRUE));
+        Document newFilter = new Document("$and",dList2);
+
+        List<Document> lists = Arrays.asList(totalFilter, newFilter);
         List<String> rList = lists.stream().map(filter -> {
             // 鏋勫缓鑱氬悎绠￠亾
             List<Document> pipeline = Arrays.asList(
@@ -1490,11 +1556,11 @@
             return uniqueDeviceIdCount + "";
         }).collect(Collectors.toList());
 
-        Date now = new Date();
         List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
                 .select(CheckIndexCar::getDeviceDirectoryConsistent)
                 .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
-                .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+                .eq(params.getDataType().equals(2), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Dept)
+                .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
                 .list();
         BigDecimal onlineRate = BigDecimal.ZERO;
         if (CollectionUtils.isNotEmpty(videoList)) {
@@ -1505,7 +1571,7 @@
         rList.add(this.remove0(onlineRate));
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", rList);
-        map.put("list", resultList);
+        map.put("list", resultVOS);
         return Result.ok().data(map).total(total);
     }
 
@@ -1518,7 +1584,23 @@
     @Override
     public Result vehicleCollectionConsistency(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "crossName");
-        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+        List<Criteria> andCriteria = MongoUtil.getAndCriteria(params, TIME_FIELD, likeFileds, null);
+        Query query = new Query();
+        Criteria and = new Criteria();
+        and.andOperator(andCriteria);
+        query = Query.query(and);
+        if(params.getOption()!=null){
+            if(params.getOption() ==1){
+                query.addCriteria(Criteria.where("lalType").is(ApiConstants.HK_Info_LayType_Normal));
+                query.addCriteria(Criteria.where("gbCodeType").is(ApiConstants.HK_Info_GbCodeType_Normal));
+            }else if(params.getOption() ==-1){
+                Criteria lalType = Criteria.where("lalType").ne(ApiConstants.HK_Info_LayType_Normal);
+                Criteria gbCodeType = Criteria.where("gbCodeType").ne(ApiConstants.HK_Info_GbCodeType_Normal);
+                Criteria orOperator = new Criteria().orOperator(lalType, gbCodeType);
+                orOperator.andOperator(andCriteria);
+                query = Query.query(orOperator);
+            }
+        }
 
         long total = mongoTemplate.count(query, CrossDetailResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -1529,23 +1611,23 @@
         MongoCollection<Document> collection = database.getCollection("hk_cross_detail");
 
         List<Document> dList1 = new ArrayList<>(2);
-        dList1.add(new Document("lalType", new Document("$eq", 1)));
         setTag(params, dList1);
         List<Document> dList2 = new ArrayList<>(2);
-        dList2.add(new Document("lalType", new Document("$eq", 2)));
+        dList2.add(new Document("lalType", new Document("$eq", 1)));
+        dList2.add(new Document("gbCodeType", new Document("$eq", 1)));
         setTag(params, dList2);
         List<Document> dList3 = new ArrayList<>(2);
-        dList3.add(new Document("lalType", new Document("$eq", 3)));
         setTag(params, dList3);
-        List<Document> dList4 = new ArrayList<>(2);
-        dList4.add(new Document("lalType", new Document("$eq", 4)));
-        setTag(params, dList4);
-        Document ipErrFilter = new Document("$and", dList1);
-        Document macdzErrFilter = new Document("$and", dList2);
-        Document latitudeErrFilter = new Document("$and", dList3);
-        Document longitudeErrFilter = new Document("$and", dList4);
+        List<Document> errorConditions = new ArrayList<>();
+        errorConditions.add(new Document("lalType",new Document("$ne",1)));
+        errorConditions.add(new Document("gbCodeType",new Document("$ne",1)));
+        Document errorDoc = new Document("$or",errorConditions);
+        dList3.add(errorDoc);
+        Document totalFilter = new Document("$and", dList1);
+        Document correctFilter = new Document("$and", dList2);
+        Document errorFilter = new Document("$and", dList3);
 
-        List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter);
+        List<Document> lists = Arrays.asList(totalFilter, correctFilter, errorFilter);
         List<String> rList = lists.stream().map(filter -> {
             // 鏋勫缓鑱氬悎绠￠亾
             List<Document> pipeline = Arrays.asList(
@@ -1564,11 +1646,11 @@
             return uniqueDeviceIdCount + "";
         }).collect(Collectors.toList());
 
-        Date now = new Date();
         List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
                 .select(CheckIndexCar::getVehicleInformationCollectionAccuracy)
                 .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
-                .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+                .eq(params.getDataType().equals(2), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Dept)
+                .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
                 .list();
         BigDecimal onlineRate = BigDecimal.ZERO;
         if (CollectionUtils.isNotEmpty(videoList)) {
@@ -1593,7 +1675,15 @@
     public Result vehicleCollectionDataIntegrity(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
         Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
-
+        if(params.getOption()!=null){
+            //涓昏灞炴�т笉瀹屾暣
+            if(params.getOption()==1){
+                 query.addCriteria(Criteria.where("noIntegrityCount").gt(0));
+            }else if(params.getOption()==-1){
+                //灞炴�т笉瀹屾暣
+                query.addCriteria(Criteria.where("mainNoIntegrityCount").gt(0));
+            }
+        }
         long total = mongoTemplate.count(query, DataIntegrityMonitoringResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
         List<DataIntegrityMonitoringResult> resultList = mongoTemplate.find(query, DataIntegrityMonitoringResult.class);
@@ -1602,11 +1692,33 @@
         MongoDatabase database = mongoTemplate.getDb();
         MongoCollection<Document> collection = database.getCollection("hk_data_integrity_monitoring");
 
-        Date now = new Date();
+        //鎶撴媿閲忔眰鍜�
+        // 鏋勫缓鍩烘湰鐨�$match鏉′欢
+        List<Document> matchConditions = new ArrayList<>();
+        setTag(params, matchConditions);
+        List<Document> pipeline = Arrays.asList(
+                new Document("$match", new Document("$and", matchConditions)),
+                new Document("$group", new Document("_id", "$mongoCreateTime")
+                        .append("dataCount", new Document("$sum", "$dataCount"))
+                        .append("noIntegrityCount", new Document("$sum", "$noIntegrityCount"))
+                        .append("mainNoIntegrityCount", new Document("$sum", "$mainNoIntegrityCount"))
+                ));
+        // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+        AggregateIterable<Document> result = collection.aggregate(pipeline);
+        int dataCount = 0;
+        int noIntegrityCount = 0;
+        int mainNoIntegrityCount = 0;
+        for (Document doc : result) {
+            dataCount = doc.getInteger("dataCount");
+            noIntegrityCount = doc.getInteger("noIntegrityCount");
+            mainNoIntegrityCount = doc.getInteger("mainNoIntegrityCount");
+        }
+
         List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
                 .select(CheckIndexCar::getVehicleCaptureIntegrity)
                 .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
-                .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+                .eq(params.getDataType().equals(2), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Dept)
+                .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
                 .list();
         BigDecimal onlineRate = BigDecimal.ZERO;
         if (CollectionUtils.isNotEmpty(videoList)) {
@@ -1614,9 +1726,13 @@
             BigDecimal count = BigDecimal.valueOf(videoList.size());
             onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
         }
-
+        List<String> countList = new ArrayList<>();
+        countList.add(dataCount+"");
+        countList.add(noIntegrityCount+"");
+        countList.add(mainNoIntegrityCount+"");
+        countList.add(this.remove0(onlineRate));
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", Arrays.asList(this.remove0(onlineRate)));
+        map.put("count", countList);
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -1631,16 +1747,49 @@
     public Result vehicleCollectionDataCaptured(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
         Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
-
+        if(params.getOption()!=null){
+            //涓昏灞炴�т笉涓�鑷�
+            if(params.getOption()==1){
+                query.addCriteria(Criteria.where("majorDiffCount").gt(0));
+            }else if(params.getOption()==-1){
+                //閲嶈灞炴�т笉涓�鑷�
+                query.addCriteria(Criteria.where("importantDiffCount").gt(0));
+            }
+        }
         long total = mongoTemplate.count(query, AttrRecognitionMonitorResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
         List<AttrRecognitionMonitorResult> resultList = mongoTemplate.find(query, AttrRecognitionMonitorResult.class);
 
-        Date now = new Date();
+        // 缁熻鏁伴噺
+        MongoDatabase database = mongoTemplate.getDb();
+        MongoCollection<Document> collection = database.getCollection("hk_attr_recognition_monitor");
+
+        // 鏋勫缓鍩烘湰鐨�$match鏉′欢
+        List<Document> matchConditions = new ArrayList<>();
+        setTag(params, matchConditions);
+        List<Document> pipeline = Arrays.asList(
+                new Document("$match", new Document("$and", matchConditions)),
+                new Document("$group", new Document("_id", "$mongoCreateTime")
+                        .append("sampleCount", new Document("$sum", "$sampleCount"))
+                        .append("majorDiffCount", new Document("$sum", "$majorDiffCount"))
+                        .append("importantDiffCount", new Document("$sum", "$importantDiffCount"))
+                ));
+        // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+        AggregateIterable<Document> result = collection.aggregate(pipeline);
+        int sampleCount = 0;
+        int majorDiffCount = 0;
+        int importantDiffCount = 0;
+        for (Document doc : result) {
+            sampleCount = doc.getInteger("sampleCount");
+            majorDiffCount = doc.getInteger("majorDiffCount");
+            importantDiffCount = doc.getInteger("importantDiffCount");
+        }
+
         List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
                 .select(CheckIndexCar::getVehicleCaptureAccuracy)
                 .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
-                .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+                .eq(params.getDataType().equals(2), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Dept)
+                .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
                 .list();
         BigDecimal onlineRate = BigDecimal.ZERO;
         if (CollectionUtils.isNotEmpty(videoList)) {
@@ -1648,8 +1797,14 @@
             BigDecimal count = BigDecimal.valueOf(videoList.size());
             onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
         }
+
+        List<String> countList = new ArrayList<>();
+        countList.add(sampleCount+"");
+        countList.add(majorDiffCount+"");
+        countList.add(importantDiffCount+"");
+        countList.add(this.remove0(onlineRate));
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", Arrays.asList(this.remove0(onlineRate)));
+        map.put("count", countList);
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -1664,30 +1819,46 @@
     public Result vehicleClockAccuracy(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
         Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
-
+        if(params.getOption()!=null){
+            //褰撴棩鏃堕挓寮傚父
+            if(params.getOption()==1){
+                query.addCriteria(Criteria.where("majorDiffCount").gt(0));
+            }else if(params.getOption()==-1){
+                //鍏ㄩ儴鏃堕挓寮傚父
+                query.addCriteria(Criteria.where("importantDiffCount").gt(0));
+            }
+        }
         long total = mongoTemplate.count(query, VehicleDeviceInspectionResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
         List<VehicleDeviceInspectionResult> resultList = mongoTemplate.find(query, VehicleDeviceInspectionResult.class);
-
+        List<SnapClockVO> resultVos = new ArrayList<>();
+        resultList.forEach(item->{
+            SnapClockVO vo = VehicleDeviceInspectionResult.getVO(item);
+            resultVos.add(vo);
+        });
 
         // 缁熻鏁伴噺
         MongoDatabase database = mongoTemplate.getDb();
         MongoCollection<Document> collection = database.getCollection("hk_vehicle_device_inspection");
 
         List<Document> dList1 = new ArrayList<>(2);
-        dList1.add(new Document("snapResult", new Document("$eq", 1)));
+        dList1.add(new Document("snapClock.todayClockResult", new Document("$eq", 1)));
         setTag(params, dList1);
         List<Document> dList2 = new ArrayList<>(2);
-        dList2.add(new Document("snapResult", new Document("$eq", 2)));
+        dList2.add(new Document("snapClock.todayClockResult", new Document("$eq", 0)));
         setTag(params, dList2);
         List<Document> dList3 = new ArrayList<>(2);
-        dList3.add(new Document("snapResult", new Document("$eq", 4)));
+        dList3.add(new Document("snapClock.allClockResult", new Document("$eq", 1)));
         setTag(params, dList3);
-        Document ipErrFilter = new Document("$and", dList1);
-        Document macdzErrFilter = new Document("$and", dList2);
-        Document longitudeErrFilter = new Document("$and", dList3);
+        List<Document> dList4 = new ArrayList<>(2);
+        dList4.add(new Document("snapClock.allClockResult", new Document("$eq", 0)));
+        setTag(params, dList4);
+        Document todayFilter = new Document("$and", dList1);
+        Document todayErrFilter = new Document("$and", dList2);
+        Document allFilter = new Document("$and", dList3);
+        Document allErrFilter = new Document("$and", dList4);
 
-        List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, longitudeErrFilter);
+        List<Document> lists = Arrays.asList(todayFilter, todayErrFilter, allFilter,allErrFilter);
         List<String> rList = lists.stream().map(filter -> {
             // 鏋勫缓鑱氬悎绠￠亾
             List<Document> pipeline = Arrays.asList(
@@ -1706,11 +1877,11 @@
             return uniqueDeviceIdCount + "";
         }).collect(Collectors.toList());
 
-        Date now = new Date();
         List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
                 .select(CheckIndexCar::getVehicleTimingAccuracy)
                 .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
-                .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+                .eq(params.getDataType().equals(2), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Dept)
+                .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
                 .list();
         BigDecimal onlineRate = BigDecimal.ZERO;
         if (CollectionUtils.isNotEmpty(videoList)) {
@@ -1721,7 +1892,7 @@
         rList.add(this.remove0(onlineRate));
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", rList);
-        map.put("list", resultList);
+        map.put("list", resultVos);
         return Result.ok().data(map).total(total);
     }
 
@@ -1735,17 +1906,58 @@
     public Result vehicleTimelyUploadAccuracy(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
         Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
-
+        query.addCriteria(Criteria.where("dataType").is(ApiConstants.HK_DataType_CAR));
+        if(params.getOption()!=null){
+            //姝ｅ父
+            if(params.getOption()==1){
+                query.addCriteria(Criteria.where("delayCount").is(0));
+            }else if(params.getOption()==-1){
+                //寤惰繜
+                query.addCriteria(Criteria.where("delayCount").gt(0));
+            }
+        }
         long total = mongoTemplate.count(query, SnapshotDelayMonitorResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
         List<SnapshotDelayMonitorResult> resultList = mongoTemplate.find(query, SnapshotDelayMonitorResult.class);
-
         // 缁熻鏁�
-        Date now = new Date();
+        MongoDatabase database = mongoTemplate.getDb();
+        MongoCollection<Document> collection = database.getCollection("hk_snapshop_delay_monitor");
+
+        List<Document> dList1 = new ArrayList<>(2);
+        setTag(params, dList1);
+        dList1.add(new Document("dataType" ,new Document("$eq",ApiConstants.HK_DataType_CAR)));
+        Document allFilter = new Document("$and", dList1);
+        List<Document> dList2 = new ArrayList<>(2);
+        dList2.add(new Document("dataType" ,new Document("$eq",ApiConstants.HK_DataType_CAR)));
+        dList2.add(new Document("delayCount", new Document("$gt", 0)));
+        setTag(params, dList2);
+        Document delayFilter = new Document("$and", dList2);
+
+        List<Document> lists = Arrays.asList(allFilter,delayFilter);
+        List<String> rList = lists.stream().map(filter -> {
+            // 鏋勫缓鑱氬悎绠￠亾
+            List<Document> pipeline = Arrays.asList(
+                    new Document("$match", filter),
+                    // $group 鍘婚噸
+                    new Document("$group", new Document("_id", "$externalIndexCode")),
+                    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());
+
+
         List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
                 .select(CheckIndexCar::getVehicleUploadTimeliness)
                 .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
-                .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+                .eq(params.getDataType().equals(2), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Dept)
+                .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
                 .list();
         BigDecimal onlineRate = BigDecimal.ZERO;
         if (CollectionUtils.isNotEmpty(videoList)) {
@@ -1753,8 +1965,9 @@
             BigDecimal count = BigDecimal.valueOf(videoList.size());
             onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
         }
+        rList.add(this.remove0(onlineRate));
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", Arrays.asList(this.remove0(onlineRate)));
+        map.put("count", rList);
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -1769,17 +1982,44 @@
     public Result vehicleUrlAccuracy(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
         Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
-
+        if(params.getOption()!=null){
+            if(params.getOption()==1){
+                query.addCriteria(Criteria.where("expCount").is(0));
+            }else if(params.getOption()==-1){
+                query.addCriteria(Criteria.where("expCount").gt(0));
+            }
+        }
         long total = mongoTemplate.count(query, PicAccessResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
+        query.with(Sort.by(Sort.Order.desc("expCount")));
         List<PicAccessResult> resultList = mongoTemplate.find(query, PicAccessResult.class);
 
         // 缁熻鏁�
-        Date now = new Date();
+        MongoDatabase database = mongoTemplate.getDb();
+        MongoCollection<Document> collection = database.getCollection("hk_pic_access");
+        // 鏋勫缓鍩烘湰鐨�$match鏉′欢
+        List<Document> matchConditions = new ArrayList<>();
+        setTag(params, matchConditions);
+        List<Document> pipeline = Arrays.asList(
+                new Document("$match", new Document("$and", matchConditions)),
+                new Document("$group", new Document("_id", "$mongoCreateTime")
+                        .append("sampleCount", new Document("$sum", "$sampleCount"))
+                        .append("expCount", new Document("$sum", "$expCount"))
+                ));
+        // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+        AggregateIterable<Document> result = collection.aggregate(pipeline);
+        int sampleCount = 0;
+        int expCount = 0;
+        for (Document doc : result) {
+            sampleCount = doc.getInteger("sampleCount");
+            expCount = doc.getInteger("expCount");
+        }
+
         List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
                 .select(CheckIndexCar::getVehicleUrlAvailability)
                 .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
-                .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+                .eq(params.getDataType().equals(2), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Dept)
+                .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
                 .list();
         BigDecimal onlineRate = BigDecimal.ZERO;
         if (CollectionUtils.isNotEmpty(videoList)) {
@@ -1787,8 +2027,13 @@
             BigDecimal count = BigDecimal.valueOf(videoList.size());
             onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
         }
+        List<String> rList = new ArrayList<>();
+        rList.add(sampleCount+"");
+        rList.add(expCount+"");
+        rList.add(this.remove0(onlineRate));
+
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", Arrays.asList(this.remove0(onlineRate)));
+        map.put("count", rList);
         map.put("list", resultList);
         return Result.ok().data(map).total(total);
     }
@@ -1803,17 +2048,48 @@
     public Result vehicleBigImgAccuracy(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
         Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
-
+        if(params.getOption()!=null){
+            if(params.getOption()==1){
+                query.addCriteria(Criteria.where("bigUseful.bigPicExpCount").is(0));
+            }else if(params.getOption()==-1){
+                query.addCriteria(Criteria.where("bigUseful.bigPicExpCount").gt(0));
+            }
+        }
         long total = mongoTemplate.count(query, VehicleDeviceSamplingResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
+        query.with(Sort.by(Sort.Order.desc("bigUseful.bigPicExpCount")));
         List<VehicleDeviceSamplingResult> resultList = mongoTemplate.find(query, VehicleDeviceSamplingResult.class);
-
+        List<BigPicUsefulVO> voList = new ArrayList<>();
+        resultList.forEach(item->{
+            BigPicUsefulVO picVO = VehicleDeviceSamplingResult.getPicVO(item);
+            voList.add(picVO);
+        });
         // 缁熻鏁�
-        Date now = new Date();
+        MongoDatabase database = mongoTemplate.getDb();
+        MongoCollection<Document> collection = database.getCollection("hk_vehicle_device_sampling");
+        // 鏋勫缓鍩烘湰鐨�$match鏉′欢
+        List<Document> matchConditions = new ArrayList<>();
+        setTag(params, matchConditions);
+        List<Document> pipeline = Arrays.asList(
+                new Document("$match", new Document("$and", matchConditions)),
+                new Document("$group", new Document("_id", "$mongoCreateTime")
+                        .append("sampleCount", new Document("$sum", "$bigUseful.sampleCount"))
+                        .append("expCount", new Document("$sum", "$bigUseful.bigPicExpCount"))
+                ));
+        // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+        AggregateIterable<Document> result = collection.aggregate(pipeline);
+        int sampleCount = 0;
+        int expCount = 0;
+        for (Document doc : result) {
+            sampleCount = doc.getInteger("sampleCount");
+            expCount = doc.getInteger("expCount");
+        }
+        List<String> countList = new ArrayList<>();
         List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
                 .select(CheckIndexCar::getVehiclePictureAvailability)
                 .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
-                .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+                .eq(params.getDataType().equals(2), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Dept)
+                .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
                 .list();
         BigDecimal onlineRate = BigDecimal.ZERO;
         if (CollectionUtils.isNotEmpty(videoList)) {
@@ -1821,9 +2097,12 @@
             BigDecimal count = BigDecimal.valueOf(videoList.size());
             onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
         }
+        countList.add(sampleCount+"");
+        countList.add(expCount+"");
+        countList.add(this.remove0(onlineRate));
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", Arrays.asList(this.remove0(onlineRate)));
-        map.put("list", resultList);
+        map.put("count", countList);
+        map.put("list", voList);
         return Result.ok().data(map).total(total);
     }
 
@@ -1837,32 +2116,39 @@
     public Result faceViewDockStable(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
         Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
-
+        //鍔燚ataType涓鸿溅杈�
+        query.addCriteria(Criteria.where("dataType").is(ApiConstants.HK_DataType_FACE));
+        if(params.getOption()!=null){
+            if(ApiConstants.HK_SnapCount_ResultType_Normal.equals(params.getOption())) {
+                query.addCriteria(Criteria.where("resultType").is(ApiConstants.HK_SnapCount_ResultType_Normal));
+            }else if(ApiConstants.HK_SnapCount_ResultType_Null.equals(params.getOption())){
+                query.addCriteria(Criteria.where("resultType").is(ApiConstants.HK_SnapCount_ResultType_Null));
+            }else if(ApiConstants.HK_SnapCount_ResultType_Descent.equals(params.getOption())){
+                query.addCriteria(Criteria.where("resultType").is(ApiConstants.HK_SnapCount_ResultType_Descent));
+            }else if(ApiConstants.HK_SnapCount_ResultType_Low.equals(params.getOption())){
+                query.addCriteria(Criteria.where("resultType").is(ApiConstants.HK_SnapCount_ResultType_Low));
+            }
+        }
         long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
         List<SnapshotDataMonitorResult> resultList = mongoTemplate.find(query, SnapshotDataMonitorResult.class);
-
+        resultList.forEach(item ->item.setResultTypeText(item.getResultTypeText()));
         // 缁熻鏁伴噺
         MongoDatabase database = mongoTemplate.getDb();
         MongoCollection<Document> collection = database.getCollection("hk_snapshot_data_monitor");
 
-        List<Document> dList1 = new ArrayList<>(2);
-        dList1.add(new Document("resultType", new Document("$eq", 1)));
-        setTag(params, dList1);
         List<Document> dList2 = new ArrayList<>(2);
-        dList2.add(new Document("resultType", new Document("$eq", 2)));
+        dList2.add(new Document("resultType", new Document("$eq", 1)));
+        dList2.add(new Document("dataType", new Document("$eq", ApiConstants.HK_DataType_CAR)));
         setTag(params, dList2);
         List<Document> dList3 = new ArrayList<>(2);
-        dList3.add(new Document("resultType", new Document("$eq", 3)));
+        dList3.add(new Document("resultType", new Document("$eq", 2)));
+        dList3.add(new Document("dataType", new Document("$eq", ApiConstants.HK_DataType_CAR)));
         setTag(params, dList3);
-        List<Document> dList4 = new ArrayList<>(2);
-        dList4.add(new Document("resultType", new Document("$eq", 4)));
-        setTag(params, dList4);
-        Document normalFilter = new Document("$and", dList1);
+
         Document noDataFilter = new Document("$and", dList2);
         Document trFilter = new Document("$and", dList3);
-        Document littleFilter = new Document("$and", dList4);
-        List<Document> lists = Arrays.asList(normalFilter, noDataFilter, trFilter, littleFilter);
+        List<Document> lists = Arrays.asList(noDataFilter, trFilter);
         List<String> rList = lists.stream().map(filter -> {
             // 鏋勫缓鑱氬悎绠￠亾
             List<Document> pipeline = Arrays.asList(
@@ -1880,12 +2166,28 @@
             }
             return uniqueDeviceIdCount + "";
         }).collect(Collectors.toList());
-
-        Date now = new Date();
+        //鎶撴媿閲忔眰鍜�
+        // 鏋勫缓鍩烘湰鐨�$match鏉′欢
+        List<Document> matchConditions = new ArrayList<>();
+        setTag(params, matchConditions);
+        matchConditions.add(new Document("dataType", new Document("$eq", ApiConstants.HK_DataType_FACE)));
+        List<Document> pipeline = Arrays.asList(
+                new Document("$match", new Document("$and", matchConditions)),
+                new Document("$group", new Document("_id", "$mongoCreateTime")
+                        .append("dataCount", new Document("$sum", "$dataCount"))
+                ));
+        // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+        AggregateIterable<Document> result = collection.aggregate(pipeline);
+        int dataCount = 0;
+        for (Document doc : result) {
+            dataCount = doc.getInteger("dataCount");
+        }
+        rList.add(0,dataCount+"");
         List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
                 .select(CheckIndexFace::getViewConnectStability)
                 .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
-                .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+                .eq(params.getDataType().equals(2), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Dept)
+                .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
                 .list();
         BigDecimal onlineRate = BigDecimal.ZERO;
         if (CollectionUtils.isNotEmpty(videoList)) {
@@ -1916,8 +2218,12 @@
         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.by(Sort.Order.asc("pingOnline")));
+        query.with(sort);
         //鍒嗛〉鏁伴噺
         long total = mongoTemplate.count(query, TMonitorResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
@@ -1937,11 +2243,19 @@
             } 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);
+            }
         });
         params.setDeptTag(-1);
         params.setDeviceType(3);
 
-// 缁熻璁惧鏁伴噺
+        // 缁熻璁惧鏁伴噺
         //鍗＄墖缁熻
         int totalCount = 0;
         int onlineCount = 0;
@@ -2003,34 +2317,46 @@
      */
     @Override
     public Result faceDirectoryConsistency(DataCenterQuery params) {
-        List<String> likeFileds = Arrays.asList("serialNumber.showValue", "ip.showValue", "name.showValue");
-        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
-
+        List<String> likeFileds = Arrays.asList("ip.showValue", "name.showValue", "serialNumber.showValue");
+        List<Criteria> andCriteria = MongoUtil.getAndCriteria(params, TIME_FIELD, likeFileds, null);
+        // 1/2/3 瑙嗛/杞﹁締/浜鸿劯
+        Pattern pattern = Pattern.compile(".*3.*");
+        andCriteria.add(Criteria.where("sxjgnlx.value").regex(pattern));
+        Query query = new Query();
+        Criteria and = new Criteria();
+        if(params.getOption()!=null){
+            if(params.getOption() ==1){
+                andCriteria.add(Criteria.where("newDevice").is(Boolean.TRUE));
+            }else if(params.getOption() ==-1){
+                andCriteria.add(Criteria.where("newDevice").is(Boolean.FALSE));
+            }
+        }
+        and.andOperator(andCriteria);
+        query = Query.query(and);
         long total = mongoTemplate.count(query, MonitorQualifyResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
         List<MonitorQualifyResult> resultList = mongoTemplate.find(query, MonitorQualifyResult.class);
-
+        List<MonitorQualifyResultVO> resultVOS = new ArrayList<>();
+        for (MonitorQualifyResult result : resultList) {
+            MonitorQualifyResultVO vo = MonitorQualifyResult.getVO(result);
+            resultVOS.add(vo);
+        }
         // 缁熻鏁伴噺
         MongoDatabase database = mongoTemplate.getDb();
         MongoCollection<Document> collection = database.getCollection("uy_monitor_qualify");
-
+        //鎬绘暟
         List<Document> dList1 = new ArrayList<>(2);
-        dList1.add(new Document("ip.error", new Document("$eq", Boolean.TRUE)));
         setTag(params, dList1);
+        dList1.add(new Document("sxjgnlx.value", new Document("$regex", ".*3.*")));
+        Document totalFilter = new Document("$and",dList1);
+        //鏂拌澶囨暟
         List<Document> dList2 = new ArrayList<>(2);
-        dList2.add(new Document("macdz.error", 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)));
-        setTag(params, dList3);
-        List<Document> dList4 = new ArrayList<>(2);
-        dList4.add(new Document("longitude.error", 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);
-        Document longitudeErrFilter = new Document("$and", dList4);
-        List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter);
+        dList2.add(new Document("sxjgnlx.value", new Document("$regex", ".*3.*")));
+        dList2.add(new Document("newDevice",Boolean.TRUE));
+        Document newFilter = new Document("$and",dList2);
+
+        List<Document> lists = Arrays.asList(totalFilter, newFilter);
         List<String> rList = lists.stream().map(filter -> {
             // 鏋勫缓鑱氬悎绠￠亾
             List<Document> pipeline = Arrays.asList(
@@ -2049,11 +2375,11 @@
             return uniqueDeviceIdCount + "";
         }).collect(Collectors.toList());
 
-        Date now = new Date();
         List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
                 .select(CheckIndexFace::getDeviceDirectoryConsistent)
                 .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
-                .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+                .eq(params.getDataType().equals(2), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Dept)
+                .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
                 .list();
         BigDecimal onlineRate = BigDecimal.ZERO;
         if (CollectionUtils.isNotEmpty(videoList)) {
@@ -2064,7 +2390,7 @@
         rList.add(this.remove0(onlineRate));
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", rList);
-        map.put("list", resultList);
+        map.put("list", resultVOS);
         return Result.ok().data(map).total(total);
     }
 
@@ -2077,33 +2403,50 @@
     @Override
     public Result faceCollectionConsistency(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "crossName");
-        Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+        List<Criteria> andCriteria = MongoUtil.getAndCriteria(params, TIME_FIELD, likeFileds, null);
+        Query query = new Query();
+        Criteria and = new Criteria();
+        and.andOperator(andCriteria);
+        query = Query.query(and);
+        if(params.getOption()!=null){
+            if(params.getOption() ==1){
+                query.addCriteria(Criteria.where("lalType").is(ApiConstants.HK_Info_LayType_Normal));
+                query.addCriteria(Criteria.where("gbCodeType").is(ApiConstants.HK_Info_GbCodeType_Normal));
+            }else if(params.getOption() ==-1){
+                Criteria lalType = Criteria.where("lalType").ne(ApiConstants.HK_Info_LayType_Normal);
+                Criteria gbCodeType = Criteria.where("gbCodeType").ne(ApiConstants.HK_Info_GbCodeType_Normal);
+                Criteria orOperator = new Criteria().orOperator(lalType, gbCodeType);
+                orOperator.andOperator(andCriteria);
+                query = Query.query(orOperator);
+            }
+        }
 
-        long total = mongoTemplate.count(query, CrossDetailResult.class);
+        long total = mongoTemplate.count(query, MonitoringDetailResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
-        List<CrossDetailResult> resultList = mongoTemplate.find(query, CrossDetailResult.class);
+        List<MonitoringDetailResult> resultList = mongoTemplate.find(query, MonitoringDetailResult.class);
 
         // 缁熻鏁伴噺
         MongoDatabase database = mongoTemplate.getDb();
-        MongoCollection<Document> collection = database.getCollection("hk_cross_detail");
+        MongoCollection<Document> collection = database.getCollection("hk_monitoring_detail");
 
         List<Document> dList1 = new ArrayList<>(2);
-        dList1.add(new Document("lalType", new Document("$eq", 1)));
         setTag(params, dList1);
         List<Document> dList2 = new ArrayList<>(2);
-        dList2.add(new Document("lalType", new Document("$eq", 2)));
+        dList2.add(new Document("lalType", new Document("$eq", 1)));
+        dList2.add(new Document("gbCodeType", new Document("$eq", 1)));
         setTag(params, dList2);
         List<Document> dList3 = new ArrayList<>(2);
-        dList3.add(new Document("lalType", new Document("$eq", 3)));
         setTag(params, dList3);
-        List<Document> dList4 = new ArrayList<>(2);
-        dList4.add(new Document("lalType", new Document("$eq", 4)));
-        setTag(params, dList4);
-        Document ipErrFilter = new Document("$and", dList1);
-        Document macdzErrFilter = new Document("$and", dList2);
-        Document latitudeErrFilter = new Document("$and", dList3);
-        Document longitudeErrFilter = new Document("$and", dList4);
-        List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter);
+        List<Document> errorConditions = new ArrayList<>();
+        errorConditions.add(new Document("lalType",new Document("$ne",1)));
+        errorConditions.add(new Document("gbCodeType",new Document("$ne",1)));
+        Document errorDoc = new Document("$or",errorConditions);
+        dList3.add(errorDoc);
+        Document totalFilter = new Document("$and", dList1);
+        Document correctFilter = new Document("$and", dList2);
+        Document errorFilter = new Document("$and", dList3);
+
+        List<Document> lists = Arrays.asList(totalFilter, correctFilter, errorFilter);
         List<String> rList = lists.stream().map(filter -> {
             // 鏋勫缓鑱氬悎绠￠亾
             List<Document> pipeline = Arrays.asList(
@@ -2122,11 +2465,11 @@
             return uniqueDeviceIdCount + "";
         }).collect(Collectors.toList());
 
-        Date now = new Date();
         List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
                 .select(CheckIndexFace::getFaceInformationCollectionAccuracy)
                 .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
-                .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+                .eq(params.getDataType().equals(2), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Dept)
+                .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
                 .list();
         BigDecimal onlineRate = BigDecimal.ZERO;
         if (CollectionUtils.isNotEmpty(videoList)) {
@@ -2151,56 +2494,50 @@
     public Result faceImgQualification(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "cameraName");
         Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
-
-        long total = mongoTemplate.count(query, MonitoringDetailResult.class);
+        if(params.getOption()!=null){
+            if(params.getOption()==1){
+                query.addCriteria(Criteria.where("faceEligibility.unfaceEligCount").is(0));
+            }else if(params.getOption()==-1){
+                query.addCriteria(Criteria.where("faceEligibility.unfaceEligCount").gt(0));
+            }
+        }
+        long total = mongoTemplate.count(query, FaceDeviceSamplingResult.class);
+        query.with(Sort.by(Sort.Order.desc("faceEligibility.unfaceEligCount")));
         MongoUtil.setPage(query, params, TIME_FIELD);
-        List<MonitoringDetailResult> resultList = mongoTemplate.find(query, MonitoringDetailResult.class);
+        List<FaceDeviceSamplingResult> resultList = mongoTemplate.find(query, FaceDeviceSamplingResult.class);
+        List<BigPicUsefulVO> voList = new ArrayList<>();
+        resultList.forEach(item->{
+            BigPicUsefulVO picVO = FaceDeviceSamplingResult.getEligeVO(item);
+            voList.add(picVO);
+        });
 
         // 缁熻鏁伴噺
         MongoDatabase database = mongoTemplate.getDb();
-        MongoCollection<Document> collection = database.getCollection("hk_monitoring_detail");
+        MongoCollection<Document> collection = database.getCollection("hk_face_device_sampling");
+        // 鏋勫缓鍩烘湰鐨�$match鏉′欢
+        List<Document> matchConditions = new ArrayList<>();
+        setTag(params, matchConditions);
+        List<Document> pipeline = Arrays.asList(
+                new Document("$match", new Document("$and", matchConditions)),
+                new Document("$group", new Document("_id", "$mongoCreateTime")
+                        .append("sampleCount", new Document("$sum", "$faceEligibility.sampleCount"))
+                        .append("expCount", new Document("$sum", "$faceEligibility.unfaceEligCount"))
+                ));
+        // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+        AggregateIterable<Document> result = collection.aggregate(pipeline);
+        int sampleCount = 0;
+        int expCount = 0;
+        for (Document doc : result) {
+            sampleCount = doc.getInteger("sampleCount");
+            expCount = doc.getInteger("expCount");
+        }
+        List<String> countList = new ArrayList<>();
 
-        List<Document> dList1 = new ArrayList<>(2);
-        dList1.add(new Document("lalType", new Document("$eq", 1)));
-        setTag(params, dList1);
-        List<Document> dList2 = new ArrayList<>(2);
-        dList2.add(new Document("lalType", new Document("$eq", 2)));
-        setTag(params, dList2);
-        List<Document> dList3 = new ArrayList<>(2);
-        dList3.add(new Document("lalType", new Document("$eq", 3)));
-        setTag(params, dList3);
-        List<Document> dList4 = new ArrayList<>(2);
-        dList4.add(new Document("lalType", new Document("$eq", 4)));
-        setTag(params, dList4);
-        Document ipErrFilter = new Document("$and", dList1);
-        Document macdzErrFilter = new Document("$and", dList2);
-        Document latitudeErrFilter = new Document("$and", dList3);
-        Document longitudeErrFilter = new Document("$and", dList4);
-
-        List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter);
-        List<String> rList = lists.stream().map(filter -> {
-            // 鏋勫缓鑱氬悎绠￠亾
-            List<Document> pipeline = Arrays.asList(
-                    new Document("$match", filter),
-                    // $group 鍘婚噸
-                    new Document("$group", new Document("_id", "$externalIndexCode")),
-                    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());
-
-        Date now = new Date();
         List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
                 .select(CheckIndexFace::getFacePictureQualification)
                 .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
-                .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+                .eq(params.getDataType().equals(2), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Dept)
+                .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
                 .list();
         BigDecimal onlineRate = BigDecimal.ZERO;
         if (CollectionUtils.isNotEmpty(videoList)) {
@@ -2208,10 +2545,12 @@
             BigDecimal count = BigDecimal.valueOf(videoList.size());
             onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
         }
-        rList.add(this.remove0(onlineRate));
+        countList.add(sampleCount+"");
+        countList.add(expCount+"");
+        countList.add(this.remove0(onlineRate));
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", rList);
-        map.put("list", resultList);
+        map.put("count", countList);
+        map.put("list", voList);
         return Result.ok().data(map).total(total);
     }
 
@@ -2225,29 +2564,47 @@
     public Result faceCapturesImagesAccuracy(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
         Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
-
+        if(params.getOption()!=null){
+            //褰撴棩鏃堕挓寮傚父
+            if(params.getOption()==1){
+                query.addCriteria(Criteria.where("majorDiffCount").gt(0));
+            }else if(params.getOption()==-1){
+                //鍏ㄩ儴鏃堕挓寮傚父
+                query.addCriteria(Criteria.where("importantDiffCount").gt(0));
+            }
+        }
         long total = mongoTemplate.count(query, FaceDeviceInspectionResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
         List<FaceDeviceInspectionResult> resultList = mongoTemplate.find(query, FaceDeviceInspectionResult.class);
+        List<SnapClockVO> resultVos = new ArrayList<>();
+        resultList.forEach(item->{
+            SnapClockVO vo = FaceDeviceInspectionResult.getVO(item);
+            resultVos.add(vo);
+        });
 
         // 缁熻鏁伴噺
         MongoDatabase database = mongoTemplate.getDb();
-        MongoCollection<Document> collection = database.getCollection("hk_vehicle_device_inspection");
+        MongoCollection<Document> collection = database.getCollection("hk_face_device_inspection");
 
         List<Document> dList1 = new ArrayList<>(2);
-        dList1.add(new Document("snapResult", new Document("$eq", 1)));
+        dList1.add(new Document("snapClock.todayClockResult", new Document("$eq", 1)));
         setTag(params, dList1);
         List<Document> dList2 = new ArrayList<>(2);
-        dList2.add(new Document("snapResult", new Document("$eq", 2)));
+        dList2.add(new Document("snapClock.todayClockResult", new Document("$eq", 0)));
         setTag(params, dList2);
         List<Document> dList3 = new ArrayList<>(2);
-        dList3.add(new Document("snapResult", new Document("$eq", 4)));
+        dList3.add(new Document("snapClock.allClockResult", new Document("$eq", 1)));
         setTag(params, dList3);
-        Document ipErrFilter = new Document("$and", dList1);
-        Document macdzErrFilter = new Document("$and", dList2);
-        Document longitudeErrFilter = new Document("$and", dList3);
+        List<Document> dList4 = new ArrayList<>(2);
+        dList4.add(new Document("snapClock.allClockResult", new Document("$eq", 0)));
+        setTag(params, dList4);
+        Document todayFilter = new Document("$and", dList1);
+        Document todayErrFilter = new Document("$and", dList2);
+        Document allFilter = new Document("$and", dList3);
+        Document allErrFilter = new Document("$and", dList4);
 
-        List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, longitudeErrFilter);
+
+        List<Document> lists = Arrays.asList(todayFilter, todayErrFilter, allFilter,allErrFilter);
         List<String> rList = lists.stream().map(filter -> {
             // 鏋勫缓鑱氬悎绠￠亾
             List<Document> pipeline = Arrays.asList(
@@ -2266,11 +2623,11 @@
             return uniqueDeviceIdCount + "";
         }).collect(Collectors.toList());
 
-        Date now = new Date();
         List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
                 .select(CheckIndexFace::getFaceTimingAccuracy)
                 .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
-                .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+                .eq(params.getDataType().equals(2), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Dept)
+                .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
                 .list();
         BigDecimal onlineRate = BigDecimal.ZERO;
         if (CollectionUtils.isNotEmpty(videoList)) {
@@ -2281,7 +2638,7 @@
         rList.add(this.remove0(onlineRate));
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", rList);
-        map.put("list", resultList);
+        map.put("list", resultVos);
         return Result.ok().data(map).total(total);
     }
 
@@ -2295,29 +2652,34 @@
     public Result faceTimelyUpload(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
         Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
-
-        long total = mongoTemplate.count(query, FaceDeviceInspectionResult.class);
+        query.addCriteria(Criteria.where("dataType").is(ApiConstants.HK_DataType_FACE));
+        if(params.getOption()!=null){
+            //姝ｅ父
+            if(params.getOption()==1){
+                query.addCriteria(Criteria.where("delayCount").is(0));
+            }else if(params.getOption()==-1){
+                //寤惰繜
+                query.addCriteria(Criteria.where("delayCount").gt(0));
+            }
+        }
+        long total = mongoTemplate.count(query, SnapshotDelayMonitorResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
-        List<FaceDeviceInspectionResult> resultList = mongoTemplate.find(query, FaceDeviceInspectionResult.class);
-
-        // 缁熻鏁伴噺
+        List<SnapshotDelayMonitorResult> resultList = mongoTemplate.find(query, SnapshotDelayMonitorResult.class);
+        // 缁熻鏁�
         MongoDatabase database = mongoTemplate.getDb();
-        MongoCollection<Document> collection = database.getCollection("hk_vehicle_device_inspection");
+        MongoCollection<Document> collection = database.getCollection("hk_snapshop_delay_monitor");
 
         List<Document> dList1 = new ArrayList<>(2);
-        dList1.add(new Document("snapResult", new Document("$eq", 1)));
         setTag(params, dList1);
+        dList1.add(new Document("dataType" ,new Document("$eq",ApiConstants.HK_DataType_FACE)));
+        Document allFilter = new Document("$and", dList1);
         List<Document> dList2 = new ArrayList<>(2);
-        dList2.add(new Document("snapResult", new Document("$eq", 2)));
+        dList2.add(new Document("dataType" ,new Document("$eq",ApiConstants.HK_DataType_FACE)));
+        dList2.add(new Document("delayCount", new Document("$gt", 0)));
         setTag(params, dList2);
-        List<Document> dList3 = new ArrayList<>(2);
-        dList3.add(new Document("snapResult", new Document("$eq", 4)));
-        setTag(params, dList3);
-        Document ipErrFilter = new Document("$and", dList1);
-        Document macdzErrFilter = new Document("$and", dList2);
-        Document longitudeErrFilter = new Document("$and", dList3);
+        Document delayFilter = new Document("$and", dList2);
 
-        List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, longitudeErrFilter);
+        List<Document> lists = Arrays.asList(allFilter,delayFilter);
         List<String> rList = lists.stream().map(filter -> {
             // 鏋勫缓鑱氬悎绠￠亾
             List<Document> pipeline = Arrays.asList(
@@ -2336,11 +2698,12 @@
             return uniqueDeviceIdCount + "";
         }).collect(Collectors.toList());
 
-        Date now = new Date();
+
         List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
                 .select(CheckIndexFace::getFaceUploadTimeliness)
                 .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
-                .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+                .eq(params.getDataType().equals(2), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Dept)
+                .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
                 .list();
         BigDecimal onlineRate = BigDecimal.ZERO;
         if (CollectionUtils.isNotEmpty(videoList)) {
@@ -2365,17 +2728,50 @@
     public Result faceAvailabilityOfLargeImg(DataCenterQuery params) {
         List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
         Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
-
+        if(params.getOption()!=null){
+            if(params.getOption()==1){
+                query.addCriteria(Criteria.where("bigUseful.bigPicExpCount").is(0));
+            }else if(params.getOption()==-1){
+                query.addCriteria(Criteria.where("bigUseful.bigPicExpCount").gt(0));
+            }
+        }
         long total = mongoTemplate.count(query, FaceDeviceSamplingResult.class);
         MongoUtil.setPage(query, params, TIME_FIELD);
+        query.with(Sort.by(Sort.Order.desc("bigUseful.bigPicExpCount")));
         List<FaceDeviceSamplingResult> resultList = mongoTemplate.find(query, FaceDeviceSamplingResult.class);
+        List<BigPicUsefulVO> voList = new ArrayList<>();
+        resultList.forEach(item->{
+            BigPicUsefulVO picVO = FaceDeviceSamplingResult.getPicVO(item);
+            voList.add(picVO);
+        });
+        // 缁熻鏁�
+        MongoDatabase database = mongoTemplate.getDb();
+        MongoCollection<Document> collection = database.getCollection("hk_face_device_sampling");
+        // 鏋勫缓鍩烘湰鐨�$match鏉′欢
+        List<Document> matchConditions = new ArrayList<>();
+        setTag(params, matchConditions);
+        List<Document> pipeline = Arrays.asList(
+                new Document("$match", new Document("$and", matchConditions)),
+                new Document("$group", new Document("_id", "$mongoCreateTime")
+                        .append("sampleCount", new Document("$sum", "$bigUseful.sampleCount"))
+                        .append("expCount", new Document("$sum", "$bigUseful.bigPicExpCount"))
+                ));
+        // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+        AggregateIterable<Document> result = collection.aggregate(pipeline);
+        int sampleCount = 0;
+        int expCount = 0;
+        for (Document doc : result) {
+            sampleCount = doc.getInteger("sampleCount");
+            expCount = doc.getInteger("expCount");
+        }
+        List<String> countList = new ArrayList<>();
 
         // 缁熻鏁�
-        Date now = new Date();
         List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
                 .select(CheckIndexFace::getFacePictureAvailability)
                 .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
-                .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+                .eq(params.getDataType().equals(2), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Dept)
+                .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
                 .list();
         BigDecimal onlineRate = BigDecimal.ZERO;
         if (CollectionUtils.isNotEmpty(videoList)) {
@@ -2383,10 +2779,12 @@
             BigDecimal count = BigDecimal.valueOf(videoList.size());
             onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
         }
-
+        countList.add(sampleCount+"");
+        countList.add(expCount+"");
+        countList.add(this.remove0(onlineRate));
         HashMap<String, Object> map = new HashMap<>();
-        map.put("count", Arrays.asList(this.remove0(onlineRate)));
-        map.put("list", resultList);
+        map.put("count", countList);
+        map.put("list", voList);
         return Result.ok().data(map).total(total);
     }
 

--
Gitblit v1.8.0