~liusuyi/ruoyi-api.git

			@@ -3,6 +3,7 @@
			import com.ruoyi.alarm.global.domain.GuidePriorityQueue;
			import com.ruoyi.alarm.global.domain.GuideTask;
			import com.ruoyi.common.annotation.SdkOperate;
			import com.ruoyi.common.utils.Threads;
			import com.ruoyi.common.utils.file.FileUtils;
			import com.ruoyi.common.utils.file.MimeTypeUtils;
			import com.ruoyi.common.utils.uuid.IdUtils;
			@@ -56,7 +57,7 @@
			private IArdChannelService ardChannelService;
			@Resource
			private IVtduService vtduService;

			private final Object lock = new Object();
			public static HCNetSDK hCNetSDK = HCNetSDK.hCNetSDK;
			private static FExceptionCallBack fExceptionCallBack;//异常回调

			@@ -110,20 +111,22 @@
			//同步登录
			int lUserID = hCNetSDK.NET_DVR_Login_V40(m_strLoginInfo, m_strDeviceInfo);
			if (lUserID < 0) {
			int errorCode = hCNetSDK.NET_DVR_GetLastError();
			log.debug(camera.getIp() + ":" + camera.getPort() + "登录失败,错误码：" + errorCode);
			log.debug("Login Failed [ " + camera.getIp() + ":" + camera.getPort() + " ],错误码：" + hCNetSDK.NET_DVR_GetLastError());
			camera.setChanNum(0);
			camera.setLoginId(-1);
			camera.setState("0");
			} else {
			return;
			}
			synchronized (lock) {
			log.debug("Login Success [ " + camera.getIp() + ":" + camera.getPort() + " ]");
			if (fExceptionCallBack == null) {
			fExceptionCallBack = new ExceptionCallBack();//异常回调
			//设置异常回调函数(可在回调函数中获取设备上下线状态等)
			if (!hCNetSDK.NET_DVR_SetExceptionCallBack_V30(0, 0, fExceptionCallBack, null)) {
			log.info("Set fExceptionCallBack function fail");
			log.debug("Set fExceptionCallBack function fail");
			return;
			} else {
			log.info("Set fExceptionCallBack function successfully!");
			log.debug("Set fExceptionCallBack function successfully!");
			}
			}

			@@ -135,7 +138,7 @@
			GlobalVariable.loginMap.put(camera.getId(), lUserID);
			GlobalVariable.loginCameraMap.put(lUserID, camera);

			log.debug("Login Success [ " + camera.getIp() + ":" + camera.getPort() + " ]");

			camera.setLoginId(lUserID);
			camera.setState("1");
			camera.setChanNum((int) m_strDeviceInfo.struDeviceV30.byChanNum);
			@@ -179,6 +182,7 @@
			}
			ardCamerasService.updateArdCameras(camera);
			}

			} catch (Exception ex) {
			log.error("注册设备异常", ex);
			}