From 53a5de311a6ea00c4f299d1ee855a816fd9dacb3 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 15 三月 2024 11:13:46 +0800
Subject: [PATCH] 测试
---
src/main/java/com/ard/alarm/stealelec/service/StealElecAlarmService.java | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 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 1cc832e..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.mqtt.MqttConsumer;
+import com.ard.utils.http.HttpUtils;
+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 org.springframework.web.client.RestTemplate;
+
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
@@ -24,12 +26,12 @@
*/
@Slf4j(topic = "stealAlarm")
@Service
-public class StealElecAlarmService{
- @Resource
- RestTemplate restTemplate;
- @Value("${spring.stealelec.url}")
- private String stealElecUrl;
- List<String> tempList=new ArrayList<>();
+public class StealElecAlarmService {
+
+@Resource
+ StealElecConfiguration stealElecConfig;
+ List<String> tempList = new ArrayList<>();
+
/**
* @鎻忚堪 鑾峰彇api鏁版嵁鎺ㄩ�乵qtt
* @鍙傛暟 []
@@ -39,10 +41,13 @@
* @淇敼浜哄拰鍏跺畠淇℃伅
*/
@Async("alarm")
- // @Scheduled(cron="0/5 * * * * ?")
+ @Scheduled(cron = "0/5 * * * * ?")
public void alarmHandler() {
try {
- String allAlarmData = restTemplate.getForObject(stealElecUrl, String.class);
+ if (!stealElecConfig.getEnabled()) {
+ return;
+ }
+ String allAlarmData = HttpUtils.sendGet(stealElecConfig.getUrl());
//鍓旈櫎鎵�鏈塡绗﹀彿
String message = allAlarmData.replaceAll("\\\\", "");
//鍓旈櫎鏁翠釜瀛楃涓查灏惧弻寮曞彿
@@ -60,11 +65,10 @@
String JSONStr = JSON.toJSONString(object);
//杞垚瀹炰綋瀵硅薄
ArdAlarmStealelec wd = JSON.parseObject(JSONStr, ArdAlarmStealelec.class);
- if(tempList.contains(wd.getId()))
- {
+ 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