From c9768346fc8bc1cc6326e06125deaf57ff423eaf Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 19 九月 2023 16:17:07 +0800
Subject: [PATCH] 修改三厂数字化使用原生jdbc连接

---
 src/main/java/com/ard/alarm/stealelec/service/StealElecAlarmService.java |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 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..84bf9d4 100644
--- a/src/main/java/com/ard/alarm/stealelec/service/StealElecAlarmService.java
+++ b/src/main/java/com/ard/alarm/stealelec/service/StealElecAlarmService.java
@@ -10,6 +10,7 @@
 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 +25,15 @@
  */
 @Slf4j(topic = "stealAlarm")
 @Service
-public class StealElecAlarmService{
+public class StealElecAlarmService {
     @Resource
     RestTemplate restTemplate;
     @Value("${spring.stealelec.url}")
     private String stealElecUrl;
-    List<String> tempList=new ArrayList<>();
+    @Value("${spring.stealelec.enabled}")
+    private Boolean enabled;
+    List<String> tempList = new ArrayList<>();
+
     /**
      * @鎻忚堪 鑾峰彇api鏁版嵁鎺ㄩ�乵qtt
      * @鍙傛暟 []
@@ -39,9 +43,12 @@
      * @淇敼浜哄拰鍏跺畠淇℃伅
      */
     @Async("alarm")
-   // @Scheduled(cron="0/5 * * * * ?")
+    @Scheduled(cron = "0/5 * * * * ?")
     public void alarmHandler() {
         try {
+            if (!enabled) {
+                return;
+            }
             String allAlarmData = restTemplate.getForObject(stealElecUrl, String.class);
             //鍓旈櫎鎵�鏈塡绗﹀彿
             String message = allAlarmData.replaceAll("\\\\", "");
@@ -60,11 +67,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));
+                    MqttConsumer.publish(2, false, "stealelec", JSON.toJSONString(wd));
                     tempList.add(wd.getId());
                 }
             }

--
Gitblit v1.9.3