ICC 动态缓存+静态数据

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

@@ -18,6 +18,7 @@ public class GetIntrusionController {
     @Resource
     private GetIntrusionService getIntrusionService;
 
+    // 底代码业务平台获取海康摄像头异常信息接口
     @GetMapping("/pullIntrusion")
     public Object pullIntrusion() {
         return getIntrusionService.pullIntrusion();

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

@@ -1,15 +1,17 @@
 package com.unissoft.intrusion;
 
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import java.util.Date;
+import java.util.Map;
 
 /**
  * @author qingsong.han
- * @description: 接收库点摄像头信息并推送到业务平台
+ * @description: 接收库点摄像头信息
  * @create 2022-11-07 10:19
  */
 @Slf4j
@@ -18,9 +20,15 @@ public class IntrusionController {
     @Resource
     private IntrusionService intrusionService;
 
+    // 接收库点海康摄像头异常信息
     @PostMapping("/pushIntrusion")
     public void pushIntrusion(Integer sAlarmType, String alarmNow, String deviceIP, String orgCode) {
         intrusionService.pushIntrusion(sAlarmType, alarmNow, deviceIP, orgCode);
     }
 
+    // 修改ICC通道号编码接口ICC_CHANNEL_CODE key:value(IP:channelCode)
+    @GetMapping("/editChannelCode")
+    public void editChannelCode(@RequestParam Map<String, String> channelCodes) {
+        intrusionService.editChannelCode(channelCodes);
+    }
 }

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

@@ -13,10 +13,13 @@ import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
+import org.springframework.util.StringUtils;
 import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.Resource;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @author qingsong.han
@@ -26,6 +29,8 @@ import java.util.Date;
 public interface IntrusionService {
     void pushIntrusion(Integer sAlarmType, String alarmNow, String deviceIP, String orgCode);
 
+    void editChannelCode(Map<String, String> channelCodes);
+
     @Data
     @Component
     class IntrusionModel {
@@ -37,7 +42,7 @@ public interface IntrusionService {
         private String deviceIP;
         // 机构编码
         private String orgCode;
-        // 通道号
+        // ICC通道号
         private String channelCode;
     }
 
@@ -83,13 +88,20 @@ public interface IntrusionService {
             intrusionModel.setAlarmNow(alarmNow);
             intrusionModel.setOrgCode(orgCode);
             // 添加通道号
-            intrusionModel.setChannelCode(getChannelCode(deviceIP));
+            intrusionModel.setChannelCode(this.getChannelCode(deviceIP));
             // 设置异常闯入设备数据-hashCode
             redisUtil.hset(MyConstant.INTRUSION_ALARM_IP, deviceIP, intrusionModel, tenMinutes);
             log.info("Up it!-> sAlarmType: {} alarmNow: {} deviceIP: {} orgCode: {}", sAlarmType, alarmNow, deviceIP, orgCode);
         }
 
         private String getChannelCode(String deviceIP) {
+            String channelCode = redisUtil.hget(MyConstant.ICC_CHANNEL_CODE, deviceIP).toString();
+            if (StringUtils.isEmpty(channelCode))
+                channelCode = this.staticChannelCode(deviceIP);
+            return channelCode;
+        }
+
+        private String staticChannelCode(String deviceIP) {
             switch (deviceIP) {
                 case "192.168.193.16":
                     return "1000377$1$0$0";
@@ -123,6 +135,14 @@ public interface IntrusionService {
                     return "";
             }
         }
+
+        @Override
+        public void editChannelCode(Map<String, String> channelCodes) {
+            channelCodes.forEach((ip, code) ->
+                    redisUtil.hset(MyConstant.ICC_CHANNEL_CODE, ip, code)
+            );
+        }
+
     }
 
 

src/main/resources/application.yml

@@ -10,7 +10,7 @@ spring:
     time-zone: GMT+8
   # dev: 开发环境,prod: 生产环境（线上）
   profiles:
-    active: dev
+    active: prod
 ---
 spring:
   profiles: dev