From a767f8b7e2aabf9bb3bb98344e8c559c71c1d442 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: Fri, 11 Aug 2023 14:40:28 +0800
Subject: [PATCH] 过滤通用光电报警只保留移动侦测、周界入侵报警、越界侦测报警 增加报警主机、门禁主机、通用光电数据同步
---
src/main/java/com/ard/alarm/tube/service/TubeAlarmService.java | 39 +++++++++++++++++++--------------------
1 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/ard/alarm/tube/service/TubeAlarmService.java b/src/main/java/com/ard/alarm/tube/service/TubeAlarmService.java
index 360f727..06584e6 100644
--- a/src/main/java/com/ard/alarm/tube/service/TubeAlarmService.java
+++ b/src/main/java/com/ard/alarm/tube/service/TubeAlarmService.java
@@ -1,12 +1,12 @@
package com.ard.alarm.tube.service;
import com.alibaba.fastjson2.JSON;
-import com.ard.utils.DateUtils;
+import com.ard.utils.other.DateUtils;
import com.ard.utils.mqtt.MqttConsumer;
-import com.ard.utils.tcp.NettyTcpClient;
import com.ard.utils.udp.NettyUdpServer;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.annotation.Order;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
@@ -14,8 +14,6 @@
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
/**
* @Description: 管线泄漏报警服务
@@ -26,14 +24,14 @@
**/
@Service
@Slf4j(topic = "tube")
+@Order(3)
public class TubeAlarmService {
@Resource
NettyUdpServer nettyUdpServer;
- @Resource
- NettyTcpClient nettyTcpClient;
- @Value("${spring.netty.port}")
+
+ @Value("${spring.netty.udp.port}")
private Integer udpPort;
- @Value("${spring.netty.enabled}")
+ @Value("${spring.netty.udp.enabled}")
private String UdpServerEnable;
@PostConstruct
@@ -42,10 +40,9 @@
return;
}
nettyUdpServer.init(udpPort);
- log.info("UDP服务已经启动");
- nettyTcpClient.init("112.98.126.2",1200);
- log.info("TCP客户端已连接");
+ log.debug("管线泄露UDP服务已启动");
}
+
@Async("alarm")
public void alarmHandler(String message) {
@@ -55,7 +52,7 @@
String start = messages[0];
String host = messages[1];
String tubeId = messages[2];
- String alarmTime = DateUtils.convertDate(messages[3]);
+ String alarmTime = DateUtils.convertDate(messages[3], "yyyy/M/d H:m:s");
String position = messages[4];
String type = messages[5];
String watcher = messages[6];
@@ -68,14 +65,14 @@
map.put("alarmType", start);
map.put("position", position);
map.put("watcher", watcher);
- log.info("开始解析" + start);
- log.info("主机：" + host);
- log.info("管线编号：" + tubeId);
- log.info("报警时间：" + alarmTime);
- log.info("报警类型：" + type);
- log.info("位置：" + position);
- log.info("值班人：" + watcher);
- log.info("结束解析" + stop);
+ log.debug("开始解析" + start);
+ log.debug("主机：" + host);
+ log.debug("管线编号：" + tubeId);
+ log.debug("报警时间：" + alarmTime);
+ log.debug("报警类型：" + type);
+ log.debug("位置：" + position);
+ log.debug("值班人：" + watcher);
+ log.debug("结束解析" + stop);
MqttConsumer.publish(2, false, "tube", JSON.toJSONString(map));
} else {
log.error("数据异常");
@@ -84,4 +81,6 @@
log.error("tube报警数据推送异常：" + ex.getMessage());
}
}
+
+
}
--
Gitblit v1.9.3