工单只下发考核的、阈值bug

fuliqi

2024-11-01 b91945ea32378a71d1e57356af6e16703a1ceaa7

 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
@@ -130,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());
@@ -154,6 +154,8 @@
            } else {
                osdCheckResult.setOsdTimeCorrect(ApiConstants.OSD_Error);
            }
        }else {
            osdCheckResult.setOsdTimeCorrect(ApiConstants.OSD_Unknown);
        }
        //检查通道名是否正确
        //校验规则，这里暂时不比较全景和细节两字。
@@ -164,6 +166,8 @@
            } else {
                osdCheckResult.setOsdNameCorrect(ApiConstants.OSD_Error);
            }
        }else {
            osdCheckResult.setOsdNameCorrect(ApiConstants.OSD_Unknown);
        }
        //检查省是否正确
        if (!StringUtils.isEmpty(osdResult.getOSD1())) {
@@ -172,6 +176,8 @@
            } else {
                osdCheckResult.setOsdProvinceCorrect(ApiConstants.OSD_Error);
            }
        }else {
            osdCheckResult.setOsdProvinceCorrect(ApiConstants.OSD_Unknown);
        }
        //检查市是否正确
        if (!StringUtils.isEmpty(osdResult.getOSD2())) {
@@ -180,6 +186,8 @@
            } else {
                osdCheckResult.setOsdCityCorrect(ApiConstants.OSD_Error);
            }
        }else {
            osdCheckResult.setOsdCityCorrect(ApiConstants.OSD_Unknown);
        }
        //检查区县是否正确
        if (!StringUtils.isEmpty(osdResult.getOSD3())) {
@@ -189,6 +197,8 @@
            } else {
                osdCheckResult.setOsdPartCorrect(ApiConstants.OSD_Error);
            }
        }else {
            osdCheckResult.setOsdPartCorrect(ApiConstants.OSD_Unknown);
        }
    }