diff --git a/web/src/main/java/com/zhehekeji/web/lib/hik/HikLoginModuleImpl.java b/web/src/main/java/com/zhehekeji/web/lib/hik/HikLoginModuleImpl.java index ae4c71f..20460c1 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/hik/HikLoginModuleImpl.java +++ b/web/src/main/java/com/zhehekeji/web/lib/hik/HikLoginModuleImpl.java @@ -41,9 +41,9 @@ public class HikLoginModuleImpl implements CameraControlLoginModule { Boolean ok = hcNetsdk.NET_DVR_Init(); HCNetSDK.NET_DVR_LOCAL_TCP_PORT_BIND_CFG strLocalTcpBind = new HCNetSDK.NET_DVR_LOCAL_TCP_PORT_BIND_CFG(); strLocalTcpBind.read(); - strLocalTcpBind.wLocalBindTcpMinPort = (short) 3000; - strLocalTcpBind.wLocalBindTcpMaxPort = (short) 3000; - strLocalTcpBind.write(); + //strLocalTcpBind.wLocalBindTcpMinPort = (short) 3000; + //strLocalTcpBind.wLocalBindTcpMaxPort = (short) 3000; + //strLocalTcpBind.write(); Pointer pStrLocalTcoBind = strLocalTcpBind.getPointer(); if (hcNetsdk.NET_DVR_SetSDKLocalCfg(0, pStrLocalTcoBind) == false) { System.out.println("绑定失败,错误码为" + hcNetsdk.NET_DVR_GetLastError()); diff --git a/web/src/main/java/com/zhehekeji/web/service/CameraService.java b/web/src/main/java/com/zhehekeji/web/service/CameraService.java index 982e811..d19b630 100644 --- a/web/src/main/java/com/zhehekeji/web/service/CameraService.java +++ b/web/src/main/java/com/zhehekeji/web/service/CameraService.java @@ -319,7 +319,7 @@ public class CameraService { public void cameraLogin(Camera camera){ NetSDKLib.LLong lLong = cameraControlLoginModule.login(camera.getIp(),camera.getPort(),camera.getUser(),camera.getPassword()); if(lLong != null){ - log.info("camera login success,cameraId:{},ip:{}",camera.getId(),camera.getIp()); + log.info("camera login success,cameraId:{},ip:{},long{}",camera.getId(),camera.getIp(),lLong.intValue()); CameraConnMap.conn(camera.getId(),lLong); } } diff --git a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecNettyClient.java b/web/src/main/java/com/zhehekeji/web/service/ksec/KsecNettyClient.java index 09819b2..522769e 100644 --- a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecNettyClient.java +++ b/web/src/main/java/com/zhehekeji/web/service/ksec/KsecNettyClient.java @@ -71,6 +71,9 @@ public class KsecNettyClient { try { createClient(ksec); } catch (Exception e) { + if(channel!= null){ + channel.close(); + } //没连上 继续 log.error("reconnect error num:{}", num); num++;