请求方法修改

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

@@ -6,8 +6,13 @@ import com.unissoft.utils.RedisUtil;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpMethod;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.Resource;
 import java.util.Date;
@@ -26,7 +31,7 @@ public interface IntrusionService {
         // 报警类型
         private Integer sAlarmType;
         // 报警时间
-        private Date alarmNow;
+        private String alarmNow;
         // 设备ip
         private String deviceIP;
         // 机构编码
@@ -39,8 +44,13 @@ public interface IntrusionService {
     class IntrusionServiceImpl implements IntrusionService {
         @Resource
         private RedisUtil redisUtil;
+        @Resource
+        private RestTemplate restTemplate;
         @Value("${spring.redis.ten-minutes}")
         private long tenMinutes;
+        // 推送地址
+        @Value("${address.pushToIntrusion}")
+        private String pushToIntrusion;
         @Resource
         private IntrusionModel intrusionModel;
 
@@ -51,12 +61,14 @@ public interface IntrusionService {
                 // key 存在丢弃报警数据,不上报
                 log.info("Don't up!-> sAlarmType: {} alarmNow: {} deviceIP: {} orgCode: {}", sAlarmType, alarmNow, deviceIP, orgCode);
             } else {
-                // TODO 上报数据-接口
+                // 上报数据-接口
                 log.info("Up it!-> sAlarmType: {} alarmNow: {} deviceIP: {} orgCode: {}", sAlarmType, alarmNow, deviceIP, orgCode);
                 intrusionModel.setDeviceIP(deviceIP);
                 intrusionModel.setSAlarmType(sAlarmType);
-                intrusionModel.setAlarmNow(DateUtils.stringToData(alarmNow));
+                intrusionModel.setAlarmNow(alarmNow);
                 intrusionModel.setOrgCode(orgCode);
+                HttpEntity<IntrusionModel> httpEntity = new HttpEntity<>(intrusionModel);
+                restTemplate.exchange(pushToIntrusion, HttpMethod.POST, httpEntity, Object.class);
                 // 设置缓存
                 redisUtil.set(deviceIP, JSON.toJSONString(intrusionModel), tenMinutes);
             }

src/main/resources/application.yml

@@ -10,7 +10,7 @@ spring:
     time-zone: GMT+8
   # dev: 开发环境,prod: 生产环境（线上）
   profiles:
-    active: prod
+    active: dev
 ---
 spring:
   profiles: dev
@@ -39,6 +39,9 @@ snowFlake:
   waitTime: 120
   # 执行时长最大120秒(上锁后自动释放锁时间)
   leaseTime: 120
+address:
+  # 推送异常闯入/入侵信息地址
+  pushToIntrusion: http://192.168.40.94:7026/alarm/saveWarning
 ---
 spring:
   profiles: prod
@@ -66,4 +69,7 @@ snowFlake:
   # 分布式锁等待,最大等待时间120秒
   waitTime: 120
   # 执行时长最大120秒(上锁后自动释放锁时间)
-  leaseTime: 120
+  leaseTime: 120
+address:
+  # 推送异常闯入/入侵信息地址
+  pushToIntrusion: http://23.99.21.201:59882/pushIntrusion