linux必须得依赖

libs/hikLinux/HCNetSDK_Log_Switch.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="GB2312"?>
+<SdkLocal>
+	<SdkLog>
+        <logLevel>3</logLevel><!--req, 1-ERROR, 2-DEBUG, 3-INFO-->
+        <logDirectory>./SDKLOG/</logDirectory><!--the end of the string must be '/'-->
+        <autoDelete>true</autoDelete><!--true: There are less than 10 files in the directory, it will be auto deleted by sdk when the files are more than 10; false: No upper limit to the number of log files-->
+    </SdkLog>
+	<HeartbeatCfg>
+		<Interval>120</Interval> <!-- 心跳时间间隔，单位秒，等于0，使用默认值120s，取值范围为[30, 120] 小于30s，间隔为30s，大于120s，间隔为120s-->
+		<Count>1</Count> 	<!-- 触发异常回调需要心跳交互异常的次数，等于0，使用默认值1次-->
+	</HeartbeatCfg>
+</SdkLocal>

web/src/main/java/com/zhehekeji/web/lib/hik/HCNetSDK.java

@@ -11,17 +11,15 @@
 
 package com.zhehekeji.web.lib.hik;
 
-import com.sun.jna.Native;
-import com.sun.jna.Pointer;
-import com.sun.jna.Structure;
-import com.sun.jna.Union;
+import com.sun.jna.*;
 import com.sun.jna.examples.win32.GDI32.RECT;
 import com.sun.jna.examples.win32.W32API;
 import com.sun.jna.examples.win32.W32API.HWND;
 import com.sun.jna.ptr.ByteByReference;
 import com.sun.jna.ptr.IntByReference;
 import com.sun.jna.ptr.ShortByReference;
-import com.sun.jna.win32.StdCallLibrary;
+import com.zhehekeji.web.lib.joyware.CallBack;
+import com.zhehekeji.web.lib.joyware.Utils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -30,9 +28,9 @@ import java.util.List;
 //import com.sun.
 
 //SDK接口说明,HCNetSDK.dll
-public interface HCNetSDK extends StdCallLibrary {
+public interface HCNetSDK extends Library {
 
-    HCNetSDK INSTANCE = Native.load(".\\libs\\hik\\HCNetSDK", HCNetSDK.class);
+    HCNetSDK INSTANCE = Native.load(Utils.getLoadLibrary("hcnetsdk"),  HCNetSDK.class);
     //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);    /***宏定义***/
@@ -3216,7 +3214,7 @@ DVR实现巡航数据结构
     public static final int NET_DVR_LOGIN_USERNAME_MAX_LEN = 64;
     public static final int NET_DVR_LOGIN_PASSWD_MAX_LEN = 64;
 
-    public static interface FLoginResultCallBack extends StdCallCallback{
+    public static interface FLoginResultCallBack extends Callback{
         public int invoke(int lUserID,int dwResult,NET_DVR_DEVICEINFO_V30 lpDeviceinfo,Pointer pUser);
     }
 
@@ -6730,91 +6728,91 @@ DVR实现巡航数据结构
 
 
     /***API函数声明,详细说明见API手册***/
-    public static interface FRealDataCallBack_V30 extends StdCallCallback {
+    public static interface FRealDataCallBack_V30 extends Callback {
         public void invoke(int lRealHandle, int dwDataType,
                            ByteByReference pBuffer, int dwBufSize, Pointer pUser);
     }
 
-    public static interface FMSGCallBack extends StdCallCallback {
+    public static interface FMSGCallBack extends Callback {
         public void invoke(int lCommand, NET_DVR_ALARMER pAlarmer, Pointer pAlarmInfo, int dwBufLen, Pointer pUser);
     }
 
-    public static interface FMSGCallBack_V31 extends StdCallCallback {
+    public static interface FMSGCallBack_V31 extends Callback {
         public boolean invoke(int lCommand, NET_DVR_ALARMER pAlarmer, Pointer pAlarmInfo, int dwBufLen, Pointer pUser);
     }
 
-    public static interface FMessCallBack extends StdCallCallback {
+    public static interface FMessCallBack extends Callback {
         public boolean invoke(int lCommand,String sDVRIP,String pBuf,int dwBufLen);
     }
 
-    public static interface FMessCallBack_EX extends StdCallCallback {
+    public static interface FMessCallBack_EX extends Callback {
         public boolean invoke(int lCommand,int lUserID,String pBuf,int dwBufLen);
     }
 
-    public static interface FMessCallBack_NEW extends StdCallCallback {
+    public static interface FMessCallBack_NEW extends Callback {
         public boolean invoke(int lCommand,String sDVRIP,String pBuf,int dwBufLen, short dwLinkDVRPort);
     }
 
-    public static interface FMessageCallBack extends StdCallCallback {
+    public static interface FMessageCallBack extends Callback {
         public boolean invoke(int lCommand,String sDVRIP,String pBuf,int dwBufLen, int dwUser);
     }
 
-    public static interface FExceptionCallBack extends StdCallCallback {
+    public static interface FExceptionCallBack extends Callback {
         public void invoke(int dwType, int lUserID, int lHandle, Pointer pUser);
     }
-    public static interface FDrawFun extends StdCallCallback {
+    public static interface FDrawFun extends Callback {
         public void invoke(int lRealHandle,W32API.HDC hDc,int dwUser);
     }
 
-    public static interface FStdDataCallBack extends StdCallCallback {
+    public static interface FStdDataCallBack extends Callback {
         public void invoke(int lRealHandle, int dwDataType, ByteByReference pBuffer,int dwBufSize,int dwUser);
     }
 
-    public static interface FPlayDataCallBack extends StdCallCallback {
+    public static interface FPlayDataCallBack extends Callback {
         public void invoke(int lPlayHandle, int dwDataType, ByteByReference pBuffer,int dwBufSize,int dwUser);
     }
 
-    public static interface FVoiceDataCallBack extends StdCallCallback {
+    public static interface FVoiceDataCallBack extends Callback {
         public void invoke(int lVoiceComHandle, String pRecvDataBuffer, int dwBufSize, byte byAudioFlag, int dwUser);
     }
 
-    public static interface FVoiceDataCallBack_V30 extends StdCallCallback {
+    public static interface FVoiceDataCallBack_V30 extends Callback {
         public void invoke(int lVoiceComHandle, String pRecvDataBuffer, int dwBufSize, byte byAudioFlag,Pointer pUser);
     }
 
-    public static interface FVoiceDataCallBack_MR extends StdCallCallback {
+    public static interface FVoiceDataCallBack_MR extends Callback {
         public void invoke(int lVoiceComHandle, String pRecvDataBuffer, int dwBufSize, byte byAudioFlag, int dwUser);
     }
 
-    public static interface FVoiceDataCallBack_MR_V30 extends StdCallCallback {
+    public static interface FVoiceDataCallBack_MR_V30 extends Callback {
         public void invoke(int lVoiceComHandle, String pRecvDataBuffer, int dwBufSize, byte byAudioFlag, String pUser);
     }
 
-    public static interface FVoiceDataCallBack2 extends StdCallCallback {
+    public static interface FVoiceDataCallBack2 extends Callback {
         public void invoke(String pRecvDataBuffer, int dwBufSize, Pointer pUser);
     }
 
-    public static interface FSerialDataCallBack extends StdCallCallback {
+    public static interface FSerialDataCallBack extends Callback {
         public void invoke(int lSerialHandle,String pRecvDataBuffer,int dwBufSize,int dwUser);
     }
 
-    public static interface FRowDataCallBack extends StdCallCallback {
+    public static interface FRowDataCallBack extends Callback {
         public void invoke(int lUserID,String  sIPAddr, int lRowAmout, String pRecvDataBuffer,int dwBufSize,int dwUser);
     }
 
-    public static interface FColLocalDataCallBack extends StdCallCallback {
+    public static interface FColLocalDataCallBack extends Callback {
         public void invoke(int lUserID, String sIPAddr, int lColumnAmout, String pRecvDataBuffer,int dwBufSize,int dwUser);
     }
 
-    public static interface FColGlobalDataCallBack extends StdCallCallback {
+    public static interface FColGlobalDataCallBack extends Callback {
         public void invoke(int lUserID, String sIPAddr, int lColumnAmout, String pRecvDataBuffer,int dwBufSize,int dwUser);
     }
 
-    public static interface FJpegdataCallBack extends StdCallCallback {
+    public static interface FJpegdataCallBack extends Callback {
         public int invoke(int lCommand, int lUserID, String sDVRIP, String sJpegName, String pJpegBuf,int dwBufLen, int dwUser);
     }
 
-    public static interface FPostMessageCallBack extends StdCallCallback {
+    public static interface FPostMessageCallBack extends Callback {
         public int invoke(int dwType, int lIndex);
     }
 
@@ -6973,7 +6971,7 @@ DVR实现巡航数据结构
 //透明通道设置
     int  NET_DVR_SerialStart(int lUserID,int lSerialPort,FSerialDataCallBack fSerialDataCallBack,int dwUser);
 
-    public static interface FSerialDataCallBack_V40 extends StdCallCallback {
+    public static interface FSerialDataCallBack_V40 extends Callback {
         public void invoke(int lSerialHandle, int lCHannel, byte[] pRecvDataBuffer, int dwBufSize, Pointer pUser);
     }
     int  NET_DVR_SerialStart_V40(int lUserID, Pointer lpInBuffer, int dwInBufferSize, FSerialDataCallBack_V40 fSerialDataCallBack_V40,Pointer pUser);
@@ -7148,7 +7146,7 @@ DVR实现巡航数据结构
     boolean  NET_DVR_ContinuousShoot(int lUserID, NET_DVR_SNAPCFG lpInter);
     boolean  NET_DVR_ManualSnap(int lUserID, NET_DVR_MANUALSNAP lpInter, NET_DVR_PLATE_RESULT lpOuter);
 
-    public static interface FRemoteConfigCallback extends StdCallCallback {
+    public static interface FRemoteConfigCallback extends Callback {
         public void invoke(int dwType, Pointer lpBuffer, int dwBufLen, Pointer pUserData);
     }
 
@@ -7246,7 +7244,7 @@ DVR实现巡航数据结构
         public byte[] byRes = new byte[12];
     }
 
-    public static interface fGPSDataCallback extends StdCallCallback {
+    public static interface fGPSDataCallback extends Callback {
         public void invoke(int nHandle, int dwState, Pointer lpBuffer, int dwBufLen, Pointer pUser);
     }
 
@@ -7255,7 +7253,7 @@ DVR实现巡航数据结构
 
 
 //播放库函数声明,PlayCtrl.dll
-interface PlayCtrl extends StdCallLibrary
+interface PlayCtrl extends Library
 {
     PlayCtrl INSTANCE = (PlayCtrl) Native.loadLibrary("../lib/PlayCtrl.dll",
             PlayCtrl.class);

web/src/main/java/com/zhehekeji/web/lib/hik/HikCameraControlModuleImpl.java

@@ -329,7 +329,7 @@ public class HikCameraControlModuleImpl implements CameraControlModule {
 
     public static void convetor(String videoInputPath, String videoOutPath){
         List<String> command = new ArrayList<String>();
-        command.add(".\\libs\\ffmpeg\\ffmpeg.exe");
+        command.add("ffmpeg");
         command.add("-i");
         command.add(videoInputPath);
         command.add("-c");

web/src/main/java/com/zhehekeji/web/lib/joyware/Utils.java

@@ -2,6 +2,10 @@ package com.zhehekeji.web.lib.joyware;
 
 import com.sun.jna.Platform;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
 public class Utils {
 	public Utils() {
 
@@ -75,11 +79,14 @@ public class Utils {
 		if(osPrefix.toLowerCase().startsWith("win32-x86")) {
 			loadLibrary = "./libs/win32/";
 		} else if(osPrefix.toLowerCase().startsWith("win32-amd64") ) {
-			loadLibrary = "./libs/win64/";
+			loadLibrary = "./libs/" +
+					"win64/";
 		} else if(osPrefix.toLowerCase().startsWith("linux-i386")) {
-			loadLibrary = "";
+			loadLibrary = "/lib/javaDhLibs/linux64/lib";
+			library = library+".so";
 		}else if(osPrefix.toLowerCase().startsWith("linux-amd64")) {
-			loadLibrary = "";
+			loadLibrary = "/lib/javaLibs/linux64/lib";
+			library = library+".so";
 		}
 
 		System.out.printf("[Load %s Path : %s]\n", library, loadLibrary + library);

web/src/main/resources/application-prod.yml

@@ -7,14 +7,14 @@ spring:
     maxWait: 60000
     minEvictableIdleTimeMillis: 300000
     minIdle: 15
-    password: Leaper@123
+    password: root
     poolPreparedStatements: true
     testOnBorrow: true
     testOnReturn: false
     testWhileIdle: false
     timeBetweenEvictionRunsMillis: 60000
     type: com.alibaba.druid.pool.DruidDataSource
-    url: jdbc:mysql://127.0.0.1:3306/lia_duoji?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
+    url: jdbc:mysql://127.0.0.1:3306/lia_duoji?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
     username: root
     validationQuery: SELECT 1 FROM DUAL
 # --------本服务端口号