Bladeren bron

fix

master
winter 1 maand geleden
bovenliggende
commit
c0c36ef557
68 gewijzigde bestanden met toevoegingen van 140 en 19 verwijderingen
  1. +2
    -2
      bjairAdmin/pom.xml
  2. +44
    -0
      bjairAdmin/src/main/java/com/iformall/controller/market/HaiKangController.java
  3. +5
    -0
      bjairAdmin/src/main/resources/application-dev.yml
  4. +5
    -0
      bjairAdmin/src/main/resources/application-prod.yml
  5. +2
    -2
      bjairCApi/pom.xml
  6. +35
    -0
      bjairCApi/src/main/java/com/iformall/controller/HaiKangController.java
  7. +4
    -0
      bjairCApi/src/main/resources/application-dev.yml
  8. +4
    -0
      bjairCApi/src/main/resources/application-prod.yml
  9. +0
    -0
      bjairService/lib/AudioRender.dll
  10. +0
    -0
      bjairService/lib/ClientDemo.exe
  11. +0
    -0
      bjairService/lib/ClientDemoDll/ReadMe.txt
  12. +0
    -0
      bjairService/lib/ClientDemoDll/calib.dll
  13. +0
    -0
      bjairService/lib/ClientDemoDll/iconv.dll
  14. +0
    -0
      bjairService/lib/ClientDemoDll/libcrypto-1_1-x64.dll
  15. +0
    -0
      bjairService/lib/ClientDemoDll/libssl-1_1-x64.dll
  16. +0
    -0
      bjairService/lib/ClientDemoDll/libxml2.dll
  17. +0
    -0
      bjairService/lib/ClientDemoDll/zlib1.dll
  18. +0
    -0
      bjairService/lib/DataType.h
  19. +0
    -0
      bjairService/lib/DecodeCardSdk.h
  20. +0
    -0
      bjairService/lib/GdiPlus.dll
  21. +0
    -0
      bjairService/lib/GdiPlus.lib
  22. +0
    -0
      bjairService/lib/HCCore.dll
  23. +0
    -0
      bjairService/lib/HCCore.lib
  24. +0
    -0
      bjairService/lib/HCNetSDK.dll
  25. +0
    -0
      bjairService/lib/HCNetSDK.h
  26. +0
    -0
      bjairService/lib/HCNetSDK.lib
  27. +0
    -0
      bjairService/lib/HCNetSDKCom/AnalyzeData.dll
  28. +0
    -0
      bjairService/lib/HCNetSDKCom/AudioIntercom.dll
  29. +0
    -0
      bjairService/lib/HCNetSDKCom/AudioRender.dll
  30. +0
    -0
      bjairService/lib/HCNetSDKCom/HCAlarm.dll
  31. +0
    -0
      bjairService/lib/HCNetSDKCom/HCAlarm.lib
  32. +0
    -0
      bjairService/lib/HCNetSDKCom/HCCoreDevCfg.dll
  33. +0
    -0
      bjairService/lib/HCNetSDKCom/HCDisplay.dll
  34. +0
    -0
      bjairService/lib/HCNetSDKCom/HCGeneralCfgMgr.dll
  35. +0
    -0
      bjairService/lib/HCNetSDKCom/HCGeneralCfgMgr.lib
  36. +0
    -0
      bjairService/lib/HCNetSDKCom/HCIndustry.dll
  37. +0
    -0
      bjairService/lib/HCNetSDKCom/HCPlayBack.dll
  38. +0
    -0
      bjairService/lib/HCNetSDKCom/HCPreview.dll
  39. +0
    -0
      bjairService/lib/HCNetSDKCom/HCPreview.lib
  40. +0
    -0
      bjairService/lib/HCNetSDKCom/HCVoiceTalk.dll
  41. +0
    -0
      bjairService/lib/HCNetSDKCom/OpenAL32.dll
  42. +0
    -0
      bjairService/lib/HCNetSDKCom/StreamTransClient.dll
  43. +0
    -0
      bjairService/lib/HCNetSDKCom/SystemTransform.dll
  44. +0
    -0
      bjairService/lib/HCNetSDKCom/libiconv2.dll
  45. +0
    -0
      bjairService/lib/HXVA.dll
  46. +0
    -0
      bjairService/lib/HmMerge.dll
  47. +0
    -0
      bjairService/lib/LocalSensorAdd.dat
  48. +0
    -0
      bjairService/lib/LocalXml.zip
  49. +0
    -0
      bjairService/lib/MP_Render.dll
  50. +0
    -0
      bjairService/lib/NPQos.dll
  51. +0
    -0
      bjairService/lib/OpenAL32.dll
  52. +0
    -0
      bjairService/lib/PlayCtrl.dll
  53. +0
    -0
      bjairService/lib/PlayCtrl.lib
  54. +0
    -0
      bjairService/lib/SuperRender.dll
  55. +0
    -0
      bjairService/lib/YUVProcess.dll
  56. +0
    -0
      bjairService/lib/examples-1.0.0.jar
  57. +0
    -0
      bjairService/lib/hlog.dll
  58. +0
    -0
      bjairService/lib/hpr.dll
  59. +0
    -0
      bjairService/lib/jna-1.0.0.jar
  60. +0
    -0
      bjairService/lib/jna-4.5.2.jar
  61. +0
    -0
      bjairService/lib/libcrypto-1_1-x64.dll
  62. +0
    -0
      bjairService/lib/libmmd.dll
  63. +0
    -0
      bjairService/lib/libssl-1_1-x64.dll
  64. +0
    -0
      bjairService/lib/plaympeg4.h
  65. +0
    -0
      bjairService/lib/zlib1.dll
  66. +6
    -6
      bjairService/pom.xml
  67. +15
    -0
      bjairService/src/main/java/com/iformall/file/haikang/HaiKangNetSdkConfig.java
  68. +18
    -9
      bjairService/src/main/java/com/iformall/haikang/alarm/Alarm.java

+ 2
- 2
bjairAdmin/pom.xml Bestand weergeven

@@ -62,7 +62,7 @@
<configuration>
<executable>true</executable>
<layout>ZIP</layout>
<excludeGroupIds>
<!-- <excludeGroupIds>
antlr,
ch.qos.logback,
com.alibaba,
@@ -181,7 +181,7 @@
tk.mybatis,
xmlpull,
xpp3
</excludeGroupIds>
</excludeGroupIds> -->
</configuration>
</plugin>
</plugins>


+ 44
- 0
bjairAdmin/src/main/java/com/iformall/controller/market/HaiKangController.java Bestand weergeven

@@ -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();
}
}

+ 5
- 0
bjairAdmin/src/main/resources/application-dev.yml Bestand weergeven

@@ -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


+ 5
- 0
bjairAdmin/src/main/resources/application-prod.yml Bestand weergeven

@@ -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


+ 2
- 2
bjairCApi/pom.xml Bestand weergeven

@@ -36,7 +36,7 @@
<configuration>
<executable>true</executable>
<layout>ZIP</layout>
<excludeGroupIds>
<!-- <excludeGroupIds>
antlr,
cn.afterturn,
ch.qos.logback,
@@ -156,7 +156,7 @@
tk.mybatis,
xmlpull,
xpp3
</excludeGroupIds>
</excludeGroupIds> -->
</configuration>
</plugin>
</plugins>


+ 35
- 0
bjairCApi/src/main/java/com/iformall/controller/HaiKangController.java Bestand weergeven

@@ -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();

}


}

+ 4
- 0
bjairCApi/src/main/resources/application-dev.yml Bestand weergeven

@@ -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


+ 4
- 0
bjairCApi/src/main/resources/application-prod.yml Bestand weergeven

@@ -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:


bjairService/src/main/resources/lib/AudioRender.dll → bjairService/lib/AudioRender.dll Bestand weergeven


bjairService/src/main/resources/lib/ClientDemo.exe → bjairService/lib/ClientDemo.exe Bestand weergeven


bjairService/src/main/resources/lib/ClientDemoDll/ReadMe.txt → bjairService/lib/ClientDemoDll/ReadMe.txt Bestand weergeven


bjairService/src/main/resources/lib/ClientDemoDll/calib.dll → bjairService/lib/ClientDemoDll/calib.dll Bestand weergeven


bjairService/src/main/resources/lib/ClientDemoDll/iconv.dll → bjairService/lib/ClientDemoDll/iconv.dll Bestand weergeven


bjairService/src/main/resources/lib/ClientDemoDll/libcrypto-1_1-x64.dll → bjairService/lib/ClientDemoDll/libcrypto-1_1-x64.dll Bestand weergeven


bjairService/src/main/resources/lib/ClientDemoDll/libssl-1_1-x64.dll → bjairService/lib/ClientDemoDll/libssl-1_1-x64.dll Bestand weergeven


bjairService/src/main/resources/lib/ClientDemoDll/libxml2.dll → bjairService/lib/ClientDemoDll/libxml2.dll Bestand weergeven


bjairService/src/main/resources/lib/ClientDemoDll/zlib1.dll → bjairService/lib/ClientDemoDll/zlib1.dll Bestand weergeven


bjairService/src/main/resources/lib/DataType.h → bjairService/lib/DataType.h Bestand weergeven


bjairService/src/main/resources/lib/DecodeCardSdk.h → bjairService/lib/DecodeCardSdk.h Bestand weergeven


bjairService/src/main/resources/lib/GdiPlus.dll → bjairService/lib/GdiPlus.dll Bestand weergeven


bjairService/src/main/resources/lib/GdiPlus.lib → bjairService/lib/GdiPlus.lib Bestand weergeven


bjairService/src/main/resources/lib/HCCore.dll → bjairService/lib/HCCore.dll Bestand weergeven


bjairService/src/main/resources/lib/HCCore.lib → bjairService/lib/HCCore.lib Bestand weergeven


bjairService/src/main/resources/lib/HCNetSDK.dll → bjairService/lib/HCNetSDK.dll Bestand weergeven


bjairService/src/main/resources/lib/HCNetSDK.h → bjairService/lib/HCNetSDK.h Bestand weergeven


bjairService/src/main/resources/lib/HCNetSDK.lib → bjairService/lib/HCNetSDK.lib Bestand weergeven


bjairService/src/main/resources/lib/HCNetSDKCom/AnalyzeData.dll → bjairService/lib/HCNetSDKCom/AnalyzeData.dll Bestand weergeven


bjairService/src/main/resources/lib/HCNetSDKCom/AudioIntercom.dll → bjairService/lib/HCNetSDKCom/AudioIntercom.dll Bestand weergeven


bjairService/src/main/resources/lib/HCNetSDKCom/AudioRender.dll → bjairService/lib/HCNetSDKCom/AudioRender.dll Bestand weergeven


bjairService/src/main/resources/lib/HCNetSDKCom/HCAlarm.dll → bjairService/lib/HCNetSDKCom/HCAlarm.dll Bestand weergeven


bjairService/src/main/resources/lib/HCNetSDKCom/HCAlarm.lib → bjairService/lib/HCNetSDKCom/HCAlarm.lib Bestand weergeven


bjairService/src/main/resources/lib/HCNetSDKCom/HCCoreDevCfg.dll → bjairService/lib/HCNetSDKCom/HCCoreDevCfg.dll Bestand weergeven


bjairService/src/main/resources/lib/HCNetSDKCom/HCDisplay.dll → bjairService/lib/HCNetSDKCom/HCDisplay.dll Bestand weergeven


bjairService/src/main/resources/lib/HCNetSDKCom/HCGeneralCfgMgr.dll → bjairService/lib/HCNetSDKCom/HCGeneralCfgMgr.dll Bestand weergeven


bjairService/src/main/resources/lib/HCNetSDKCom/HCGeneralCfgMgr.lib → bjairService/lib/HCNetSDKCom/HCGeneralCfgMgr.lib Bestand weergeven


bjairService/src/main/resources/lib/HCNetSDKCom/HCIndustry.dll → bjairService/lib/HCNetSDKCom/HCIndustry.dll Bestand weergeven


bjairService/src/main/resources/lib/HCNetSDKCom/HCPlayBack.dll → bjairService/lib/HCNetSDKCom/HCPlayBack.dll Bestand weergeven


bjairService/src/main/resources/lib/HCNetSDKCom/HCPreview.dll → bjairService/lib/HCNetSDKCom/HCPreview.dll Bestand weergeven


bjairService/src/main/resources/lib/HCNetSDKCom/HCPreview.lib → bjairService/lib/HCNetSDKCom/HCPreview.lib Bestand weergeven


bjairService/src/main/resources/lib/HCNetSDKCom/HCVoiceTalk.dll → bjairService/lib/HCNetSDKCom/HCVoiceTalk.dll Bestand weergeven


bjairService/src/main/resources/lib/HCNetSDKCom/OpenAL32.dll → bjairService/lib/HCNetSDKCom/OpenAL32.dll Bestand weergeven


bjairService/src/main/resources/lib/HCNetSDKCom/StreamTransClient.dll → bjairService/lib/HCNetSDKCom/StreamTransClient.dll Bestand weergeven


bjairService/src/main/resources/lib/HCNetSDKCom/SystemTransform.dll → bjairService/lib/HCNetSDKCom/SystemTransform.dll Bestand weergeven


bjairService/src/main/resources/lib/HCNetSDKCom/libiconv2.dll → bjairService/lib/HCNetSDKCom/libiconv2.dll Bestand weergeven


bjairService/src/main/resources/lib/HXVA.dll → bjairService/lib/HXVA.dll Bestand weergeven


bjairService/src/main/resources/lib/HmMerge.dll → bjairService/lib/HmMerge.dll Bestand weergeven


bjairService/src/main/resources/lib/LocalSensorAdd.dat → bjairService/lib/LocalSensorAdd.dat Bestand weergeven


bjairService/src/main/resources/lib/LocalXml.zip → bjairService/lib/LocalXml.zip Bestand weergeven


bjairService/src/main/resources/lib/MP_Render.dll → bjairService/lib/MP_Render.dll Bestand weergeven


bjairService/src/main/resources/lib/NPQos.dll → bjairService/lib/NPQos.dll Bestand weergeven


bjairService/src/main/resources/lib/OpenAL32.dll → bjairService/lib/OpenAL32.dll Bestand weergeven


bjairService/src/main/resources/lib/PlayCtrl.dll → bjairService/lib/PlayCtrl.dll Bestand weergeven


bjairService/src/main/resources/lib/PlayCtrl.lib → bjairService/lib/PlayCtrl.lib Bestand weergeven


bjairService/src/main/resources/lib/SuperRender.dll → bjairService/lib/SuperRender.dll Bestand weergeven


bjairService/src/main/resources/lib/YUVProcess.dll → bjairService/lib/YUVProcess.dll Bestand weergeven


bjairService/src/main/resources/lib/examples-1.0.0.jar → bjairService/lib/examples-1.0.0.jar Bestand weergeven


bjairService/src/main/resources/lib/hlog.dll → bjairService/lib/hlog.dll Bestand weergeven


bjairService/src/main/resources/lib/hpr.dll → bjairService/lib/hpr.dll Bestand weergeven


bjairService/src/main/resources/lib/jna-1.0.0.jar → bjairService/lib/jna-1.0.0.jar Bestand weergeven


bjairService/src/main/resources/lib/jna-4.5.2.jar → bjairService/lib/jna-4.5.2.jar Bestand weergeven


bjairService/src/main/resources/lib/libcrypto-1_1-x64.dll → bjairService/lib/libcrypto-1_1-x64.dll Bestand weergeven


bjairService/src/main/resources/lib/libmmd.dll → bjairService/lib/libmmd.dll Bestand weergeven


bjairService/src/main/resources/lib/libssl-1_1-x64.dll → bjairService/lib/libssl-1_1-x64.dll Bestand weergeven


bjairService/src/main/resources/lib/plaympeg4.h → bjairService/lib/plaympeg4.h Bestand weergeven


bjairService/src/main/resources/lib/zlib1.dll → bjairService/lib/zlib1.dll Bestand weergeven


+ 6
- 6
bjairService/pom.xml Bestand weergeven

@@ -57,24 +57,24 @@
<groupId>com.iformall.haikang</groupId>
<artifactId>jna</artifactId>
<version>1.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/src/main/resources/lib/jna-1.0.0.jar</systemPath>
<!-- <scope>system</scope>
<systemPath>${project.basedir}/lib/jna-1.0.0.jar</systemPath> -->
</dependency>
<dependency>
<groupId>com.iformall.haikang</groupId>
<artifactId>jna_1</artifactId>
<version>4.5.2</version>
<scope>system</scope>
<systemPath>${project.basedir}/src/main/resources/lib/jna-4.5.2.jar</systemPath>
<!-- <scope>system</scope>
<systemPath>${project.basedir}/lib/jna-4.5.2.jar</systemPath>-->
</dependency>
<dependency>
<groupId>com.iformall.haikang</groupId>
<artifactId>examples</artifactId>
<version>1.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/src/main/resources/lib/examples-1.0.0.jar</systemPath>
<!--<scope>system</scope>
<systemPath>${project.basedir}/lib/examples-1.0.0.jar</systemPath>-->
</dependency>
</dependencies>


+ 15
- 0
bjairService/src/main/java/com/iformall/file/haikang/HaiKangNetSdkConfig.java Bestand weergeven

@@ -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;
}

+ 18
- 9
bjairService/src/main/java/com/iformall/haikang/alarm/Alarm.java Bestand weergeven

@@ -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("监听未开启");


Laden…
Annuleren
Opslaan