点位在线率

zxl

2025-04-22 f0a6462c539e217186d6fee31dfec6d2aba2e92a

 ycl-server/src/main/java/com/ycl/thread/OSDCheckThread.java

@@ -39,7 +39,7 @@
            }
        } else if (DeviceType.DH.getType().equals(monitor.getDeviceType())) {
            //大华
            OSDResult osd = DHApi.getOsd(monitor.getSerialNumber(),monitor.getIp(), monitor.getUsername(),monitor.getPassword());
            OSDResult osd = DHApi.getOsd(monitor.getName(),monitor.getSerialNumber(),monitor.getIp(), monitor.getUsername(),monitor.getPassword());
            OSDResult osdResult = checkSuccess(monitor, osd);
            if (osdResult!=null) {
                return osd;
@@ -48,7 +48,8 @@
            }
        } else if (DeviceType.YS.getType().equals(monitor.getDeviceType())) {
            //宇视
            OSDResult osd = YSApi.getOsd(monitor.getIp(), monitor.getUsername(),monitor.getPassword());
            OSDResult osd = YSApi.getOsd(monitor,monitor.getIp(), monitor.getUsername(),monitor.getPassword());

            OSDResult osdResult = checkSuccess(monitor, osd);
            if (osdResult!=null) {
                return osd;
@@ -69,13 +70,13 @@
            return hkosd;
        }
        //尝试大华的api
        OSDResult dhosd = DHApi.getOsd(monitor.getSerialNumber(),monitor.getIp(),monitor.getUsername(),monitor.getPassword());
        OSDResult dhosd = DHApi.getOsd(monitor.getName(),monitor.getSerialNumber(),monitor.getIp(),monitor.getUsername(),monitor.getPassword());
        if (dhosd != null) {
            dhosd.setSerialNumber(monitor.getSerialNumber());
            return dhosd;
        }
        //宇视api
        OSDResult ysosd = YSApi.getOsd(monitor.getIp(), monitor.getUsername(),monitor.getPassword());
        OSDResult ysosd = YSApi.getOsd(monitor,monitor.getIp(), monitor.getUsername(),monitor.getPassword());
        if (ysosd != null) {
            ysosd.setSerialNumber(monitor.getSerialNumber());
            return ysosd;