在线监测对于纯车辆人脸可以恢复在线状态

fuliqi

2024-11-18 a1969bc264f5842b87205ffc9fa77e56c51d3058

 ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java

@@ -86,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);
@@ -107,19 +111,13 @@
            } else {
                item.setOnlineStr("未知");
            }
            List<Date> offLineTime = item.getOffLineTime();
            List<String> offLineTime = item.getOffLineTimeStr();
            if(!CollectionUtils.isEmpty(offLineTime)) {
                //后续可以改成配置的离线次数(提取前n次，n为配置的离线次数)
                SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                if (offLineTime.size() > 1) {
                    offLineTime = offLineTime.subList(0, 2);
                }
                List<String> dateStr = new ArrayList<>();
                for (Date date : offLineTime) {
                    String formatDate = format.format(date);
                    dateStr.add(formatDate);
                }
                item.setOffLineTimeStr(dateStr);
                item.setOffLineTimeStr(offLineTime);
            }
        });
        params.setDeptTag(-1);
@@ -1096,7 +1094,7 @@
        Document errorFilter = new Document("$or", errorConditions);
        dList2.add(errorFilter);
        Document osdErrorFilter = new Document("$and", dList2);
        //TODO：未知数  新增0的状态
        //未知数
        List<Document> dList3 = new ArrayList<>(2);
        setTag(params,dList3);
        dList3.add(importantTagCondition);
@@ -1235,7 +1233,7 @@
        Document errorFilter = new Document("$or", errorConditions);
        dList2.add(errorFilter);
        Document osdErrorFilter = new Document("$and", dList2);
        //TODO：未知数  新增0的状态
        //未知数
        List<Document> dList3 = new ArrayList<>(2);
        setTag(params,dList3);
        dList3.add(importantTagCondition);
@@ -1400,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);
@@ -1423,6 +1425,14 @@
                item.setOnlineStr("离线");
            } else {
                item.setOnlineStr("未知");
            }
            List<String> offLineTime = item.getOffLineTimeStr();
            if(!CollectionUtils.isEmpty(offLineTime)) {
                //后续可以改成配置的离线次数(提取前n次，n为配置的离线次数)
                if (offLineTime.size() > 1) {
                    offLineTime = offLineTime.subList(0, 2);
                }
                item.setOffLineTimeStr(offLineTime);
            }
        });

@@ -2208,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);
@@ -2229,11 +2243,19 @@
            } else {
                item.setOnlineStr("未知");
            }
            List<String> offLineTime = item.getOffLineTimeStr();
            if(!CollectionUtils.isEmpty(offLineTime)) {
                //后续可以改成配置的离线次数(提取前n次，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;