摄像头报警添加orgCode

pom.xml

@@ -25,6 +25,11 @@
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.83</version>
+        </dependency>
+        <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>

src/main/java/com/unissoft/intrusion/IntrusionController.java

@@ -19,8 +19,8 @@ public class IntrusionController {
     private IntrusionService intrusionService;
 
     @PostMapping("/pushIntrusion")
-    public void pushIntrusion(Integer sAlarmType, String alarmNow, String deviceIP) {
-        intrusionService.pushIntrusion(sAlarmType, alarmNow, deviceIP);
+    public void pushIntrusion(Integer sAlarmType, String alarmNow, String deviceIP, String orgCode) {
+        intrusionService.pushIntrusion(sAlarmType, alarmNow, deviceIP, orgCode);
     }
 
 }

src/main/java/com/unissoft/intrusion/IntrusionService.java

@@ -1,5 +1,6 @@
 package com.unissoft.intrusion;
 
+import com.alibaba.fastjson.JSON;
 import com.unissoft.common.DateUtils;
 import com.unissoft.utils.RedisUtil;
 import lombok.Data;
@@ -17,7 +18,7 @@ import java.util.Date;
  * @create 2022-11-07 10:21
  */
 public interface IntrusionService {
-    void pushIntrusion(Integer sAlarmType, String alarmNow, String deviceIP);
+    void pushIntrusion(Integer sAlarmType, String alarmNow, String deviceIP, String orgCode);
 
     @Data
     @Component
@@ -28,6 +29,8 @@ public interface IntrusionService {
         private Date alarmNow;
         // 设备ip
         private String deviceIP;
+        // 机构编码
+        private String orgCode;
     }
 
     // 定义内部类
@@ -42,19 +45,20 @@ public interface IntrusionService {
         private IntrusionModel intrusionModel;
 
         @Override
-        public void pushIntrusion(Integer sAlarmType, String alarmNow, String deviceIP) {
+        public void pushIntrusion(Integer sAlarmType, String alarmNow, String deviceIP, String orgCode) {
             // redis key
             if (redisUtil.hasKey(deviceIP)) {
                 // key 存在丢弃报警数据,不上报
-                log.info("Don't up!-> sAlarmType: {} alarmNow: {} deviceIP: {}", sAlarmType, alarmNow, deviceIP);
+                log.info("Don't up!-> sAlarmType: {} alarmNow: {} deviceIP: {} orgCode: {}", sAlarmType, alarmNow, deviceIP, orgCode);
             } else {
                 // TODO 上报数据-接口
-                log.info("Up it!-> sAlarmType: {} alarmNow: {} deviceIP: {}", sAlarmType, alarmNow, deviceIP);
+                log.info("Up it!-> sAlarmType: {} alarmNow: {} deviceIP: {} orgCode: {}", sAlarmType, alarmNow, deviceIP, orgCode);
                 intrusionModel.setDeviceIP(deviceIP);
                 intrusionModel.setSAlarmType(sAlarmType);
                 intrusionModel.setAlarmNow(DateUtils.stringToData(alarmNow));
+                intrusionModel.setOrgCode(orgCode);
                 // 设置缓存
-                redisUtil.set(deviceIP, Integer.toString(sAlarmType), tenMinutes);
+                redisUtil.set(deviceIP, JSON.toJSONString(intrusionModel), tenMinutes);
             }
         }
     }