diff --git a/lp.lic b/lp.lic new file mode 100644 index 0000000..dbf4c6c --- /dev/null +++ b/lp.lic @@ -0,0 +1 @@ +255509055115241936 \ No newline at end of file diff --git a/web/src/main/java/com/zhehekeji/web/controller/CameraControlController.java b/web/src/main/java/com/zhehekeji/web/controller/CameraControlController.java index 766b3f2..6d6e5a4 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/CameraControlController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/CameraControlController.java @@ -41,13 +41,7 @@ public class CameraControlController { return Result.success(); } - private NetSDKLib.LLong cameraLogin(Integer cameraId){ - log.info("相机登录 cameraId:{}",cameraId); - Camera camera = cameraMapper.selectById(cameraId); - Assert.notNull(camera,"球机不存在"); - NetSDKLib.LLong lLong = loginControlModule.login(camera.getIp(),camera.getPort(),camera.getUser(),camera.getPassword()); - return lLong; - } + @PostMapping("/up/{id}") @ApiOperation(value = "球机控制向上") diff --git a/web/src/main/java/com/zhehekeji/web/controller/CameraController.java b/web/src/main/java/com/zhehekeji/web/controller/CameraController.java index 386e22d..b7e5e87 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/CameraController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/CameraController.java @@ -11,7 +11,7 @@ import com.zhehekeji.web.entity.CameraIO; import com.zhehekeji.web.entity.CameraIOConfig; import com.zhehekeji.web.lib.CameraConnMap; import com.zhehekeji.web.lib.CameraControlModule; -import com.zhehekeji.web.lib.joyware.JoywareLoginModuleImpl; +//import com.zhehekeji.web.lib.joyware.JoywareLoginModuleImpl; import com.zhehekeji.web.lib.joyware.NetSDKLib; import com.zhehekeji.web.pojo.camera.CameraConfigSearchReq; import com.zhehekeji.web.pojo.camera.CameraIOPtz; @@ -136,7 +136,7 @@ public class CameraController { cameraControlModule.toPtz(ptzId,req.getCameraId()); return Result.success(); } - +/* @PostMapping("/{cameraId}/io/xy") @ApiOperation(value = "获取球机的当前位置坐标") public Result xy(@PathVariable Integer cameraId) { @@ -154,7 +154,7 @@ public class CameraController { return Result.success(ss); } return Result.success(s); - } + }*/ @GetMapping("/downloadConfig") @ApiOperation(value = "视频直播配置") diff --git a/web/src/main/java/com/zhehekeji/web/lib/CameraConnMap.java b/web/src/main/java/com/zhehekeji/web/lib/CameraConnMap.java index ef03a71..ec95d39 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/CameraConnMap.java +++ b/web/src/main/java/com/zhehekeji/web/lib/CameraConnMap.java @@ -1,6 +1,7 @@ package com.zhehekeji.web.lib; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.hik.HCNetSDK; + import java.util.HashMap; import java.util.Map; @@ -14,15 +15,15 @@ public class CameraConnMap { * key :cameraId * value: loginId */ - public static Map cameraMap = new HashMap<>(); + public static Map cameraMap = new HashMap<>(); /** * key:loginId * value: cameraId */ - public static Map loginMap = new HashMap<>(); + public static Map loginMap = new HashMap<>(); - public static void conn(Integer cameraId,NetSDKLib.LLong handlerId){ + public static void conn(Integer cameraId,HCNetSDK.LLong handlerId){ synchronized (cameraId.toString().intern()){ cameraMap.put(cameraId,handlerId); loginMap.put(handlerId,cameraId); @@ -32,17 +33,17 @@ public class CameraConnMap { public static void disConn(Integer cameraId){ synchronized (cameraId.toString().intern()){ - NetSDKLib.LLong lLong = cameraMap.get(cameraId); + HCNetSDK.LLong lLong = cameraMap.get(cameraId); cameraMap.remove(cameraId); loginMap.remove(lLong); } } - public static NetSDKLib.LLong getConnId(Integer cameraId){ + public static HCNetSDK.LLong getConnId(Integer cameraId){ return cameraMap.get(cameraId); } - public static Integer getCameraIdByLoginId(NetSDKLib.LLong lLong){ + public static Integer getCameraIdByLoginId(HCNetSDK.LLong lLong){ return loginMap.get(lLong); } diff --git a/web/src/main/java/com/zhehekeji/web/lib/CameraControlLoginModule.java b/web/src/main/java/com/zhehekeji/web/lib/CameraControlLoginModule.java index 49d198e..103421f 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/CameraControlLoginModule.java +++ b/web/src/main/java/com/zhehekeji/web/lib/CameraControlLoginModule.java @@ -1,9 +1,9 @@ package com.zhehekeji.web.lib; -import com.zhehekeji.web.lib.joyware.NetSDKLib; +import com.zhehekeji.web.lib.hik.HCNetSDK; public interface CameraControlLoginModule { - NetSDKLib.LLong login(String ip, int port, String user, String password); + HCNetSDK.LLong login(String ip, int port, String user, String password); } diff --git a/web/src/main/java/com/zhehekeji/web/lib/hik/HCNetSDK.java b/web/src/main/java/com/zhehekeji/web/lib/hik/HCNetSDK.java index 565dc82..b2fe2d2 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/hik/HCNetSDK.java +++ b/web/src/main/java/com/zhehekeji/web/lib/hik/HCNetSDK.java @@ -19,6 +19,7 @@ import com.sun.jna.ptr.ByteByReference; import com.sun.jna.ptr.IntByReference; import com.sun.jna.ptr.ShortByReference; import com.zhehekeji.web.lib.joyware.CallBack; +import com.zhehekeji.web.lib.joyware.NetSDKLib; import com.zhehekeji.web.lib.joyware.Utils; import java.util.ArrayList; @@ -30,7 +31,37 @@ import java.util.List; //SDK接口说明,HCNetSDK.dll public interface HCNetSDK extends Library { - HCNetSDK INSTANCE = Native.load(Utils.getLoadLibrary("hcnetsdk"), HCNetSDK.class); + HCNetSDK INSTANCE = Native.load(Utils.getLoadLibrary("HCNetSDK"), HCNetSDK.class); + public static class LLong extends IntegerType { + private static final long serialVersionUID = 1L; + + /** Size of a native long, in bytes. */ + public static int size; + static { + size = Native.LONG_SIZE; + if (Utils.getOsPrefix().equalsIgnoreCase("linux-amd64") + || Utils.getOsPrefix().equalsIgnoreCase("win32-amd64") + || Utils.getOsPrefix().equalsIgnoreCase("mac-64")) { + size = 8; + } else if (Utils.getOsPrefix().equalsIgnoreCase("linux-i386") + || Utils.getOsPrefix().equalsIgnoreCase("win32-x86")) { + size = 4; + } + } + + /** Create a zero-valued LLong. */ + public LLong() { + this(0); + } + + /** Create a LLong with the given value. */ + public LLong(long value) { + super(size, value); + } + public NetSDKLib.LLong getDHSdkLong(){ + return new NetSDKLib.LLong(size); + } + } //HCNetSDK INSTANCE = (HCNetSDK) Native.load(Utils.getLoadLibrary("HCNetSDK"), NetSDKLib.class); //HCNetSDK INSTANCE = (HCNetSDK) Native.loadLibrary("E:\\Leaper\\robo\\backend-duoji-monitor-1.0.1\\libs\\win64\\HCNetSDK.dll", // HCNetSDK.class); /***宏定义***/ diff --git a/web/src/main/java/com/zhehekeji/web/lib/hik/HikCameraControlModuleImpl.java b/web/src/main/java/com/zhehekeji/web/lib/hik/HikCameraControlModuleImpl.java index 86b089e..70f99bb 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/hik/HikCameraControlModuleImpl.java +++ b/web/src/main/java/com/zhehekeji/web/lib/hik/HikCameraControlModuleImpl.java @@ -31,7 +31,7 @@ import java.util.Timer; public class HikCameraControlModuleImpl implements CameraControlModule { public boolean connectStatus(Integer cameraId){ - NetSDKLib.LLong userId = CameraConnMap.getConnId(cameraId); + HCNetSDK.LLong userId = CameraConnMap.getConnId(cameraId); return HikLoginModuleImpl.hcNetsdk.NET_DVR_RemoteControl(userId.intValue(),20005,null,0); @@ -425,11 +425,12 @@ public class HikCameraControlModuleImpl implements CameraControlModule { absolutely.stuSpeed.fPositionY = 0.2f; absolutely.write(); //absolutely.stuSpeed.fZoom = 0.5f; - Boolean ok = HikLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx2(CameraConnMap.getConnId(cameraId), 0, dwPTZCommand, + //linux暂时不支持大华 + /*Boolean ok = HikLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx2(CameraConnMap.getConnId(cameraId), 0, dwPTZCommand, 0, 0, 0, 0, absolutely.getPointer()); if(!ok){ log.error("toPtzSlow error:{},cameraId:{}", HikLoginModuleImpl.hcNetsdk.NET_DVR_GetLastError(),cameraId); - } + }*/ } } diff --git a/web/src/main/java/com/zhehekeji/web/lib/hik/HikExceptionCallBack.java b/web/src/main/java/com/zhehekeji/web/lib/hik/HikExceptionCallBack.java index aec408c..a09ec4c 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/hik/HikExceptionCallBack.java +++ b/web/src/main/java/com/zhehekeji/web/lib/hik/HikExceptionCallBack.java @@ -10,13 +10,13 @@ public class HikExceptionCallBack implements HCNetSDK.FExceptionCallBack { @Override public void invoke(int dwType, int lUserID, int lHandle, Pointer pUser) { - Integer cameraId =CameraConnMap.getCameraIdByLoginId(new NetSDKLib.LLong(lUserID)); + Integer cameraId =CameraConnMap.getCameraIdByLoginId(new HCNetSDK.LLong(lUserID)); if(dwType == 32768){ log.error("hik disconnect,cameraId:{}", cameraId); }else if(dwType == 32791){ - log.info("hik reconnect,cameraId:{}", CameraConnMap.getCameraIdByLoginId(new NetSDKLib.LLong(lUserID))); + log.info("hik reconnect,cameraId:{}", CameraConnMap.getCameraIdByLoginId(new HCNetSDK.LLong(lUserID))); } } 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 37f09a0..d4687b8 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 @@ -14,7 +14,7 @@ public class HikLoginModuleImpl implements CameraControlLoginModule { - public static NetSDKLib netsdk = NetSDKLib.NETSDK_INSTANCE; + //public static NetSDKLib netsdk = NetSDKLib.NETSDK_INSTANCE; public static HCNetSDK hcNetsdk = HCNetSDK.INSTANCE; @@ -68,7 +68,7 @@ public class HikLoginModuleImpl implements CameraControlLoginModule { * 登录设备 * \endif */ - public NetSDKLib.LLong login(String m_strIp, int m_nPort, String m_strUser, String m_strPassword) { + public HCNetSDK.LLong login(String m_strIp, int m_nPort, String m_strUser, String m_strPassword) { init(); HCNetSDK.NET_DVR_USER_LOGIN_INFO m_strLoginInfo = new HCNetSDK.NET_DVR_USER_LOGIN_INFO();//设备登录信息 HCNetSDK.NET_DVR_DEVICEINFO_V40 m_strDeviceInfo = new HCNetSDK.NET_DVR_DEVICEINFO_V40();//设备信息 @@ -109,7 +109,7 @@ public class HikLoginModuleImpl implements CameraControlLoginModule { //此id是用来保存视频的 且id不是固定的 int lDChannel = (int)m_strDeviceInfo.struDeviceV30.byStartDChan + lChannel -1; - return new NetSDKLib.LLong(m_lUserID); + return new HCNetSDK.LLong(m_lUserID); }else { return null; } diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/CallBack.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/CallBack.java index 4e4aca3..325bdfe 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/CallBack.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/CallBack.java @@ -14,8 +14,9 @@ public class CallBack { @Override public void invoke(NetSDKLib.LLong lLoginID, String pchDVRIP, int nDVRPort, Pointer dwUser) { - Integer cameraId = CameraConnMap.getCameraIdByLoginId(lLoginID); - log.error("cameraId：{}disConnect",cameraId); + //linux暂时不支持 + // Integer cameraId = CameraConnMap.getCameraIdByLoginId(lLoginID); + // log.error("cameraId：{}disConnect",cameraId); } } @@ -31,7 +32,7 @@ public class CallBack { Thread thread = new Thread(new Runnable() { @Override public void run() { - JoywareLoginModuleImpl.netsdk.CLIENT_StopDownload(lPlayHandle); + //JoywareLoginModuleImpl.netsdk.CLIENT_StopDownload(lPlayHandle); } }); thread.start(); diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/JoywareCameraControlModuleImpl.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/JoywareCameraControlModuleImpl.java index 76c36c9..b6c7c16 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/JoywareCameraControlModuleImpl.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/JoywareCameraControlModuleImpl.java @@ -9,12 +9,12 @@ import lombok.extern.slf4j.Slf4j; import java.time.LocalDateTime; -import static com.zhehekeji.web.lib.joyware.JoywareLoginModuleImpl.mp4ReceiveCB; +//import static com.zhehekeji.web.lib.joyware.JoywareLoginModuleImpl.mp4ReceiveCB; /** * 云台控制接口实现 * 主要有 ：八个方向控制、变倍、变焦、光圈功能 - */ + *//* @Slf4j public class JoywareCameraControlModuleImpl implements CameraControlModule { @@ -24,12 +24,12 @@ public class JoywareCameraControlModuleImpl implements CameraControlModule { return true; } - /** + *//** * 向上 - */ + *//* public boolean ptzControlUpStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) { log.info("up start"); - return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId).getDHSdkLong(), nChannelID, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_UP_CONTROL, lParam1, lParam2, 0, 0); @@ -37,102 +37,102 @@ public class JoywareCameraControlModuleImpl implements CameraControlModule { public boolean ptzControlUpEnd(Integer cameraId, int nChannelID) { log.info("up end"); - return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId).getDHSdkLong(), nChannelID, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_UP_CONTROL, 0, 0, 0, 1); } - /** + *//** * 向下 - */ + *//* public boolean ptzControlDownStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) { log.info("down start"); - return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId).getDHSdkLong(), nChannelID, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_DOWN_CONTROL, lParam1, lParam2, 0, 0); } public boolean ptzControlDownEnd(Integer cameraId, int nChannelID) { log.info("down end"); - return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId).getDHSdkLong(), nChannelID, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_DOWN_CONTROL, 0, 0, 0, 1); } - /** + *//** * 向左 - */ + *//* public boolean ptzControlLeftStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) { log.info("left start"); - return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId).getDHSdkLong(), nChannelID, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_LEFT_CONTROL, lParam1, lParam2, 0, 0); } public boolean ptzControlLeftEnd(Integer cameraId, int nChannelID) { log.info("left end"); - return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId).getDHSdkLong(), nChannelID, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_LEFT_CONTROL, 0, 0, 0, 1); } - /** + *//** * 向右 - */ + *//* public boolean ptzControlRightStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) { log.info("right start"); - return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId).getDHSdkLong(), nChannelID, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_RIGHT_CONTROL, lParam1, lParam2, 0, 0); } public boolean ptzControlRightEnd(Integer cameraId, int nChannelID) { log.info("right end"); - return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId).getDHSdkLong(), nChannelID, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_RIGHT_CONTROL, 0, 0, 0, 1); } - /** + *//** * 向左上 - */ + *//* public boolean ptzControlLeftUpStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) { log.info("up left start"); - return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId).getDHSdkLong(), nChannelID, NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_LEFTTOP, lParam1, lParam2, 0, 0); } public boolean ptzControlLeftUpEnd(Integer cameraId, int nChannelID) { log.info("up left end"); - return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId).getDHSdkLong(), nChannelID, NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_LEFTTOP, 0, 0, 0, 1); } - /** + *//** * 向右上 - */ + *//* public boolean ptzControlRightUpStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) { log.info("up right start"); - return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId).getDHSdkLong(), nChannelID, NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_RIGHTTOP, lParam1, lParam2, 0, 0); } public boolean ptzControlRightUpEnd(Integer cameraId, int nChannelID) { log.info("up right end"); - return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId).getDHSdkLong(), nChannelID, NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_RIGHTTOP, 0, 0, 0, 1); } - /** + *//** * 向左下 - */ + *//* public boolean ptzControlLeftDownStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) { log.info(" left down start"); - Boolean ok = JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + Boolean ok = JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId).getDHSdkLong(), nChannelID, NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_LEFTDOWN, lParam1, lParam2, 0, 0); if(!ok){ @@ -143,114 +143,114 @@ public class JoywareCameraControlModuleImpl implements CameraControlModule { public boolean ptzControlLeftDownEnd(Integer cameraId, int nChannelID) { log.info(" left down end"); - return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId).getDHSdkLong(), nChannelID, NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_LEFTDOWN, 0, 0, 0, 1); } - /** + *//** * 向右下 - */ + *//* public boolean ptzControlRightDownStart(Integer cameraId, int nChannelID, int lParam1, int lParam2) { log.info(" right down start"); - return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId).getDHSdkLong(), nChannelID, NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_RIGHTDOWN, lParam1, lParam2, 0, 0); } public boolean ptzControlRightDownEnd(Integer cameraId, int nChannelID) { log.info(" right down end"); - return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId).getDHSdkLong(), nChannelID, NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_RIGHTDOWN, 0, 0, 0, 1); } - /** + *//** * 变倍+ - */ + *//* public boolean ptzControlZoomAddStart(Integer cameraId, int nChannelID, int lParam2) { - return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId).getDHSdkLong(), nChannelID, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_ZOOM_ADD_CONTROL, 0, lParam2, 0, 0); } public boolean ptzControlZoomAddEnd(Integer cameraId, int nChannelID) { - return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId).getDHSdkLong(), nChannelID, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_ZOOM_ADD_CONTROL, 0, 0, 0, 1); } - /** + *//** * 变倍- - */ + *//* public boolean ptzControlZoomDecStart(Integer cameraId, int nChannelID, int lParam2) { - return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId).getDHSdkLong(), nChannelID, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_ZOOM_DEC_CONTROL, 0, lParam2, 0, 0); } public boolean ptzControlZoomDecEnd(Integer cameraId, int nChannelID) { - return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId).getDHSdkLong(), nChannelID, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_ZOOM_DEC_CONTROL, 0, 0, 0, 1); } - /** + *//** * 变焦+ - */ + *//* public boolean ptzControlFocusAddStart(Integer cameraId, int nChannelID, int lParam2) { - return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId).getDHSdkLong(), nChannelID, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_FOCUS_ADD_CONTROL, 0, lParam2, 0, 0); } public boolean ptzControlFocusAddEnd(Integer cameraId, int nChannelID) { - return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId).getDHSdkLong(), nChannelID, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_FOCUS_ADD_CONTROL, 0, 0, 0, 1); } - /** + *//** * 变焦- - */ + *//* public boolean ptzControlFocusDecStart(Integer cameraId, int nChannelID, int lParam2) { - return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId).getDHSdkLong(), nChannelID, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_FOCUS_DEC_CONTROL, 0, lParam2, 0, 0); } public boolean ptzControlFocusDecEnd(Integer cameraId, int nChannelID) { - return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId).getDHSdkLong(), nChannelID, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_FOCUS_DEC_CONTROL, 0, 0, 0, 1); } - /** + *//** * 光圈+ - */ + *//* public boolean ptzControlIrisAddStart(Integer cameraId, int nChannelID, int lParam2) { - return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId).getDHSdkLong(), nChannelID, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_APERTURE_ADD_CONTROL, 0, lParam2, 0, 0); } public boolean ptzControlIrisAddEnd(Integer cameraId, int nChannelID) { - return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId).getDHSdkLong(), nChannelID, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_APERTURE_ADD_CONTROL, 0, 0, 0, 1); } - /** + *//** * 光圈- - */ + *//* public boolean ptzControlIrisDecStart(Integer cameraId, int nChannelID, int lParam2) { - return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId).getDHSdkLong(), nChannelID, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_APERTURE_DEC_CONTROL, 0, lParam2, 0, 0); } public boolean ptzControlIrisDecEnd(Integer cameraId, int nChannelID) { - return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId), nChannelID, + return JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx(CameraConnMap.getConnId(cameraId).getDHSdkLong(), nChannelID, NetSDKLib.NET_PTZ_ControlType.NET_PTZ_APERTURE_DEC_CONTROL, 0, 0, 0, 1); } @@ -263,7 +263,7 @@ public class JoywareCameraControlModuleImpl implements CameraControlModule { stuSnapParams.InterSnap = 0; // timer capture picture time interval stuSnapParams.CmdSerial = CaptureCmdSerial.put(realPath); IntByReference reserved = new IntByReference(0); - Boolean ok = JoywareLoginModuleImpl.netsdk.CLIENT_SnapPictureEx(CameraConnMap.getConnId(cameraId), stuSnapParams, reserved); + Boolean ok = JoywareLoginModuleImpl.netsdk.CLIENT_SnapPictureEx(CameraConnMap.getConnId(cameraId).getDHSdkLong(), stuSnapParams, reserved); if (!ok) { log.error("pic error :{},cameraId:{}", ToolKits.getErrorCodePrint(),cameraId); } @@ -290,7 +290,7 @@ public class JoywareCameraControlModuleImpl implements CameraControlModule { NetSDKLib.NET_OUT_DOWNLOAD_BY_DATA_TYPE net_out_download_by_data_type = new NetSDKLib.NET_OUT_DOWNLOAD_BY_DATA_TYPE(); net_out_download_by_data_type.write(); - NetSDKLib.LLong l = JoywareLoginModuleImpl.netsdk.CLIENT_DownloadByDataType(CameraConnMap.getConnId(cameraId), download_by_data_type.getPointer(), net_out_download_by_data_type.getPointer(), 8000); + NetSDKLib.LLong l = JoywareLoginModuleImpl.netsdk.CLIENT_DownloadByDataType(CameraConnMap.getConnId(cameraId).getDHSdkLong(), download_by_data_type.getPointer(), net_out_download_by_data_type.getPointer(), 8000); if(l.longValue() != 0){ log.info("start download mp4 path:{},startTime:{} ,endTime:{},now:{},status:{},cameraId:{}", path, start, end, LocalDateTime.now(),l.longValue(),cameraId); }else { @@ -299,42 +299,42 @@ public class JoywareCameraControlModuleImpl implements CameraControlModule { } } - /** + *//** * 设置预置点 * * @param ptzId 预置点ID * @param name 预置点的名称 * @param cameraId 球机ID,来获取登录句柄 - */ + *//* public void ptz(Integer ptzId, String name, Integer cameraId) { int dwzCommand = NetSDKLib.NET_PTZ_ControlType.NET_PTZ_POINT_SET_CONTROL; - Boolean ok = JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx2(CameraConnMap.getConnId(cameraId), 0, dwzCommand, 0, ptzId, 0, 0, ToolKits.GetGBKStringToPointer(name)); + Boolean ok = JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx2(CameraConnMap.getConnId(cameraId).getDHSdkLong(), 0, dwzCommand, 0, ptzId, 0, 0, ToolKits.GetGBKStringToPointer(name)); if (!ok) { log.error("ptz error :{},cameraId:{}", ToolKits.getErrorCodePrint(),cameraId); } Assert.isTrue(ok, "设置失败"); } - /** + *//** * 转至 预置点 * * @param ptzId * @param cameraId - */ + *//* public void toPtz(Integer ptzId, Integer cameraId) { log.info("to ptz,ptzId:{},cameraId:{}",ptzId,cameraId); int dwPTZCommand = NetSDKLib.NET_PTZ_ControlType.NET_PTZ_POINT_MOVE_CONTROL; - Boolean ok = JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx2(CameraConnMap.getConnId(cameraId), 0, dwPTZCommand, 0, ptzId, 0, 0, null); + Boolean ok = JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx2(CameraConnMap.getConnId(cameraId).getDHSdkLong(), 0, dwPTZCommand, 0, ptzId, 0, 0, null); if (!ok) { log.error("toPtz error, cameraId:{},ptzId:{},errorCode:{}", cameraId, ptzId,ToolKits.getErrorCodePrint()); } } - /** + *//** * 转至 预置点 * * @param cameraId - */ + *//* public void toPtzSlow(Integer cameraId,Integer x) { int dwPTZCommand = NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_MOVE_ABSOLUTELY; NetSDKLib.PTZ_CONTROL_ABSOLUTELY absolutely = new NetSDKLib.PTZ_CONTROL_ABSOLUTELY(); @@ -345,7 +345,7 @@ public class JoywareCameraControlModuleImpl implements CameraControlModule { absolutely.stuSpeed.fPositionY = 0.2f; absolutely.write(); //absolutely.stuSpeed.fZoom = 0.5f; - Boolean ok = JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx2(CameraConnMap.getConnId(cameraId), 0, dwPTZCommand, + Boolean ok = JoywareLoginModuleImpl.netsdk.CLIENT_DHPTZControlEx2(CameraConnMap.getConnId(cameraId).getDHSdkLong(), 0, dwPTZCommand, 0, 0, 0, 0, absolutely.getPointer()); if (!ok) { @@ -353,10 +353,10 @@ public class JoywareCameraControlModuleImpl implements CameraControlModule { } } - /** + *//** * 旋转360度 * @param cameraId - */ + *//* public void turn360C8(Integer cameraId,Integer ptzId){ Thread thread = new Thread(new Runnable() { @Override @@ -367,7 +367,7 @@ public class JoywareCameraControlModuleImpl implements CameraControlModule { ptzLocationInfo.write(); System.out.println("size:"+ptzLocationInfo.size()); - boolean bRet = JoywareLoginModuleImpl.netsdk.CLIENT_QueryDevState(CameraConnMap.getConnId(cameraId), nType, ptzLocationInfo.getPointer(), ptzLocationInfo.size(), intRetLen, 3000); + boolean bRet = JoywareLoginModuleImpl.netsdk.CLIENT_QueryDevState(CameraConnMap.getConnId(cameraId).getDHSdkLong(), nType, ptzLocationInfo.getPointer(), ptzLocationInfo.size(), intRetLen, 3000); ptzLocationInfo.read(); if (bRet) { @@ -402,3 +402,4 @@ public class JoywareCameraControlModuleImpl implements CameraControlModule { } +*/ \ No newline at end of file diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/JoywareLoginModuleImpl.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/JoywareLoginModuleImpl.java index 1a201db..68ff420 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/JoywareLoginModuleImpl.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/JoywareLoginModuleImpl.java @@ -7,6 +7,7 @@ import com.sun.jna.Pointer; import com.sun.jna.ptr.IntByReference; import com.zhehekeji.web.lib.CameraConnMap; import com.zhehekeji.web.lib.CameraControlLoginModule; +import com.zhehekeji.web.lib.hik.HCNetSDK; import com.zhehekeji.web.lib.joyware.NetSDKLib.LLong; import com.zhehekeji.web.lib.joyware.NetSDKLib.NET_IN_LOGIN_WITH_HIGHLEVEL_SECURITY; import com.zhehekeji.web.lib.joyware.NetSDKLib.NET_OUT_LOGIN_WITH_HIGHLEVEL_SECURITY; @@ -15,12 +16,12 @@ import lombok.extern.slf4j.Slf4j; /** * 登陆接口实现 * 主要有 ：初始化、登陆、登出功能 - */ + *//* @Slf4j public class JoywareLoginModuleImpl implements CameraControlLoginModule { public static NetSDKLib netsdk = NetSDKLib.NETSDK_INSTANCE; - public static NetSDKLib configsdk = NetSDKLib.CONFIG_INSTANCE; + //public static NetSDKLib configsdk = NetSDKLib.CONFIG_INSTANCE; private static int MAX_RECONNET_TIME = 100000; @@ -56,13 +57,13 @@ public class JoywareLoginModuleImpl implements CameraControlLoginModule { return a[0] == 1; } - /** + *//** * \if ENGLISH_LANG * Init * \else * 初始化 * \endif - */ + *//* public boolean init(NetSDKLib.fDisConnect disConnect, NetSDKLib.fHaveReConnect haveReConnect) { bInit = netsdk.CLIENT_Init(disConnect, null); if(!bInit) { @@ -93,13 +94,13 @@ public class JoywareLoginModuleImpl implements CameraControlLoginModule { return true; } - /** + *//** * \if ENGLISH_LANG * CleanUp * \else * 清除环境 * \endif - */ + *//* public static void cleanup() { if(bLogopen) { netsdk.CLIENT_LogClose(); @@ -110,14 +111,14 @@ public class JoywareLoginModuleImpl implements CameraControlLoginModule { } } - /** + *//** * \if ENGLISH_LANG * Login Device * \else * 登录设备 * \endif - */ - public LLong login(String m_strIp, int m_nPort, String m_strUser, String m_strPassword) { + *//* + public HCNetSDK.LLong login(String m_strIp, int m_nPort, String m_strUser, String m_strPassword) { //IntByReference nError = new IntByReference(0); //入参 init(disConnectCallBack,haveReConnect); @@ -141,9 +142,11 @@ public class JoywareLoginModuleImpl implements CameraControlLoginModule { return null; } log.info("joyware login success,loginId:{}",m_hLoginHandle.longValue()); - return m_hLoginHandle; + + return new HCNetSDK.LLong(m_hLoginHandle.longValue()) ; } } +*/ \ No newline at end of file diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/NetSDKLib.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/NetSDKLib.java index b05b9b1..1e88bef 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/NetSDKLib.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/NetSDKLib.java @@ -15,9 +15,9 @@ import java.util.List; */ public interface NetSDKLib extends Library { - NetSDKLib NETSDK_INSTANCE = Native.load(Utils.getLoadLibrary("dhnetsdk"), NetSDKLib.class); + //NetSDKLib NETSDK_INSTANCE = Native.load(Utils.getLoadLibrary("dhnetsdk"), NetSDKLib.class); - NetSDKLib CONFIG_INSTANCE = Native.load(Utils.getLoadLibrary("dhconfigsdk"), NetSDKLib.class); + //NetSDKLib CONFIG_INSTANCE = Native.load(Utils.getLoadLibrary("dhconfigsdk"), NetSDKLib.class); //NetSDKLib CONFIG_JNI = (NetSDKLib)Native.loadLibrary(Utils.getLoadLibrary("JNI1.dll"), INetSDK.class); public static class LLong extends IntegerType { @@ -32296,9 +32296,6 @@ public interface NetSDKLib extends Library { ******************************************************************************/ /** * - * @param lLoginID - * @param NET_IN_TRANSMIT_INFO - * @param NET_OUT_TRANSMIT_INFO * @return */ public boolean CLIENT_TransmitInfoForWebEx(LLong lLoginID, Pointer pInParam, Pointer pOutParam, int nWaittime); @@ -32414,8 +32411,6 @@ public interface NetSDKLib extends Library { /** * 订阅雷达的报警点信息 , pInParam 和pOutParam 资源由用户申请和释放 * @param lLoginID 登录句柄 - * @param pInParam 入参 {@link com.zhehekeji.web.lib.joyware.structure.NET_IN_RADAR_ALARMPOINTINFO} - * @param pOutParam 出参{@link com.zhehekeji.web.lib.joyware.structure.NET_OUT_RADAR_ALARMPOINTINFO} * @param nWaitTime * @return */ @@ -32430,7 +32425,6 @@ public interface NetSDKLib extends Library { /** * 雷达报警点信息回调函数指针 - * pBuf {@link #NET_RADAR_NOTIFY_ALARMPOINTINFO} */ public interface fRadarAlarmPointInfoCallBack extends Callback { public void invoke(LLong lLoginId, LLong lAttachHandle, Pointer pBuf, int dwBufLen, Pointer pReserved, Pointer dwUser); @@ -32448,8 +32442,6 @@ public interface NetSDKLib extends Library { /** * 订阅云台元数据接口,pstuInPtzStatusProc与pstuOutPtzStatusProc内存由用户申请释放 * @param lLoginID 登录句柄 - * @param pInParam 入参 {@link com.zhehekeji.web.lib.joyware.structure.NET_IN_PTZ_STATUS_PROC} - * @param pOutParam 出参{@link com.zhehekeji.web.lib.joyware.structure.NET_OUT_PTZ_STATUS_PROC} * @param nWaitTime * @return */ diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/StopDownLoadThread.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/StopDownLoadThread.java index e190508..5d06813 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/StopDownLoadThread.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/StopDownLoadThread.java @@ -14,6 +14,6 @@ public class StopDownLoadThread extends Thread { @Override public void run() { log.info("stop download:{}",lPlayHandle.longValue()); - JoywareLoginModuleImpl.netsdk.CLIENT_StopDownload(lPlayHandle); + //JoywareLoginModuleImpl.netsdk.CLIENT_StopDownload(lPlayHandle); } } diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/ToolKits.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/ToolKits.java index 7a9339b..cf53888 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/ToolKits.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/ToolKits.java @@ -12,8 +12,8 @@ import java.io.*; import java.text.SimpleDateFormat; public class ToolKits { - static NetSDKLib netsdkapi = NetSDKLib.NETSDK_INSTANCE; - static NetSDKLib configapi = NetSDKLib.CONFIG_INSTANCE; + //static NetSDKLib netsdkapi = NetSDKLib.NETSDK_INSTANCE; + //static NetSDKLib configapi = NetSDKLib.CONFIG_INSTANCE; /*************************************************************************************************** * 工具方法 * @@ -144,7 +144,7 @@ public class ToolKits { * @return */ public static String getErrorCodePrint() { - return "\n{error code: (0x80000000|" + (JoywareLoginModuleImpl.netsdk.CLIENT_GetLastError() & 0x7fffffff) +").参考 ErrorCode.java"; + return "\n{error code: (0x80000000|" + (0x7fffffff) +").参考 ErrorCode.java"; } /** @@ -155,7 +155,7 @@ public class ToolKits { * @param cmdObject 配置对应的结构体对象 * @return 成功返回 true */ - public static boolean SetDevConfig(LLong hLoginHandle, int nChn, String strCmd, Structure cmdObject) { + /*public static boolean SetDevConfig(LLong hLoginHandle, int nChn, String strCmd, Structure cmdObject) { boolean result = false; int nBufferLen = 2*1024*1024; byte szBuffer[] = new byte[nBufferLen]; @@ -179,7 +179,7 @@ public class ToolKits { } return result; - } + }*/ // Win下，将GBK String类型的转为Pointer public static Pointer GetGBKStringToPointer(String src) { diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/Utils.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/Utils.java index 8c8d8e0..d43beeb 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/Utils.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/Utils.java @@ -79,20 +79,22 @@ public class Utils { if(osPrefix.toLowerCase().startsWith("win32-x86")) { loadLibrary = "./libs/win32/"; } else if(osPrefix.toLowerCase().startsWith("win32-amd64") ) { - loadLibrary = "./libs/" + - "win64/"; + loadLibrary = ".\\libs\\hik\\"; } else if(osPrefix.toLowerCase().startsWith("linux-i386")) { loadLibrary = "/lib/javaDhLibs/linux64/lib"; library = library+".so"; }else if(osPrefix.toLowerCase().startsWith("linux-amd64")) { - loadLibrary = "/lib/javaLibs/linux64/lib"; - library = library+".so"; + loadLibrary = "/lib/javaLibs/hikLinux/lib"; + library = library.toLowerCase()+".so"; } - System.out.printf("[Load %s Path : %s]\n", library, loadLibrary + library); return loadLibrary + library; } + public static void main(String[] args) { + System.out.println("HIK".toLowerCase()); + } + private static boolean checking = false; public static void setChecking() { checking = true; diff --git a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/ENUMERROR.java b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/ENUMERROR.java index f21e82b..396b232 100644 --- a/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/ENUMERROR.java +++ b/web/src/main/java/com/zhehekeji/web/lib/joyware/enumeration/ENUMERROR.java @@ -534,7 +534,8 @@ public enum ENUMERROR { } public static ENUMERROR getENUMError() { - int code = NetSDKLib.NETSDK_INSTANCE.CLIENT_GetLastError() & 0x7fffffff; + //int code = NetSDKLib.NETSDK_INSTANCE.CLIENT_GetLastError() & 0x7fffffff; + int code = 0x7fffffff; for (ENUMERROR error : ENUMERROR.values()) { if (error.getCode() == code) { return error; 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 7c45883..5d8ce53 100644 --- a/web/src/main/java/com/zhehekeji/web/service/CameraService.java +++ b/web/src/main/java/com/zhehekeji/web/service/CameraService.java @@ -12,8 +12,9 @@ import com.zhehekeji.web.entity.CameraIOConfig; import com.zhehekeji.web.lib.CameraConnMap; import com.zhehekeji.web.lib.CameraControlLoginModule; import com.zhehekeji.web.lib.CameraControlModule; +import com.zhehekeji.web.lib.hik.HCNetSDK; import com.zhehekeji.web.lib.hik.HikLoginModuleImpl; -import com.zhehekeji.web.lib.joyware.JoywareLoginModuleImpl; +//import com.zhehekeji.web.lib.joyware.JoywareLoginModuleImpl; import com.zhehekeji.web.lib.joyware.NetSDKLib; import com.zhehekeji.web.mapper.CameraIOConfigMapper; import com.zhehekeji.web.mapper.CameraIOMapper; @@ -149,7 +150,7 @@ public class CameraService { if(configProperties.getCameraConfig().getCameraType() == ConfigProperties.HIK_CAMERA){ ok = HikLoginModuleImpl.connectStatus(CameraConnMap.getConnId(camera.getId()).intValue()); }else { - ok = JoywareLoginModuleImpl.connectStatus(CameraConnMap.getConnId(camera.getId())); + //ok = JoywareLoginModuleImpl.connectStatus(CameraConnMap.getConnId(camera.getId()).getDHSdkLong()); } if(ok){ @@ -337,7 +338,7 @@ public class CameraService { } public void cameraLogin(Camera camera){ - NetSDKLib.LLong lLong = cameraControlLoginModule.login(camera.getIp(),camera.getPort(),camera.getUser(),camera.getPassword()); + HCNetSDK.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()); CameraConnMap.conn(camera.getId(),lLong); diff --git a/web/src/main/java/com/zhehekeji/web/service/InitService.java b/web/src/main/java/com/zhehekeji/web/service/InitService.java index d4b381a..7e80310 100644 --- a/web/src/main/java/com/zhehekeji/web/service/InitService.java +++ b/web/src/main/java/com/zhehekeji/web/service/InitService.java @@ -7,11 +7,7 @@ import com.zhehekeji.web.entity.Street; import com.zhehekeji.web.lib.*; import com.zhehekeji.web.lib.hik.HikCameraControlModuleImpl; import com.zhehekeji.web.lib.hik.HikLoginModuleImpl; -import com.zhehekeji.web.lib.joyware.JoywareCameraControlModuleImpl; -import com.zhehekeji.web.lib.joyware.JoywareLoginModuleImpl; -import com.zhehekeji.web.lib.joyware.NetSDKLib; import com.zhehekeji.web.mapper.CameraMapper; -import com.zhehekeji.web.mapper.SensorGunMapper; import com.zhehekeji.web.mapper.StreetMapper; import com.zhehekeji.web.service.ksec.KsecNettyClient; import com.zhehekeji.web.service.robotic.NettyClient; @@ -56,8 +52,10 @@ public class InitService implements ApplicationRunner { public CameraControlLoginModule cameraControlLoginModule(){ CameraControlLoginModule cameraControlLoginModule = null; if(configProperties.getCameraConfig().getCameraType() == ConfigProperties.JOYWARE_CAMERA){ - cameraControlLoginModule = new JoywareLoginModuleImpl(); + System.out.println("利珀相机"); + //cameraControlLoginModule = new JoywareLoginModuleImpl(); }else { + System.out.println("海康相机"); cameraControlLoginModule = new HikLoginModuleImpl(); } cameraService.setCameraLoginModule(cameraControlLoginModule); @@ -68,7 +66,7 @@ public class InitService implements ApplicationRunner { public CameraControlModule cameraControlModule(ConfigProperties configProperties){ CameraControlModule cameraControlModule = null; if(configProperties.getCameraConfig().getCameraType() == ConfigProperties.JOYWARE_CAMERA){ - cameraControlModule = new JoywareCameraControlModuleImpl(); + //cameraControlModule = new JoywareCameraControlModuleImpl(); }else { cameraControlModule = new HikCameraControlModuleImpl(); }