From 0787901d6081fd2a061e836d5b59c3535ba135ed Mon Sep 17 00:00:00 2001
From: caozehui <2427765068@qq.com>
Date: Mon, 8 Jun 2026 08:43:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../handler/SocketFreqConverterService.java       | 15 ++++++++-------
 .../service/impl/PreDetectionServiceImpl.java     |  3 +++
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/detection/src/main/java/com/njcn/gather/detection/handler/SocketFreqConverterService.java b/detection/src/main/java/com/njcn/gather/detection/handler/SocketFreqConverterService.java
index d35d1467..538e62dc 100644
--- a/detection/src/main/java/com/njcn/gather/detection/handler/SocketFreqConverterService.java
+++ b/detection/src/main/java/com/njcn/gather/detection/handler/SocketFreqConverterService.java
@@ -228,14 +228,15 @@ public class SocketFreqConverterService {
     }
 
     private void handleCloseSerial(String converterChannelTag, FreqConverterRespDTO respDTO) {
-        if (respDTO.getCode() == 0 && respDTO.getSuccess()) {
-            if (FormalTestManager.currentFreqConverterId != null) {
-                pqFreqConverterConfigService.updateTestStatus(FormalTestManager.currentFreqConverterId, 1);
-            }
-            cleanup(converterChannelTag);
-        } else {
-            this.sendClose(converterChannelTag);
+        if (FormalTestManager.currentFreqConverterId != null) {
+            pqFreqConverterConfigService.updateTestStatus(FormalTestManager.currentFreqConverterId, 1);
         }
+        cleanup(converterChannelTag);
+//        if (respDTO.getCode() == 0 && respDTO.getSuccess()) {
+//
+//        } else {
+//            this.sendClose(converterChannelTag);
+//        }
     }
 
 
diff --git a/detection/src/main/java/com/njcn/gather/detection/service/impl/PreDetectionServiceImpl.java b/detection/src/main/java/com/njcn/gather/detection/service/impl/PreDetectionServiceImpl.java
index fc092bba..2f53a983 100644
--- a/detection/src/main/java/com/njcn/gather/detection/service/impl/PreDetectionServiceImpl.java
+++ b/detection/src/main/java/com/njcn/gather/detection/service/impl/PreDetectionServiceImpl.java
@@ -25,6 +25,7 @@ import com.njcn.gather.detection.util.socket.websocket.WebServiceManager;
 import com.njcn.gather.device.pojo.po.PqDev;
 import com.njcn.gather.device.pojo.vo.PreDetection;
 import com.njcn.gather.device.service.IPqDevService;
+import com.njcn.gather.freqConverter.service.IPqFreqConverterConfigService;
 import com.njcn.gather.plan.pojo.enums.DataSourceEnum;
 import com.njcn.gather.plan.pojo.po.AdPlan;
 import com.njcn.gather.plan.pojo.po.AdPlanSource;
@@ -79,6 +80,7 @@ public class PreDetectionServiceImpl implements PreDetectionService {
     private final IPqScriptCheckDataService iPqScriptCheckDataService;
     private final SocketManager socketManager;
     private final ISysTestConfigService sysTestConfigService;
+    private final IPqFreqConverterConfigService pqFreqConverterConfigService;
 
 
     @Value("${report.reportDir}")
@@ -422,6 +424,7 @@ public class PreDetectionServiceImpl implements PreDetectionService {
 
     @Override
     public void stopFreqConverter(String converterTag, String devTag) {
+        pqFreqConverterConfigService.updateTestStatus(FormalTestManager.currentFreqConverterId, 1);
         socketFreqConverterService.stopTest(converterTag, devTag);
         socketFreqConverterDevService.stopTest(converterTag, devTag);
     }