Merge remote-tracking branch 'origin/master'

aijinhui

2023-10-08 2400238fd8ae34a2f10a4ea35db9b1739c534a7e

 ard-work/src/main/java/com/ruoyi/device/hiksdk/sdk/LoginResultCallBack.java

@@ -47,6 +47,7 @@
            GlobalVariable.loginMap.put(camera.getId(), lUserID);
            log.debug(camera.getIp() + ":" + camera.getPort() + "登录成功");
            camera.setLoginId(lUserID);
            camera.setState("1");
            camera.setChanNum((int) lpDeviceinfo.byChanNum);
            camera.setStartDChan((int) lpDeviceinfo.byStartDChan);
            //获取最新通道
@@ -68,6 +69,7 @@
            log.debug(camera.getIp() + ":" + camera.getPort() + "登录失败");
            camera.setChanNum(0);
            camera.setLoginId(-1);
            camera.setState("0");
        }
        ardCamerasService.updateArdCameras(camera);
        return 1;