From a850200a330feceb0e64650bb6dfc47eec5478c7 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 27 三月 2024 09:34:30 +0800
Subject: [PATCH] 优化雷达日志
---
src/main/java/com/ard/alarm/stealelec/service/StealElecAlarmService.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ard/alarm/stealelec/service/StealElecAlarmService.java b/src/main/java/com/ard/alarm/stealelec/service/StealElecAlarmService.java
index ced8991..7119769 100644
--- a/src/main/java/com/ard/alarm/stealelec/service/StealElecAlarmService.java
+++ b/src/main/java/com/ard/alarm/stealelec/service/StealElecAlarmService.java
@@ -2,14 +2,16 @@
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
+import com.ard.alarm.stealelec.config.StealElecConfiguration;
import com.ard.alarm.stealelec.domain.ArdAlarmStealelec;
import com.ard.utils.http.HttpUtils;
-import com.ard.utils.mqtt.MqttConsumer;
+import com.ard.utils.mqtt.MqttProducer;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
+
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
@@ -26,10 +28,8 @@
@Service
public class StealElecAlarmService {
- @Value("${spring.stealelec.url}")
- private String stealElecUrl;
- @Value("${spring.stealelec.enabled}")
- private Boolean enabled;
+@Resource
+ StealElecConfiguration stealElecConfig;
List<String> tempList = new ArrayList<>();
/**
@@ -44,10 +44,10 @@
@Scheduled(cron = "0/5 * * * * ?")
public void alarmHandler() {
try {
- if (!enabled) {
+ if (!stealElecConfig.getEnabled()) {
return;
}
- String allAlarmData = HttpUtils.sendGet(stealElecUrl);
+ String allAlarmData = HttpUtils.sendGet(stealElecConfig.getUrl());
//鍓旈櫎鎵�鏈塡绗﹀彿
String message = allAlarmData.replaceAll("\\\\", "");
//鍓旈櫎鏁翠釜瀛楃涓查灏惧弻寮曞彿
@@ -68,7 +68,7 @@
if (tempList.contains(wd.getId())) {
continue;
}
- MqttConsumer.publish(2, false, "stealelec", JSON.toJSONString(wd));
+ MqttProducer.publish(2, false, "stealelec", JSON.toJSONString(wd));
tempList.add(wd.getId());
}
}
--
Gitblit v1.9.3