From 07e861c3eaa69422c24d45b7406f899269d340d2 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Thu, 17 Oct 2024 09:38:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xydl/cac/controller/IcdConfigController.java   | 6 ++++++
 src/main/java/com/xydl/cac/iec/RealTimeDataService.java     | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/xydl/cac/controller/IcdConfigController.java b/src/main/java/com/xydl/cac/controller/IcdConfigController.java
index e888739..5946c4b 100644
--- a/src/main/java/com/xydl/cac/controller/IcdConfigController.java
+++ b/src/main/java/com/xydl/cac/controller/IcdConfigController.java
@@ -155,6 +155,9 @@ public class IcdConfigController extends BasicController {
     @PostMapping("startCollect")
     @ApiOperation("开始实时采集转发")
     public Response<String> startCollect(@Validated @NotNull(message = "iedId不能为空!") Integer iedId) throws Exception {
+        if (iedId == null) {
+            throw new BusinessException("iedId不能为空!");
+        }
         if (RealTimeDataService.inDoing) {
             throw new BusinessException("请稍后再操作");
         }
@@ -165,6 +168,9 @@ public class IcdConfigController extends BasicController {
     @PostMapping("stopCollect")
     @ApiOperation("停止实时采集转发")
     public Response<String> stopCollect(@Validated @NotNull(message = "iedId不能为空!") Integer iedId) throws Exception {
+        if (iedId == null) {
+            throw new BusinessException("iedId不能为空!");
+        }
         if (RealTimeDataService.inDoing) {
             throw new BusinessException("请稍后再操作");
         }
diff --git a/src/main/java/com/xydl/cac/iec/RealTimeDataService.java b/src/main/java/com/xydl/cac/iec/RealTimeDataService.java
index 9f79ec1..3abf30f 100644
--- a/src/main/java/com/xydl/cac/iec/RealTimeDataService.java
+++ b/src/main/java/com/xydl/cac/iec/RealTimeDataService.java
@@ -45,7 +45,6 @@ public class RealTimeDataService {
     }
 
     public void startCollect(Integer iedId) throws BusinessException {
-        inDoing = true;
         Optional<IcdIed> optional = iedRepository.findById(iedId);
         if (!optional.isPresent()) {
             throw new BusinessException("未找到该IED");
@@ -55,6 +54,7 @@ public class RealTimeDataService {
         if (!optionalFile.isPresent()) {
             throw new BusinessException("未找到该icd文件");
         }
+        inDoing = true;
         IcdFile icdFile = optionalFile.get();
         try {
             IecClient iecClient = new IecClient();