离线检测优化

fuliqi

2024-11-13 51396d6ed0747b1e909056ed72108b6b0c811667

 ycl-server/src/main/java/com/ycl/task/UYTask.java

@@ -195,7 +195,7 @@
        for (TMonitorResult result : monitorList) {
            TMonitorResult mongoData = mongoMap.get(result.getNo());
            if(mongoData!=null){
                result.setOffLineTime(mongoData.getOffLineTime());
                result.setOffLineTimeStr(mongoData.getOffLineTimeStr());
            }
        }
        List<TMonitorResult> dataList = new ArrayList<>(48);
@@ -206,37 +206,44 @@
                            return thread.call(); // 假设 OnlineCheckThread 实现了 Callable 接口
                        }, executorService)
                        .orTimeout(60, TimeUnit.SECONDS)
                        //出现异常
                        .exceptionally(ex -> {
                            if (ex instanceof TimeoutException) {
                                log.error("任务执行超时:"+monitor.getIp());
                            } else {
                                log.error("任务执行异常:"+monitor.getIp() + ex);
                                log.error("任务执行异常:"+monitor.getIp() +ex);
                                ex.printStackTrace();
                            }
                            int checkTimes = 1;
                            int offLineTimes = 1;
                            Map<String, Object> map = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstant.ONLINE_KEY, monitor.getIp());
                            if (!CollectionUtils.isEmpty(map)) {
                                checkTimes = (Integer) map.get("checkTimes") + 1;
                                offLineTimes = (Integer) map.get("offLineTimes");
                            }
                            monitor.setPingOnline(Boolean.FALSE);
                            monitor.setCheckCount(checkTimes);
                            monitor.setOffLineCount(offLineTimes);
                            List<Date> offLineTime = monitor.getOffLineTime();
                            if(CollectionUtils.isEmpty(offLineTime)) offLineTime = new ArrayList<>();
                            offLineTime.add(new Date());
                            monitor.setOffLineTime(offLineTime);
                            if (monitor.getOffLineCount() >= time) {
                                WorkOrder workOrder = new WorkOrder();
                                workOrder.setSerialNumber(monitor.getNo());
                                List<String> errList = new ArrayList<>();
                                errList.add(ErrorType.DEVICE_OFFLINE.getValue());
                                workOrder.setErrorTypeList(errList);
                                workOrder.setStatus(WorkOrderStatusEnum.DISTRIBUTED);
                                monitor.setWorkOrder(workOrder);
                            }
                            return monitor; // 返回失败的结果
                            return null;
//                            int checkTimes = 1;
//                            int offLineTimes = 1;
//                            Map<String, Object> map = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstant.ONLINE_KEY, monitor.getNo());
//                            if (!CollectionUtils.isEmpty(map)) {
//                                checkTimes = (Integer) map.get("checkTimes") + 1;
//                                offLineTimes = (Integer) map.get("offLineTimes");
//                            }else {
//                                map = new HashMap<>();
//                            }
//                            monitor.setPingOnline(Boolean.FALSE);
//                            monitor.setCheckCount(checkTimes);
//                            monitor.setOffLineCount(offLineTimes);
//                            List<Date> offLineTime = monitor.getOffLineTime();
//                            if(CollectionUtils.isEmpty(offLineTime)) offLineTime = new ArrayList<>();
//                            offLineTime.add(new Date());
//                            monitor.setOffLineTime(offLineTime);
//                            if (monitor.getOffLineCount() >= time) {
//                                WorkOrder workOrder = new WorkOrder();
//                                workOrder.setSerialNumber(monitor.getNo());
//                                List<String> errList = new ArrayList<>();
//                                errList.add(ErrorType.DEVICE_OFFLINE.getValue());
//                                workOrder.setErrorTypeList(errList);
//                                workOrder.setStatus(WorkOrderStatusEnum.DISTRIBUTED);
//                                monitor.setWorkOrder(workOrder);
//                            }
//                            map.put("checkTimes", checkTimes);
//                            map.put("offLineTimes", offLineTimes);
//                            redisTemplate.opsForHash().put(RedisConstant.ONLINE_KEY, monitor.getNo(), map);
//                            return monitor; // 返回失败的结果

                        }))
                .collect(Collectors.toList());

@@ -247,7 +254,7 @@
        try {
            allOf.get(60, TimeUnit.SECONDS); // 给予额外的5秒来收集结果
        } catch (TimeoutException e) {
            log.warn("部分任务未在指定时间内完成");
            log.error("部分任务未在指定时间内完成");
        } catch (Exception e2){
            log.error("数据收集异常"+e2);
        }