去掉录像的工单

fuliqi

2024-10-24 82aa42fa8c5a653784aebf823dd9482d9f52b0db

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

@@ -65,7 +65,6 @@
     * 比对mongoDB一机一档信息，整理成result存入mongo
     * 同步品牌到mysql
     */
    //TODO：大华动态库linux换位置
    public void getOSD() throws ExecutionException, InterruptedException {
        log.info("开始获取OSD");
        //查一机一档monitor
@@ -100,12 +99,14 @@
            List<OsdCheckResult> checkResults = new ArrayList<>();
            Map<String, TMonitor> monitorMap = monitors.stream().collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity()));
            for (OSDResult osdResult : osdResultList) {
                TMonitor monitor = monitorMap.get(osdResult.getSerialNumber());
                //封装OsdCheckResult
                OsdCheckResult osdCheckResult = getOsdCheckResult(osdResult, monitor);
                checkCorrect(osdResult, monitor, osdCheckResult);
                log.info("校验结果：{}",osdCheckResult);
                checkResults.add(osdCheckResult);
                if(osdResult!=null) {
                    TMonitor monitor = monitorMap.get(osdResult.getSerialNumber());
                    //封装OsdCheckResult
                    OsdCheckResult osdCheckResult = getOsdCheckResult(osdResult, monitor);
                    checkCorrect(osdResult, monitor, osdCheckResult);
                    log.info("校验结果：{}", osdCheckResult);
                    checkResults.add(osdCheckResult);
                }
            }
            log.info("结果数据大小:{}", checkResults.size());
            //结果存入mongo
@@ -128,6 +129,7 @@
    private OsdCheckResult getOsdCheckResult(OSDResult osdResult, TMonitor monitor) {
        OsdCheckResult osdCheckResult = new OsdCheckResult();
        osdCheckResult.setDeviceNo(osdResult.getSerialNumber());
        osdCheckResult.setNo(osdResult.getSerialNumber());
        osdCheckResult.setIp(monitor.getIp());
        osdCheckResult.setDeviceType(monitor.getCameraFunType());
        osdCheckResult.setCheckTime(osdResult.getCheckTime());
@@ -152,6 +154,8 @@
            } else {
                osdCheckResult.setOsdTimeCorrect(ApiConstants.OSD_Error);
            }
        }else {
            osdCheckResult.setOsdTimeCorrect(ApiConstants.OSD_Unknown);
        }
        //检查通道名是否正确
        //校验规则，这里暂时不比较全景和细节两字。
@@ -162,6 +166,8 @@
            } else {
                osdCheckResult.setOsdNameCorrect(ApiConstants.OSD_Error);
            }
        }else {
            osdCheckResult.setOsdNameCorrect(ApiConstants.OSD_Unknown);
        }
        //检查省是否正确
        if (!StringUtils.isEmpty(osdResult.getOSD1())) {
@@ -170,6 +176,8 @@
            } else {
                osdCheckResult.setOsdProvinceCorrect(ApiConstants.OSD_Error);
            }
        }else {
            osdCheckResult.setOsdProvinceCorrect(ApiConstants.OSD_Unknown);
        }
        //检查市是否正确
        if (!StringUtils.isEmpty(osdResult.getOSD2())) {
@@ -178,6 +186,8 @@
            } else {
                osdCheckResult.setOsdCityCorrect(ApiConstants.OSD_Error);
            }
        }else {
            osdCheckResult.setOsdCityCorrect(ApiConstants.OSD_Unknown);
        }
        //检查区县是否正确
        if (!StringUtils.isEmpty(osdResult.getOSD3())) {
@@ -187,6 +197,8 @@
            } else {
                osdCheckResult.setOsdPartCorrect(ApiConstants.OSD_Error);
            }
        }else {
            osdCheckResult.setOsdPartCorrect(ApiConstants.OSD_Unknown);
        }
    }