异常闯入修改为被动数据

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

@@ -0,0 +1,26 @@
+package com.unissoft.intrusion;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @author qingsong.han
+ * @description: 第三方平台获取异常闯入数据
+ * @create 2022-11-14 17:30
+ */
+@Slf4j
+@RestController
+public class GetIntrusionController {
+
+    @Resource
+    private GetIntrusionService getIntrusionService;
+
+    @GetMapping("/pullIntrusion")
+    public Object pullIntrusion() {
+        return getIntrusionService.pullIntrusion();
+    }
+
+}

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

@@ -0,0 +1,47 @@
+package com.unissoft.intrusion;
+
+import com.unissoft.common.MyConstant;
+import com.unissoft.utils.RedisUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.redisson.transaction.HashKey;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @author qingsong.han
+ * @description:
+ * @create 2022-11-14 17:32
+ */
+public interface GetIntrusionService {
+
+    Object pullIntrusion();
+    // 定义内部类
+    @Slf4j
+    @Service
+    class IntrusionServiceImpl implements GetIntrusionService {
+        @Resource
+        private RedisUtil redisUtil;
+
+        @Override
+        public Object pullIntrusion() {
+            if (redisUtil.hasKey(MyConstant.INTRUSION_ALARM_IP)) {
+                Map<String, Object> hmget = redisUtil.hmget(MyConstant.INTRUSION_ALARM_IP);
+                // 转list
+                if (!CollectionUtils.isEmpty(hmget)) {
+                    Collection<Object> values = hmget.values();
+                    log.info("GetIntrusionService: {}", values);
+                    return values;
+                }
+            }
+            return Collections.emptyList();
+        }
+    }
+
+}

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

@@ -2,6 +2,7 @@ package com.unissoft.intrusion;
 
 import com.alibaba.fastjson.JSON;
 import com.unissoft.common.DateUtils;
+import com.unissoft.common.MyConstant;
 import com.unissoft.utils.RedisUtil;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
@@ -29,7 +30,7 @@ public interface IntrusionService {
     @Component
     class IntrusionModel {
         // 报警类型
-        private Integer sAlarmType;
+        private Integer alarmType;
         // 报警时间
         private String alarmNow;
         // 设备ip
@@ -44,19 +45,19 @@ public interface IntrusionService {
     class IntrusionServiceImpl implements IntrusionService {
         @Resource
         private RedisUtil redisUtil;
-        @Resource
-        private RestTemplate restTemplate;
+        /*@Resource
+        private RestTemplate restTemplate;*/
+        // 推送地址
+        /*@Value("${address.pushToIntrusion}")
+        private String pushToIntrusion;*/
         @Value("${spring.redis.ten-minutes}")
         private long tenMinutes;
-        // 推送地址
-        @Value("${address.pushToIntrusion}")
-        private String pushToIntrusion;
         @Resource
         private IntrusionModel intrusionModel;
 
         @Override
         public void pushIntrusion(Integer sAlarmType, String alarmNow, String deviceIP, String orgCode) {
-            // redis key
+            /*// redis key
             if (redisUtil.hasKey(deviceIP)) {
                 // key 存在丢弃报警数据,不上报
                 log.info("Don't up!-> sAlarmType: {} alarmNow: {} deviceIP: {} orgCode: {}", sAlarmType, alarmNow, deviceIP, orgCode);
@@ -71,7 +72,17 @@ public interface IntrusionService {
                 restTemplate.exchange(pushToIntrusion, HttpMethod.POST, httpEntity, Object.class);
                 // 设置缓存
                 redisUtil.set(deviceIP, JSON.toJSONString(intrusionModel), tenMinutes);
-            }
+            }*/
+            // TODO 物联网到业务平台推送数据网络不通,修改为业务平台主动获取数据
+            // 上报数据-接口
+
+            intrusionModel.setDeviceIP(deviceIP);
+            intrusionModel.setAlarmType(sAlarmType);
+            intrusionModel.setAlarmNow(alarmNow);
+            intrusionModel.setOrgCode(orgCode);
+            // 设置异常闯入设备数据-hashCode
+            redisUtil.hset(MyConstant.INTRUSION_ALARM_IP, deviceIP, intrusionModel, tenMinutes);
+            log.info("Up it!-> sAlarmType: {} alarmNow: {} deviceIP: {} orgCode: {}", sAlarmType, alarmNow, deviceIP, orgCode);
         }
     }
 }

src/main/resources/application.yml

@@ -10,7 +10,7 @@ spring:
     time-zone: GMT+8
   # dev: 开发环境,prod: 生产环境（线上）
   profiles:
-    active: dev
+    active: prod
 ---
 spring:
   profiles: dev
@@ -72,4 +72,4 @@ snowFlake:
   leaseTime: 120
 address:
   # 推送异常闯入/入侵信息地址
-  pushToIntrusion: http://23.99.21.201:59882/pushIntrusion
+  pushToIntrusion: http://cpls.test.sys.cqjg.cn