diff --git a/bjairAdmin/pom.xml b/bjairAdmin/pom.xml
index c572949..f4aaa34 100644
--- a/bjairAdmin/pom.xml
+++ b/bjairAdmin/pom.xml
@@ -62,7 +62,7 @@
true
ZIP
-
+
diff --git a/bjairAdmin/src/main/java/com/iformall/controller/market/HaiKangController.java b/bjairAdmin/src/main/java/com/iformall/controller/market/HaiKangController.java
new file mode 100644
index 0000000..11ec974
--- /dev/null
+++ b/bjairAdmin/src/main/java/com/iformall/controller/market/HaiKangController.java
@@ -0,0 +1,44 @@
+package com.iformall.controller.market;
+
+import com.iformall.annotation.SystemControllerLog;
+import com.iformall.common.ResultData;
+import com.iformall.controller.base.BaseController;
+import com.iformall.domain.po.PushLimit;
+import com.iformall.haikang.alarm.Alarm;
+import com.iformall.service.PushLimitService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("hk")
+public class HaiKangController extends BaseController {
+ private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+ @Autowired
+ private Alarm alarm;
+
+ @ApiOperation("监听列表")
+ @GetMapping("listenList")
+ public ResultData listenList() {
+ //PushLimit pushLimit = pushLimitService.getPushLimit(getTenantInfo());
+ return new ResultData();
+ }
+
+
+ @ApiOperation("开启监听")
+ @GetMapping("startListen")
+ public ResultData startListen() {
+ return new ResultData(alarm.listen());
+ }
+
+ @ApiOperation("关闭监听")
+ @PostMapping("stopListen")
+ public ResultData stopListen(@RequestBody PushLimit pushLimit) {
+ alarm.stopListen(0);
+ return new ResultData();
+ }
+}
diff --git a/bjairAdmin/src/main/resources/application-dev.yml b/bjairAdmin/src/main/resources/application-dev.yml
index 19f5162..5c6873e 100644
--- a/bjairAdmin/src/main/resources/application-dev.yml
+++ b/bjairAdmin/src/main/resources/application-dev.yml
@@ -59,6 +59,11 @@ spring:
filehost: ss
filedomain: https://ss.ss-ss.aliyuncs.com
+ haikang:
+ netsdk:
+ libdir: C:\\project\\bjAirport\\bjairService\\lib
+
+
# EMAIL
mail:
host: smtp.exmail.qq.com
diff --git a/bjairAdmin/src/main/resources/application-prod.yml b/bjairAdmin/src/main/resources/application-prod.yml
index 8c7105d..d136b57 100644
--- a/bjairAdmin/src/main/resources/application-prod.yml
+++ b/bjairAdmin/src/main/resources/application-prod.yml
@@ -55,6 +55,11 @@ spring:
bucketname: yuanqizhijia
filehost: homea
filedomain: https://yuanqizhijia.oss-accelerate.aliyuncs.com
+
+ haikang:
+ netsdk:
+ libdir: C:\\project\\bjAirport\\bjairService\\lib
+
# EMAIL
mail:
host: smtp.exmail.qq.com
diff --git a/bjairCApi/pom.xml b/bjairCApi/pom.xml
index 90216ff..6565e6b 100644
--- a/bjairCApi/pom.xml
+++ b/bjairCApi/pom.xml
@@ -36,7 +36,7 @@
true
ZIP
-
+
diff --git a/bjairCApi/src/main/java/com/iformall/controller/HaiKangController.java b/bjairCApi/src/main/java/com/iformall/controller/HaiKangController.java
new file mode 100644
index 0000000..f3af446
--- /dev/null
+++ b/bjairCApi/src/main/java/com/iformall/controller/HaiKangController.java
@@ -0,0 +1,35 @@
+package com.iformall.controller;
+
+import com.iformall.annotation.AuthIgnore;
+import com.iformall.common.ResultData;
+import com.iformall.domain.po.WxMallApply;
+import com.iformall.domain.po.WxMsgValidationcode;
+import com.iformall.haikang.alarm.Alarm;
+import com.iformall.service.WxMallApplyService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/api/hk")
+public class HaiKangController extends BaseController {
+ private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+ @Autowired
+ private Alarm alerm;
+
+ @AuthIgnore
+ @PostMapping("add")
+ public ResultData add(@RequestBody WxMallApply wxMallApply) {
+ logger.debug("[" + getIpAddr() + "] WxMallApplyController::add");
+ //Assert.notNull(wxMallApply.getName(), "角色名不能为空");
+ //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名");
+ return new ResultData();
+
+ }
+
+
+}
diff --git a/bjairCApi/src/main/resources/application-dev.yml b/bjairCApi/src/main/resources/application-dev.yml
index 1666b7e..f71c02d 100644
--- a/bjairCApi/src/main/resources/application-dev.yml
+++ b/bjairCApi/src/main/resources/application-dev.yml
@@ -59,6 +59,10 @@ spring:
filehost: homec
filedomain: https://yuanqizhijia.oss-accelerate.aliyuncs.com
+ haikang:
+ netsdk:
+ libdir: C:\\project\\bjAirport\\bjairService\\lib
+
# EMAIL
mail:
host: smtp.exmail.qq.com
diff --git a/bjairCApi/src/main/resources/application-prod.yml b/bjairCApi/src/main/resources/application-prod.yml
index 78684bf..23c2be1 100644
--- a/bjairCApi/src/main/resources/application-prod.yml
+++ b/bjairCApi/src/main/resources/application-prod.yml
@@ -53,6 +53,10 @@ spring:
bucketname: yuanqizhijia
filehost: homec
filedomain: https://yuanqizhijia.oss-accelerate.aliyuncs.com
+
+ haikang:
+ netsdk:
+ libdir: C:\\project\\bjAirport\\bjairService\\lib
# EMAIL
mail:
diff --git a/bjairService/src/main/resources/lib/AudioRender.dll b/bjairService/lib/AudioRender.dll
similarity index 100%
rename from bjairService/src/main/resources/lib/AudioRender.dll
rename to bjairService/lib/AudioRender.dll
diff --git a/bjairService/src/main/resources/lib/ClientDemo.exe b/bjairService/lib/ClientDemo.exe
similarity index 100%
rename from bjairService/src/main/resources/lib/ClientDemo.exe
rename to bjairService/lib/ClientDemo.exe
diff --git a/bjairService/src/main/resources/lib/ClientDemoDll/ReadMe.txt b/bjairService/lib/ClientDemoDll/ReadMe.txt
similarity index 100%
rename from bjairService/src/main/resources/lib/ClientDemoDll/ReadMe.txt
rename to bjairService/lib/ClientDemoDll/ReadMe.txt
diff --git a/bjairService/src/main/resources/lib/ClientDemoDll/calib.dll b/bjairService/lib/ClientDemoDll/calib.dll
similarity index 100%
rename from bjairService/src/main/resources/lib/ClientDemoDll/calib.dll
rename to bjairService/lib/ClientDemoDll/calib.dll
diff --git a/bjairService/src/main/resources/lib/ClientDemoDll/iconv.dll b/bjairService/lib/ClientDemoDll/iconv.dll
similarity index 100%
rename from bjairService/src/main/resources/lib/ClientDemoDll/iconv.dll
rename to bjairService/lib/ClientDemoDll/iconv.dll
diff --git a/bjairService/src/main/resources/lib/ClientDemoDll/libcrypto-1_1-x64.dll b/bjairService/lib/ClientDemoDll/libcrypto-1_1-x64.dll
similarity index 100%
rename from bjairService/src/main/resources/lib/ClientDemoDll/libcrypto-1_1-x64.dll
rename to bjairService/lib/ClientDemoDll/libcrypto-1_1-x64.dll
diff --git a/bjairService/src/main/resources/lib/ClientDemoDll/libssl-1_1-x64.dll b/bjairService/lib/ClientDemoDll/libssl-1_1-x64.dll
similarity index 100%
rename from bjairService/src/main/resources/lib/ClientDemoDll/libssl-1_1-x64.dll
rename to bjairService/lib/ClientDemoDll/libssl-1_1-x64.dll
diff --git a/bjairService/src/main/resources/lib/ClientDemoDll/libxml2.dll b/bjairService/lib/ClientDemoDll/libxml2.dll
similarity index 100%
rename from bjairService/src/main/resources/lib/ClientDemoDll/libxml2.dll
rename to bjairService/lib/ClientDemoDll/libxml2.dll
diff --git a/bjairService/src/main/resources/lib/ClientDemoDll/zlib1.dll b/bjairService/lib/ClientDemoDll/zlib1.dll
similarity index 100%
rename from bjairService/src/main/resources/lib/ClientDemoDll/zlib1.dll
rename to bjairService/lib/ClientDemoDll/zlib1.dll
diff --git a/bjairService/src/main/resources/lib/DataType.h b/bjairService/lib/DataType.h
similarity index 100%
rename from bjairService/src/main/resources/lib/DataType.h
rename to bjairService/lib/DataType.h
diff --git a/bjairService/src/main/resources/lib/DecodeCardSdk.h b/bjairService/lib/DecodeCardSdk.h
similarity index 100%
rename from bjairService/src/main/resources/lib/DecodeCardSdk.h
rename to bjairService/lib/DecodeCardSdk.h
diff --git a/bjairService/src/main/resources/lib/GdiPlus.dll b/bjairService/lib/GdiPlus.dll
similarity index 100%
rename from bjairService/src/main/resources/lib/GdiPlus.dll
rename to bjairService/lib/GdiPlus.dll
diff --git a/bjairService/src/main/resources/lib/GdiPlus.lib b/bjairService/lib/GdiPlus.lib
similarity index 100%
rename from bjairService/src/main/resources/lib/GdiPlus.lib
rename to bjairService/lib/GdiPlus.lib
diff --git a/bjairService/src/main/resources/lib/HCCore.dll b/bjairService/lib/HCCore.dll
similarity index 100%
rename from bjairService/src/main/resources/lib/HCCore.dll
rename to bjairService/lib/HCCore.dll
diff --git a/bjairService/src/main/resources/lib/HCCore.lib b/bjairService/lib/HCCore.lib
similarity index 100%
rename from bjairService/src/main/resources/lib/HCCore.lib
rename to bjairService/lib/HCCore.lib
diff --git a/bjairService/src/main/resources/lib/HCNetSDK.dll b/bjairService/lib/HCNetSDK.dll
similarity index 100%
rename from bjairService/src/main/resources/lib/HCNetSDK.dll
rename to bjairService/lib/HCNetSDK.dll
diff --git a/bjairService/src/main/resources/lib/HCNetSDK.h b/bjairService/lib/HCNetSDK.h
similarity index 100%
rename from bjairService/src/main/resources/lib/HCNetSDK.h
rename to bjairService/lib/HCNetSDK.h
diff --git a/bjairService/src/main/resources/lib/HCNetSDK.lib b/bjairService/lib/HCNetSDK.lib
similarity index 100%
rename from bjairService/src/main/resources/lib/HCNetSDK.lib
rename to bjairService/lib/HCNetSDK.lib
diff --git a/bjairService/src/main/resources/lib/HCNetSDKCom/AnalyzeData.dll b/bjairService/lib/HCNetSDKCom/AnalyzeData.dll
similarity index 100%
rename from bjairService/src/main/resources/lib/HCNetSDKCom/AnalyzeData.dll
rename to bjairService/lib/HCNetSDKCom/AnalyzeData.dll
diff --git a/bjairService/src/main/resources/lib/HCNetSDKCom/AudioIntercom.dll b/bjairService/lib/HCNetSDKCom/AudioIntercom.dll
similarity index 100%
rename from bjairService/src/main/resources/lib/HCNetSDKCom/AudioIntercom.dll
rename to bjairService/lib/HCNetSDKCom/AudioIntercom.dll
diff --git a/bjairService/src/main/resources/lib/HCNetSDKCom/AudioRender.dll b/bjairService/lib/HCNetSDKCom/AudioRender.dll
similarity index 100%
rename from bjairService/src/main/resources/lib/HCNetSDKCom/AudioRender.dll
rename to bjairService/lib/HCNetSDKCom/AudioRender.dll
diff --git a/bjairService/src/main/resources/lib/HCNetSDKCom/HCAlarm.dll b/bjairService/lib/HCNetSDKCom/HCAlarm.dll
similarity index 100%
rename from bjairService/src/main/resources/lib/HCNetSDKCom/HCAlarm.dll
rename to bjairService/lib/HCNetSDKCom/HCAlarm.dll
diff --git a/bjairService/src/main/resources/lib/HCNetSDKCom/HCAlarm.lib b/bjairService/lib/HCNetSDKCom/HCAlarm.lib
similarity index 100%
rename from bjairService/src/main/resources/lib/HCNetSDKCom/HCAlarm.lib
rename to bjairService/lib/HCNetSDKCom/HCAlarm.lib
diff --git a/bjairService/src/main/resources/lib/HCNetSDKCom/HCCoreDevCfg.dll b/bjairService/lib/HCNetSDKCom/HCCoreDevCfg.dll
similarity index 100%
rename from bjairService/src/main/resources/lib/HCNetSDKCom/HCCoreDevCfg.dll
rename to bjairService/lib/HCNetSDKCom/HCCoreDevCfg.dll
diff --git a/bjairService/src/main/resources/lib/HCNetSDKCom/HCDisplay.dll b/bjairService/lib/HCNetSDKCom/HCDisplay.dll
similarity index 100%
rename from bjairService/src/main/resources/lib/HCNetSDKCom/HCDisplay.dll
rename to bjairService/lib/HCNetSDKCom/HCDisplay.dll
diff --git a/bjairService/src/main/resources/lib/HCNetSDKCom/HCGeneralCfgMgr.dll b/bjairService/lib/HCNetSDKCom/HCGeneralCfgMgr.dll
similarity index 100%
rename from bjairService/src/main/resources/lib/HCNetSDKCom/HCGeneralCfgMgr.dll
rename to bjairService/lib/HCNetSDKCom/HCGeneralCfgMgr.dll
diff --git a/bjairService/src/main/resources/lib/HCNetSDKCom/HCGeneralCfgMgr.lib b/bjairService/lib/HCNetSDKCom/HCGeneralCfgMgr.lib
similarity index 100%
rename from bjairService/src/main/resources/lib/HCNetSDKCom/HCGeneralCfgMgr.lib
rename to bjairService/lib/HCNetSDKCom/HCGeneralCfgMgr.lib
diff --git a/bjairService/src/main/resources/lib/HCNetSDKCom/HCIndustry.dll b/bjairService/lib/HCNetSDKCom/HCIndustry.dll
similarity index 100%
rename from bjairService/src/main/resources/lib/HCNetSDKCom/HCIndustry.dll
rename to bjairService/lib/HCNetSDKCom/HCIndustry.dll
diff --git a/bjairService/src/main/resources/lib/HCNetSDKCom/HCPlayBack.dll b/bjairService/lib/HCNetSDKCom/HCPlayBack.dll
similarity index 100%
rename from bjairService/src/main/resources/lib/HCNetSDKCom/HCPlayBack.dll
rename to bjairService/lib/HCNetSDKCom/HCPlayBack.dll
diff --git a/bjairService/src/main/resources/lib/HCNetSDKCom/HCPreview.dll b/bjairService/lib/HCNetSDKCom/HCPreview.dll
similarity index 100%
rename from bjairService/src/main/resources/lib/HCNetSDKCom/HCPreview.dll
rename to bjairService/lib/HCNetSDKCom/HCPreview.dll
diff --git a/bjairService/src/main/resources/lib/HCNetSDKCom/HCPreview.lib b/bjairService/lib/HCNetSDKCom/HCPreview.lib
similarity index 100%
rename from bjairService/src/main/resources/lib/HCNetSDKCom/HCPreview.lib
rename to bjairService/lib/HCNetSDKCom/HCPreview.lib
diff --git a/bjairService/src/main/resources/lib/HCNetSDKCom/HCVoiceTalk.dll b/bjairService/lib/HCNetSDKCom/HCVoiceTalk.dll
similarity index 100%
rename from bjairService/src/main/resources/lib/HCNetSDKCom/HCVoiceTalk.dll
rename to bjairService/lib/HCNetSDKCom/HCVoiceTalk.dll
diff --git a/bjairService/src/main/resources/lib/HCNetSDKCom/OpenAL32.dll b/bjairService/lib/HCNetSDKCom/OpenAL32.dll
similarity index 100%
rename from bjairService/src/main/resources/lib/HCNetSDKCom/OpenAL32.dll
rename to bjairService/lib/HCNetSDKCom/OpenAL32.dll
diff --git a/bjairService/src/main/resources/lib/HCNetSDKCom/StreamTransClient.dll b/bjairService/lib/HCNetSDKCom/StreamTransClient.dll
similarity index 100%
rename from bjairService/src/main/resources/lib/HCNetSDKCom/StreamTransClient.dll
rename to bjairService/lib/HCNetSDKCom/StreamTransClient.dll
diff --git a/bjairService/src/main/resources/lib/HCNetSDKCom/SystemTransform.dll b/bjairService/lib/HCNetSDKCom/SystemTransform.dll
similarity index 100%
rename from bjairService/src/main/resources/lib/HCNetSDKCom/SystemTransform.dll
rename to bjairService/lib/HCNetSDKCom/SystemTransform.dll
diff --git a/bjairService/src/main/resources/lib/HCNetSDKCom/libiconv2.dll b/bjairService/lib/HCNetSDKCom/libiconv2.dll
similarity index 100%
rename from bjairService/src/main/resources/lib/HCNetSDKCom/libiconv2.dll
rename to bjairService/lib/HCNetSDKCom/libiconv2.dll
diff --git a/bjairService/src/main/resources/lib/HXVA.dll b/bjairService/lib/HXVA.dll
similarity index 100%
rename from bjairService/src/main/resources/lib/HXVA.dll
rename to bjairService/lib/HXVA.dll
diff --git a/bjairService/src/main/resources/lib/HmMerge.dll b/bjairService/lib/HmMerge.dll
similarity index 100%
rename from bjairService/src/main/resources/lib/HmMerge.dll
rename to bjairService/lib/HmMerge.dll
diff --git a/bjairService/src/main/resources/lib/LocalSensorAdd.dat b/bjairService/lib/LocalSensorAdd.dat
similarity index 100%
rename from bjairService/src/main/resources/lib/LocalSensorAdd.dat
rename to bjairService/lib/LocalSensorAdd.dat
diff --git a/bjairService/src/main/resources/lib/LocalXml.zip b/bjairService/lib/LocalXml.zip
similarity index 100%
rename from bjairService/src/main/resources/lib/LocalXml.zip
rename to bjairService/lib/LocalXml.zip
diff --git a/bjairService/src/main/resources/lib/MP_Render.dll b/bjairService/lib/MP_Render.dll
similarity index 100%
rename from bjairService/src/main/resources/lib/MP_Render.dll
rename to bjairService/lib/MP_Render.dll
diff --git a/bjairService/src/main/resources/lib/NPQos.dll b/bjairService/lib/NPQos.dll
similarity index 100%
rename from bjairService/src/main/resources/lib/NPQos.dll
rename to bjairService/lib/NPQos.dll
diff --git a/bjairService/src/main/resources/lib/OpenAL32.dll b/bjairService/lib/OpenAL32.dll
similarity index 100%
rename from bjairService/src/main/resources/lib/OpenAL32.dll
rename to bjairService/lib/OpenAL32.dll
diff --git a/bjairService/src/main/resources/lib/PlayCtrl.dll b/bjairService/lib/PlayCtrl.dll
similarity index 100%
rename from bjairService/src/main/resources/lib/PlayCtrl.dll
rename to bjairService/lib/PlayCtrl.dll
diff --git a/bjairService/src/main/resources/lib/PlayCtrl.lib b/bjairService/lib/PlayCtrl.lib
similarity index 100%
rename from bjairService/src/main/resources/lib/PlayCtrl.lib
rename to bjairService/lib/PlayCtrl.lib
diff --git a/bjairService/src/main/resources/lib/SuperRender.dll b/bjairService/lib/SuperRender.dll
similarity index 100%
rename from bjairService/src/main/resources/lib/SuperRender.dll
rename to bjairService/lib/SuperRender.dll
diff --git a/bjairService/src/main/resources/lib/YUVProcess.dll b/bjairService/lib/YUVProcess.dll
similarity index 100%
rename from bjairService/src/main/resources/lib/YUVProcess.dll
rename to bjairService/lib/YUVProcess.dll
diff --git a/bjairService/src/main/resources/lib/examples-1.0.0.jar b/bjairService/lib/examples-1.0.0.jar
similarity index 100%
rename from bjairService/src/main/resources/lib/examples-1.0.0.jar
rename to bjairService/lib/examples-1.0.0.jar
diff --git a/bjairService/src/main/resources/lib/hlog.dll b/bjairService/lib/hlog.dll
similarity index 100%
rename from bjairService/src/main/resources/lib/hlog.dll
rename to bjairService/lib/hlog.dll
diff --git a/bjairService/src/main/resources/lib/hpr.dll b/bjairService/lib/hpr.dll
similarity index 100%
rename from bjairService/src/main/resources/lib/hpr.dll
rename to bjairService/lib/hpr.dll
diff --git a/bjairService/src/main/resources/lib/jna-1.0.0.jar b/bjairService/lib/jna-1.0.0.jar
similarity index 100%
rename from bjairService/src/main/resources/lib/jna-1.0.0.jar
rename to bjairService/lib/jna-1.0.0.jar
diff --git a/bjairService/src/main/resources/lib/jna-4.5.2.jar b/bjairService/lib/jna-4.5.2.jar
similarity index 100%
rename from bjairService/src/main/resources/lib/jna-4.5.2.jar
rename to bjairService/lib/jna-4.5.2.jar
diff --git a/bjairService/src/main/resources/lib/libcrypto-1_1-x64.dll b/bjairService/lib/libcrypto-1_1-x64.dll
similarity index 100%
rename from bjairService/src/main/resources/lib/libcrypto-1_1-x64.dll
rename to bjairService/lib/libcrypto-1_1-x64.dll
diff --git a/bjairService/src/main/resources/lib/libmmd.dll b/bjairService/lib/libmmd.dll
similarity index 100%
rename from bjairService/src/main/resources/lib/libmmd.dll
rename to bjairService/lib/libmmd.dll
diff --git a/bjairService/src/main/resources/lib/libssl-1_1-x64.dll b/bjairService/lib/libssl-1_1-x64.dll
similarity index 100%
rename from bjairService/src/main/resources/lib/libssl-1_1-x64.dll
rename to bjairService/lib/libssl-1_1-x64.dll
diff --git a/bjairService/src/main/resources/lib/plaympeg4.h b/bjairService/lib/plaympeg4.h
similarity index 100%
rename from bjairService/src/main/resources/lib/plaympeg4.h
rename to bjairService/lib/plaympeg4.h
diff --git a/bjairService/src/main/resources/lib/zlib1.dll b/bjairService/lib/zlib1.dll
similarity index 100%
rename from bjairService/src/main/resources/lib/zlib1.dll
rename to bjairService/lib/zlib1.dll
diff --git a/bjairService/pom.xml b/bjairService/pom.xml
index 1b2c198..88bb30e 100644
--- a/bjairService/pom.xml
+++ b/bjairService/pom.xml
@@ -57,24 +57,24 @@
com.iformall.haikang
jna
1.0.0
- system
- ${project.basedir}/src/main/resources/lib/jna-1.0.0.jar
+
com.iformall.haikang
jna_1
4.5.2
- system
- ${project.basedir}/src/main/resources/lib/jna-4.5.2.jar
+
com.iformall.haikang
examples
1.0.0
- system
- ${project.basedir}/src/main/resources/lib/examples-1.0.0.jar
+
diff --git a/bjairService/src/main/java/com/iformall/file/haikang/HaiKangNetSdkConfig.java b/bjairService/src/main/java/com/iformall/file/haikang/HaiKangNetSdkConfig.java
new file mode 100644
index 0000000..28abf55
--- /dev/null
+++ b/bjairService/src/main/java/com/iformall/file/haikang/HaiKangNetSdkConfig.java
@@ -0,0 +1,15 @@
+package com.iformall.file.haikang;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * aliyun 配置
+ */
+@Component
+@Data
+@ConfigurationProperties(prefix = "spring.haikang.netsdk")
+public class HaiKangNetSdkConfig {
+ private String libdir;
+}
\ No newline at end of file
diff --git a/bjairService/src/main/java/com/iformall/haikang/alarm/Alarm.java b/bjairService/src/main/java/com/iformall/haikang/alarm/Alarm.java
index 7155fb2..2928ff3 100644
--- a/bjairService/src/main/java/com/iformall/haikang/alarm/Alarm.java
+++ b/bjairService/src/main/java/com/iformall/haikang/alarm/Alarm.java
@@ -1,6 +1,7 @@
package com.iformall.haikang.alarm;
+import com.iformall.file.haikang.HaiKangNetSdkConfig;
import com.iformall.haikang.alarm.common.HCNetSDK;
import com.iformall.haikang.alarm.common.osSelect;
import com.sun.jna.Native;
@@ -13,12 +14,16 @@ import javax.annotation.PreDestroy;
import org.apache.commons.logging.LogFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class Alarm {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+ @Autowired
+ HaiKangNetSdkConfig hkConfig;
private HCNetSDK hCNetSDK = null;
private int lUserID = -1;//用户句柄 实现对设备登录
@@ -35,14 +40,17 @@ public class Alarm {
private boolean createSDKInstance() {
if (hCNetSDK == null) {
synchronized (HCNetSDK.class) {
- String strDllPath = "";
+ String strDllPath = hkConfig.getLibdir();
try {
- if (osSelect.isWindows())
+ if (osSelect.isWindows()) {
//win系统加载库路径
- strDllPath = System.getProperty("user.dir") + "\\lib\\HCNetSDK.dll";
- else if (osSelect.isLinux())
+ //strDllPath = System.getProperty("user.dir") + "\\lib\\HCNetSDK.dll";
+ strDllPath = strDllPath + "\\lib\\HCNetSDK.dll";
+ }else if (osSelect.isLinux()) {
//Linux系统加载库路径
- strDllPath = System.getProperty("user.dir") + "/lib/libhcnetsdk.so";
+ //strDllPath = System.getProperty("user.dir") + "/lib/libhcnetsdk.so";
+ strDllPath = strDllPath + "/lib/libhcnetsdk.so";
+ }
hCNetSDK = (HCNetSDK) Native.loadLibrary(strDllPath, HCNetSDK.class);
} catch (Exception ex) {
logger.error("createSDKInstance loadLibrary: " + strDllPath + " Error: " + ex.getMessage(),ex);
@@ -110,7 +118,7 @@ public class Alarm {
public void onDestory() {
//释放SDK
if (hCNetSDK != null) {
- stopListen();
+ //stopListen();
hCNetSDK.NET_DVR_Cleanup();
}
}
@@ -119,7 +127,7 @@ public class Alarm {
* 开启监听
* @return
*/
- public void listen() {
+ public int listen() {
if (hCNetSDK == null) {
initSdk();
}
@@ -127,6 +135,8 @@ public class Alarm {
//lUserID=loginDevice( "192.168.2.200", (short) 8000, "admin", "wushikeji001"); //登录设备
lListenHandle = startListen("192.168.2.103",(short) 7201);
+ return lListenHandle;
+
//设备注销
//logoutDev(lUserID);
}
@@ -135,9 +145,8 @@ public class Alarm {
* 停止监听
* @param Handle 监听句柄
*/
- public void stopListen()
+ public void stopListen(int Handle)
{
- int Handle = lListenHandle;
if (Handle <= -1)
{
logger.info("监听未开启");