From cde11b89b14858744e303779f35f9bd5285dd0c5 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Thu, 31 Oct 2024 13:57:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E8=AE=A2=E9=98=85?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=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           | 1 +
 src/main/java/com/xydl/cac/iec/RealTimeDataService.java | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/xydl/cac/iec/IecClient.java b/src/main/java/com/xydl/cac/iec/IecClient.java
index ebb4a8b..d393a5d 100644
--- a/src/main/java/com/xydl/cac/iec/IecClient.java
+++ b/src/main/java/com/xydl/cac/iec/IecClient.java
@@ -66,6 +66,7 @@ public class IecClient implements ClientEventListener {
     public void disconnect() {
         try {
             clientAssociation.disconnect();
+            clientAssociation = null;
         } catch (Exception ignore) {
         }
     }
diff --git a/src/main/java/com/xydl/cac/iec/RealTimeDataService.java b/src/main/java/com/xydl/cac/iec/RealTimeDataService.java
index 0b3b2b1..31b4898 100644
--- a/src/main/java/com/xydl/cac/iec/RealTimeDataService.java
+++ b/src/main/java/com/xydl/cac/iec/RealTimeDataService.java
@@ -71,10 +71,9 @@ public class RealTimeDataService {
             iedRepository.save(ied);
             clientMap.put(ied.getId(), iecClient);
         } catch (Exception ex) {
-            ied.setStart(Constants.FALSE);
-            iedRepository.save(ied);
             String err = "61850订阅异常, ied=" + ied.getName() + ", ip=" + ied.getIp() + ", port=" + ied.getPort();
             log.error(err, ex);
+            this.stopCollect(iedId);
             throw new BusinessException(err);
         } finally {
             inDoing = false;