osd不做筛选，检测全量

fuliqi

2025-01-15 36a00aa8bee92f62470fc1031c8c07f3de35910d

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

@@ -62,6 +62,7 @@
    public String YSPassword;
    /**
     * 通过查mongoDB每日一机一档数据获取设备ip
     * 筛选视频设备
     * 通过设备ip、品牌调用不同api获取osd信息
     * 比对mongoDB一机一档信息，整理成result存入mongo
     * 同步品牌到mysql
@@ -94,12 +95,15 @@
                    new ThreadPoolExecutor.CallerRunsPolicy()
            );
            List<TMonitor> monitors = monitorMapper.selectByNumbers(serialNumbers);
            //过滤ip
            monitors = monitors.stream().filter(monitor -> !StringUtils.isEmpty(monitor.getIp()) && !"127.0.0.1".equals(monitor.getIp())).collect(Collectors.toList());
            //过滤掉无效ip并筛选出视频设备
            monitors = monitors.stream()
                    .filter(monitor -> !StringUtils.isEmpty(monitor.getIp()) &&
                            !"127.0.0.1".equals(monitor.getIp()))
                    .collect(Collectors.toList());
            List<Future<OSDResult>> futureList = new ArrayList<>(48);
            List<OSDResult> osdResultList = new ArrayList<>();
            for (TMonitor monitor : monitors) {
                OSDCheckThread thread = new OSDCheckThread(monitor,HKUserName,HKPassword,DHUserName,DHPassword,YSUserName,YSPassword);
                OSDCheckThread thread = new OSDCheckThread(monitor);
                Future<OSDResult> future = executorService.submit(thread);
                futureList.add(future);
            }
@@ -160,7 +164,7 @@
        if (osdResult.getCheckTime() != null && osdResult.getOsdTime() != null) {
            long checkTime = osdResult.getCheckTime().getTime();
            long osdTime = osdResult.getOsdTime().getTime();
            long timeDiff = (checkTime - osdTime) / 1000;
            long timeDiff = Math.abs((checkTime - osdTime) / 1000);
            if (timeDiff <= 60) {
                osdCheckResult.setOsdTimeCorrect(ApiConstants.OSD_Correct);
            } else {