Merge branch 'dev'

fuliqi

2025-02-14 c6976365d5bfb39a32db8b541b1fe3ceb30c7826

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

@@ -16,6 +16,7 @@
import com.ycl.platform.domain.result.UY.VideoOnlineResult;
import com.ycl.platform.domain.vo.UpdateOnlineVO;
import com.ycl.platform.mapper.TMonitorMapper;
import com.ycl.platform.mapper.WorkOrderMapper;
import com.ycl.platform.service.UYErrorTypeCheckService;
import com.ycl.platform.service.WorkOrderService;
import com.ycl.platform.service.YwPointService;
@@ -59,6 +60,7 @@
    private final YwPointService pointService;
    private final TMonitorMapper monitorMapper;
    private final WorkOrderService workOrderService;
    private final WorkOrderMapper workOrderMapper;
    private final SysConfigMapper sysConfigMapper;
    private final CheckPointUtil checkPointUtil;
    @Value("${youYun.tenantId}")
@@ -73,7 +75,7 @@
    private String passwd;

    private static final ExecutorService executorService = new ThreadPoolExecutor(16,
            128,
            64,
            5000,
            TimeUnit.SECONDS,
            new ArrayBlockingQueue<>(1000),
@@ -193,7 +195,6 @@
            log.error("请配置离线次数，此次设置为默认值2");
        }
        // 先查出设备IP集合,剔除掉在线情况是未知的,并且只检测正在考核的设备避免多余工单
        //TODO：需要把海康和优云的任务的时间调到ping之前
        List<TMonitorResult> monitorList = monitorMapper.getDistinctIP();
        //补充错误时间点
        Query onlineQuery = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
@@ -213,7 +214,7 @@
                            OnlineCheckThread thread = new OnlineCheckThread(monitor, checkPointUtil, time);
                            return thread.call(); // 假设 OnlineCheckThread 实现了 Callable 接口
                        }, executorService)
                        .orTimeout(60, TimeUnit.SECONDS)
                        .orTimeout(180, TimeUnit.SECONDS)
                        .exceptionally(ex -> {
                            if (ex instanceof TimeoutException) {
                                log.error("任务执行超时:"+monitor.getIp());
@@ -246,10 +247,9 @@
        List<String> offLineList = new ArrayList<>();
        List<String> onLineList = new ArrayList<>();
        //查出数据库纯车辆或纯人脸设备
        List<String> serialNumbers = monitorMapper.selectCarOrFace().stream().map(TMonitor::getSerialNumber).collect(Collectors.toList());
//        List<String> serialNumbers = monitorMapper.selectCarOrFace().stream().map(TMonitor::getSerialNumber).collect(Collectors.toList());
        dataList.forEach(item->{
            //更新纯车辆或纯人脸的设备的在线状态(这部分设备不会拉流检测)
            if(item.getPingOnline() && !CollectionUtils.isEmpty(serialNumbers) && serialNumbers.contains(item.getNo())) {
            if(item.getPingOnline()) {
                onLineList.add(item.getIp());
            } else if(!item.getPingOnline()) {
                //筛选出ping离线的设备，更改数据库为离线
@@ -292,8 +292,10 @@
            mongoTemplate.insertAll(mongoList);
        }
        //工单（同一IP只生成一个工单）
        //查询数据库已存在的离线工单获取ip集合，剔除
        List<String> ips = workOrderMapper.getOfflineWorkOrder();
        List<WorkOrder> workOrderList = dataList.stream()
                .filter(item -> Objects.nonNull(item.getWorkOrder()))
                .filter(item -> Objects.nonNull(item.getWorkOrder()) && (CollectionUtils.isEmpty(ips) || !ips.contains(item.getIp())))
                .collect(Collectors.toMap(
                        TMonitorResult::getIp,
                        Function.identity(),
@@ -337,7 +339,6 @@
                                item.setNo(item.getDeviceId());
                            }
                        });
                        //貌似这里可以忽略省厅标签因为项目展示的后面ping的时候存的数据
                        pointService.setDeviceTagByGB(records,CheckConstants.Rule_Category_Video);
                        //存放在mongo中
                        mongoTemplate.insertAll(records);
@@ -350,7 +351,7 @@
                            vo.setUpdateTime(now);
                            return vo;
                        }).collect(Collectors.toList());
                        monitorMapper.updateOnline(willUpdateList);
                        monitorMapper.updateOnlineFromUyOrHk(willUpdateList);
                        //离线生成工单,一个ip只生成一个工单
                        List<VideoOnlineResult> workOrders = new ArrayList<>(records.stream()
                                .filter(item -> ApiConstants.UY_OnlineSite_Offline.equals(item.getStatus()))