fuliqi
2024-09-30 6d1540258545a41fcbaa50c43b3480a22896d03e
点位在线定时任务卡死修复
2个文件已修改
49 ■■■■ 已修改文件
ycl-pojo/src/main/java/com/ycl/platform/domain/result/SYS/TMonitorResult.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java 48 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-pojo/src/main/java/com/ycl/platform/domain/result/SYS/TMonitorResult.java
@@ -18,6 +18,7 @@
    private String ip;
    /** 最近监测在线状态 */
    private Boolean online;
    private String onlineStr;
    /** 当日监测次数 */
    private Integer checkCount;
    /** 当日离线 */
ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
@@ -73,7 +73,13 @@
        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(null != item.getOnline() && item.getOnline()){
                item.setOnlineStr("在线");
            }else {
                item.setOnlineStr("离线");
            }
        });
        params.setDeptTag(-1);
        params.setDeviceType(1);
        // 统计设备数量
@@ -110,7 +116,13 @@
        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(null != item.getOnline() && item.getOnline()){
                item.setOnlineStr("在线");
            }else {
                item.setOnlineStr("离线");
            }
        });
        // 统计设备数量
        params.setDeptTag(1);
        params.setDeviceType(1);
@@ -152,7 +164,13 @@
        params.setDeviceType(1);
        // 统计设备数量
        Integer distinctCount = pointMapper.distinctCount(params);
        resultList.forEach(item->{
            if(null != item.getOnline() && item.getOnline()){
                item.setOnlineStr("在线");
            }else {
                item.setOnlineStr("离线");
            }
        });
        Date now = new Date();
        List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
                .select(CheckIndexVideo::getKeySiteOnline)
@@ -190,7 +208,13 @@
        params.setDeviceType(1);
        // 统计设备数量
        Integer distinctCount = pointMapper.distinctCount(params);
        resultList.forEach(item->{
            if(null != item.getOnline() && item.getOnline()){
                item.setOnlineStr("在线");
            }else {
                item.setOnlineStr("离线");
            }
        });
        Date now = new Date();
        List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
                .select(CheckIndexVideo::getKeyCommandImageOnline)
@@ -894,7 +918,13 @@
        params.setDeviceType(2);
        // 统计设备数量
        Integer distinctCount = pointMapper.distinctCount(params);
        resultList.forEach(item->{
            if(null != item.getOnline() && item.getOnline()){
                item.setOnlineStr("在线");
            }else {
                item.setOnlineStr("离线");
            }
        });
        Date now = new Date();
        List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
                .select(CheckIndexCar::getSiteOnline)
@@ -1391,7 +1421,13 @@
        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(null != item.getOnline() && item.getOnline()){
                item.setOnlineStr("在线");
            }else {
                item.setOnlineStr("离线");
            }
        });
        params.setDeptTag(-1);
        params.setDeviceType(3);
        // 统计设备数量