OSD导出、点位管理新增用户名密码

fuliqi

2025-01-09 15a1b8a6cda205c10323b25578374e20165f3ff6

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

@@ -13,21 +13,9 @@
@Slf4j
public class OSDCheckThread implements Callable<OSDResult> {
    private TMonitor monitor;
    public String HKUserName;
    public String HKPassword;
    public String DHUserName;
    public String DHPassword;
    public String YSUserName;
    public String YSPassword;

    public OSDCheckThread(TMonitor monitor, String HKUserName, String HKPassword, String DHUserName, String DHPassword, String YSUserName, String YSPassword) {
    public OSDCheckThread(TMonitor monitor) {
        this.monitor = monitor;
        this.HKUserName = HKUserName;
        this.HKPassword = HKPassword;
        this.DHUserName = DHUserName;
        this.DHPassword = DHPassword;
        this.YSUserName = YSUserName;
        this.YSPassword = YSPassword;
    }

    public TMonitor getMonitor() {
@@ -38,59 +26,11 @@
        this.monitor = monitor;
    }

    public String getHKUserName() {
        return HKUserName;
    }

    public void setHKUserName(String HKUserName) {
        this.HKUserName = HKUserName;
    }

    public String getHKPassword() {
        return HKPassword;
    }

    public void setHKPassword(String HKPassword) {
        this.HKPassword = HKPassword;
    }

    public String getDHUserName() {
        return DHUserName;
    }

    public void setDHUserName(String DHUserName) {
        this.DHUserName = DHUserName;
    }

    public String getDHPassword() {
        return DHPassword;
    }

    public void setDHPassword(String DHPassword) {
        this.DHPassword = DHPassword;
    }

    public String getYSUserName() {
        return YSUserName;
    }

    public void setYSUserName(String YSUserName) {
        this.YSUserName = YSUserName;
    }

    public String getYSPassword() {
        return YSPassword;
    }

    public void setYSPassword(String YSPassword) {
        this.YSPassword = YSPassword;
    }

    @Override
    public OSDResult call() throws Exception {
        if (DeviceType.HK.getType().equals(monitor.getDeviceType())) {
            //海康
            OSDResult osd = HKApi.getOsdByIP(monitor.getIp(), HKUserName, HKPassword);
            OSDResult osd = HKApi.getOsdByIP(monitor.getSerialNumber(),monitor.getIp(),monitor.getUsername(),monitor.getPassword());
            OSDResult osdResult = checkSuccess(monitor, osd);
            if (osdResult!=null) {
                return osd;
@@ -99,7 +39,7 @@
            }
        } else if (DeviceType.DH.getType().equals(monitor.getDeviceType())) {
            //大华
            OSDResult osd = DHApi.getOsd(monitor.getIp(), DHUserName, DHPassword);
            OSDResult osd = DHApi.getOsd(monitor.getSerialNumber(),monitor.getIp(), monitor.getUsername(),monitor.getPassword());
            OSDResult osdResult = checkSuccess(monitor, osd);
            if (osdResult!=null) {
                return osd;
@@ -108,7 +48,7 @@
            }
        } else if (DeviceType.YS.getType().equals(monitor.getDeviceType())) {
            //宇视
            OSDResult osd = YSApi.getOsd(monitor.getIp(), YSUserName, YSPassword);
            OSDResult osd = YSApi.getOsd(monitor.getIp(), monitor.getUsername(),monitor.getPassword());
            OSDResult osdResult = checkSuccess(monitor, osd);
            if (osdResult!=null) {
                return osd;
@@ -123,19 +63,19 @@

    private OSDResult tryAllApi(TMonitor monitor) {
        //尝试海康的api
        OSDResult hkosd = HKApi.getOsdByIP(monitor.getIp(), HKUserName, HKPassword);
        OSDResult hkosd = HKApi.getOsdByIP(monitor.getSerialNumber(),monitor.getIp(), monitor.getUsername(),monitor.getPassword());
        if (hkosd != null) {
            hkosd.setSerialNumber(monitor.getSerialNumber());
            return hkosd;
        }
        //尝试大华的api
        OSDResult dhosd = DHApi.getOsd(monitor.getIp(), DHUserName, DHPassword);
        OSDResult dhosd = DHApi.getOsd(monitor.getSerialNumber(),monitor.getIp(),monitor.getUsername(),monitor.getPassword());
        if (dhosd != null) {
            dhosd.setSerialNumber(monitor.getSerialNumber());
            return dhosd;
        }
        //宇视api
        OSDResult ysosd = YSApi.getOsd(monitor.getIp(), YSUserName, YSPassword);
        OSDResult ysosd = YSApi.getOsd(monitor.getIp(), monitor.getUsername(),monitor.getPassword());
        if (ysosd != null) {
            ysosd.setSerialNumber(monitor.getSerialNumber());
            return ysosd;