From c5e66d9e033e57623a65a499d016ae9ca49bd5af Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Mon, 4 Nov 2024 16:33:23 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E5=81=9C=E6=AD=A2?=
 =?UTF-8?q?=E8=AE=A2=E9=98=85=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/xydl/cac/iec/IecClient.java          |  7 +++++--
 .../java/com/xydl/cac/iec/RealTimeDataService.java     | 10 +++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/xydl/cac/iec/IecClient.java b/src/main/java/com/xydl/cac/iec/IecClient.java
index 73e2553..764d48a 100644
--- a/src/main/java/com/xydl/cac/iec/IecClient.java
+++ b/src/main/java/com/xydl/cac/iec/IecClient.java
@@ -119,7 +119,11 @@ public class IecClient implements ClientEventListener {
             } catch (Exception ignore) {
             }
         }
-        log.info("61850停止订阅, ied=" + ied.getName() + ", ip=" + ied.getIp() + ", port=" + ied.getPort());
+        if (keep) {
+            log.warn("61850订阅已断开, ied=" + ied.getName() + ", ip=" + ied.getIp() + ", port=" + ied.getPort());
+        } else {
+            log.info("61850停止订阅, ied=" + ied.getName() + ", ip=" + ied.getIp() + ", port=" + ied.getPort());
+        }
     }
 
     public List<FileInformation> listFile(String path) throws Exception {
@@ -147,7 +151,6 @@ public class IecClient implements ClientEventListener {
         if (keep) {
             this.disableReporting();
             this.disconnect();
-            log.warn("61850订阅已断开, ied=" + ied.getName() + ", ip=" + ied.getIp() + ", port=" + ied.getPort());
             while (retry > 0) {
                 retry--;
                 try {
diff --git a/src/main/java/com/xydl/cac/iec/RealTimeDataService.java b/src/main/java/com/xydl/cac/iec/RealTimeDataService.java
index 42ea894..efe81da 100644
--- a/src/main/java/com/xydl/cac/iec/RealTimeDataService.java
+++ b/src/main/java/com/xydl/cac/iec/RealTimeDataService.java
@@ -16,10 +16,7 @@ import org.springframework.util.CollectionUtils;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 
 @Service
 @Slf4j
@@ -104,9 +101,12 @@ public class RealTimeDataService {
     @PreDestroy
     private void stop() {
         log.info("关闭61850订阅服务.");
+        List<Integer> idList = new ArrayList<>();
         Iterator<Integer> it = clientMap.keySet().iterator();
         while (it.hasNext()) {
-            Integer iedId = it.next();
+            idList.add(it.next());
+        }
+        for (Integer iedId : idList) {
             this.onlyStop(iedId);
         }
     }