异常闯入-02

pom.xml

@@ -50,7 +50,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <scope>provided</scope>
+            <!--<scope>provided</scope>-->
         </dependency>
         <!--mqtt相关依赖-->
         <dependency>
@@ -67,32 +67,19 @@
         </dependency>
         <!-- 引入本地依赖 start -->
         <dependency>
-            <groupId>com.sun</groupId>
-            <artifactId>jna</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/src/main/resources/lib/jna.jar</systemPath>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/com.sun.jna/jna -->
-        <!--<dependency>
             <groupId>com.sun.jna</groupId>
             <artifactId>jna</artifactId>
-            <version>3.0.9</version>
-        </dependency>-->
-
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>com.sun.jna</groupId>
             <artifactId>examples</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/src/main/resources/lib/examples.jar</systemPath>
+            <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.dom4j</groupId>
             <artifactId>dom4j</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/src/main/resources/lib/dom4j.jar</systemPath>
+            <version>1.0-SNAPSHOT</version>
         </dependency>
         <!-- 引入外部依赖 end -->
     </dependencies>

src/main/java/com/unissoft/face/CLibrary.java

@@ -0,0 +1,13 @@
+package com.unissoft.face;
+
+import com.sun.jna.Library;
+
+/**
+ * @author qingsong.han
+ * @description:
+ * @create 2022-10-13 17:34
+ */
+public interface CLibrary extends Library {
+
+
+}

src/main/java/com/unissoft/face/FaceMain.java

@@ -5,25 +5,23 @@ import com.unissoft.common.osSelect;
 import com.unissoft.netSDKDemo.HCNetSDK;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+import java.util.Scanner;
 
 @Slf4j
-@Configuration
-public class FaceMain {
+@Component
+@Order(100)
+public class FaceMain implements ApplicationRunner {
 
     static HCNetSDK hCNetSDK = null;
     static int lUserID = -1;//用户句柄
     static int lAlarmHandle = -1; //布防句柄
     static int lListenHandle = -1; //监听句柄
 
-    /*
-     * 获取配置
-     */
-    /*@Value("${userDir.windowsDllPath}")
-    private String windowsDllPath;
-    @Value("${userDir.linuxDllPath}")
-    private String linuxDllPath;*/
     // 设备连接信息
     @Value("${exceptionAlarm.deviceIP}")
     private String deviceIP;
@@ -32,10 +30,11 @@ public class FaceMain {
     @Value("${exceptionAlarm.password}")
     private String password;
 
-    //    public static void main(String[] args) throws InterruptedException, IOException, DocumentException {
-    @Bean
-    public void mainMethod() {
-        log.error("mainMethod init bean===========================================================");
+    /*
+     * 获取配置
+     */
+    private void mainMethod() {
+        log.info("mainMethod===========================================================init bean");
         try {
             if (hCNetSDK == null) {
                 if (!CreateSDKInstance()) {
@@ -95,9 +94,9 @@ public class FaceMain {
 
             lUserID = hCNetSDK.NET_DVR_Login_V40(m_strLoginInfo, m_strDeviceInfo);
             if (lUserID == -1) {
-                log.error("登录失败，错误码为: {}", hCNetSDK.NET_DVR_GetLastError());
+                log.error("登录失败,错误码为: {}", hCNetSDK.NET_DVR_GetLastError());
             } else {
-                log.info("{} 设备登录成功! 设备序列号: {}", m_sDeviceIP, new String(m_strDeviceInfo.struDeviceV30.sSerialNumber).trim());
+                log.info("{} 设备登录成功!设备序列号: {}", m_sDeviceIP, new String(m_strDeviceInfo.struDeviceV30.sSerialNumber).trim());
                 m_strDeviceInfo.read();
             }
 
@@ -105,7 +104,7 @@ public class FaceMain {
             Alarm.SetAlarm(lUserID);
 
             // TODO 暂停状态 需要测试改造
-            /*while (true) {
+            while (true) {
                 //这里加入控制台输入控制，是为了保持连接状态，当输入Y表示布防结束
                 log.info("请选择是否撤出布防(Y/N):");
                 Scanner input = new Scanner(System.in);
@@ -113,8 +112,9 @@ public class FaceMain {
                 if (str.equals("Y")) {
                     break;
                 }
-            }*/
+            }
             Thread.sleep(3000);
+//            Thread.sleep(6000);
 
             //退出之前判断布防监听状态，并做撤防和停止监听操作
             if (lAlarmHandle >= 0) {
@@ -170,4 +170,10 @@ public class FaceMain {
         }
         return true;
     }
+
+    @Override
+    public void run(ApplicationArguments args) throws Exception {
+        // after behind for application run,because implements ApplicationRunner
+        this.mainMethod();
+    }
 }

src/main/java/com/unissoft/mqtt/MqttTestSendController.java

@@ -36,10 +36,4 @@ public class MqttTestSendController {
         return "200";
     }
 
-    @PostMapping("/pushIntrusion")
-    public String pushIntrusion(int sAlarmType, String alarmNow) {
-        log.info("异常闯入/入侵接口接收消息: {}:{}", sAlarmType, alarmNow);
-        return "200";
-    }
-
 }

src/main/java/com/unissoft/netSDKDemo/FMSGCallBack_V31.java

@@ -1,13 +1,10 @@
 package com.unissoft.netSDKDemo;
 
 import com.sun.jna.Pointer;
+import com.unissoft.pushMsg.AlarmDSService;
+import com.unissoft.pushMsg.AlarmDSServiceImpl;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-import org.springframework.web.client.RestTemplate;
 
-import javax.annotation.Resource;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -19,10 +16,8 @@ import java.util.Date;
  */
 @Slf4j
 public class FMSGCallBack_V31 implements HCNetSDK.FMSGCallBack_V31 {
-    @Value("${pushAddress}")
-    private String pushAddress;
-    @Resource
-    private RestTemplate restTemplate;
+    // this class call jna native callback,so is not spring manage class
+    private AlarmDSService alarmDSService = new AlarmDSServiceImpl();
 
     //报警信息回调函数
     public boolean invoke(int lCommand, HCNetSDK.NET_DVR_ALARMER pAlarmer, Pointer pAlarmInfo, int dwBufLen, Pointer pUser) {
@@ -161,15 +156,8 @@ public class FMSGCallBack_V31 implements HCNetSDK.FMSGCallBack_V31 {
                 break;
             default:
                 // TODO 单报警设备 目前不需要 sAlarmType alarmNow
-                MultiValueMap<String, Object> requestEntity = new LinkedMultiValueMap<>();
-                // 报警类型(异常闯入/入侵) int 4354
-                requestEntity.add("sAlarmType", lCommand);
-                // 报警时间
-                requestEntity.add("alarmNow", new Date());
-                log.info("报警类型 int: {}", requestEntity);
-                // MultiValueMap requestEntity
-                String object = restTemplate.postForObject(pushAddress, requestEntity, String.class);
-                log.info(object);
+                log.info("alarm type in the FMSGCallBack_V31 ->int: {}", lCommand);
+                alarmDSService.pushLCommand(lCommand);
                 break;
         }
     }

src/main/java/com/unissoft/netSDKDemo/HCNetSDK.java

@@ -6,12 +6,13 @@ 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 java.util.Arrays;
 import java.util.List;
 
 //SDK接口说明,HCNetSDK.dll
-public interface HCNetSDK extends Library {
+public interface HCNetSDK extends /*StdCallLibrary*/Library {
 
         /*** 宏定义 ***/
     //常量

src/main/java/com/unissoft/pushMsg/AddressModel.java

@@ -0,0 +1,19 @@
+package com.unissoft.pushMsg;
+
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author qingsong.han
+ * @description:
+ * @create 2022-10-14 16:50
+ */
+@Data
+@Component
+public class AddressModel {
+
+    @Value("${address.pushToIntrusion}")
+    private String pushToIntrusion;
+
+}

src/main/java/com/unissoft/pushMsg/AlarmDSService.java

@@ -0,0 +1,14 @@
+package com.unissoft.pushMsg;
+
+import com.sun.jna.Callback;
+
+/**
+ * @author qingsong.han
+ * @description:
+ * @create 2022-10-14 10:57
+ */
+public interface AlarmDSService extends Callback {
+
+    void pushLCommand(Integer lCommand);
+
+}

src/main/java/com/unissoft/pushMsg/AlarmDSServiceImpl.java

@@ -0,0 +1,41 @@
+package com.unissoft.pushMsg;
+
+import com.unissoft.utils.GetBeanUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+
+import java.net.URL;
+import java.util.Date;
+
+/**
+ * @author qingsong.han
+ * @description: 推送 异常闯入/入侵
+ * @create 2022-10-14 11:03
+ */
+@Slf4j
+@Service
+public class AlarmDSServiceImpl implements AlarmDSService {
+
+    @Override
+    public void pushLCommand(Integer lCommand) {
+        // MultiValueMap requestEntity
+        MultiValueMap<String, Object> requestEntity = new LinkedMultiValueMap<>();
+        // 报警类型(异常闯入/入侵) int 4354
+        requestEntity.add("sAlarmType", lCommand);
+        // 报警时间
+        requestEntity.add("alarmNow", new Date());
+        log.info("报警类型 int: {}", requestEntity);
+
+        // 获取spring RestTemple bean
+        RestTemplate restTemplate = (RestTemplate) GetBeanUtil.getBean("restTemplate");
+        // get push class AddressModel bean
+        AddressModel addressModel = (AddressModel) GetBeanUtil.getBean("addressModel");
+        // push of post for object
+        Object object = restTemplate.postForObject(addressModel.getPushToIntrusion(), requestEntity, Object.class);
+        log.info("AlarmDSServiceImpl push alarm result: {}", object);
+    }
+}

src/main/java/com/unissoft/utils/GetBeanUtil.java

@@ -0,0 +1,32 @@
+package com.unissoft.utils;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+import reactor.util.annotation.Nullable;
+
+/**
+ * @author qingsong.han
+ * @description: 多线程获取bean
+ * @create 2022-10-14 15:12
+ */
+@Component
+public class GetBeanUtil implements ApplicationContextAware {
+    // get bean static constant
+    private static ApplicationContext applicationContext;
+
+    @Override
+    public void setApplicationContext(@Nullable ApplicationContext context) throws BeansException {
+        GetBeanUtil.applicationContext = context;
+    }
+
+    public static Object getBean(String name) {
+        return applicationContext.getBean(name);
+    }
+
+    public static ApplicationContext getApplicationContext() {
+        return applicationContext;
+    }
+
+}

src/main/resources/bootstrap.yml

@@ -30,16 +30,14 @@ mqtt:
   # TODO 正式上线 不使用随机参数(clientId修改会导致无法收到启动前的消息)
   clientId: mqtt-input-smart-grp-nof-devices-${random.value}
 # 异常闯入异常,入侵分析
-#userDir:
-#  windowsDllPath: D:\workspace\smart-grp-nof\lib\HCNetSDK.dll
-#  linuxDllPath: /home/nof/lib/libhcnetsdk.so
 # 设备登录
 exceptionAlarm:
-  # 设备ip地址 DS-7716NX-I4
-  deviceIP: 192.168.0.106
+  # 设备ip地址 DS-2CD7T27DWD-IZS
+  deviceIP: 192.168.0.105
   # 设备用户名
   userName: admin
   # 设备密码
   password: q1234567
 # 只支持post
-pushAddress: http://localhost:8072/pushIntrusion
+address:
+  pushToIntrusion: http://localhost:8077/pushIntrusion