From de83f9884521a706c05cb8b4ee4da96914fb8ea0 Mon Sep 17 00:00:00 2001
From: caozehui <2427765068@qq.com>
Date: Mon, 1 Jun 2026 11:07:20 +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/SocketDevResponseService.java     |  6 ++--
 .../handler/SocketSourceResponseService.java  | 29 ++++++++++---------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java b/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java
index bd203fab..90b999df 100644
--- a/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java
+++ b/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java
@@ -1853,7 +1853,7 @@ public class SocketDevResponseService {
                     if (ObjectUtil.isNotNull(dipData)) {
                         Double fTransValue = dipData.getFTransValue();
                         if (ObjectUtil.isNotNull(fTransValue) && ObjectUtil.isNotNull(fAmp)) {
-                            if (maxVoltage.compareTo(BigDecimal.valueOf(fTransValue).max(BigDecimal.valueOf(fAmp))) < 0) {
+                            if (maxVoltage.compareTo(BigDecimal.valueOf(fTransValue / 100).max(BigDecimal.valueOf(fAmp))) < 0) {
                                 return 1;
                             }
                         }
@@ -1862,7 +1862,7 @@ public class SocketDevResponseService {
                 // 谐波判断
                 if (channelListDTO.getHarmFlag()) {
                     List<SourceIssue.ChannelListDTO.HarmModel> harmList = channelListDTO.getHarmList();
-                    double sum = harmList.stream().map(harmModel -> harmModel.getFAmp() * harmModel.getFAmp()).mapToDouble(x -> x).sum();
+                    double sum = harmList.stream().map(harmModel -> harmModel.getFAmp() * harmModel.getFAmp() / 10000).mapToDouble(x -> x).sum();
                     if (channelType.contains("U")) {
                         if (maxVoltage.compareTo(BigDecimal.valueOf(Math.sqrt(1 + sum) * fAmp)) < 0) {
                             return 1;
@@ -1876,7 +1876,7 @@ public class SocketDevResponseService {
                 // 间谐波判断
                 if (channelListDTO.getInHarmFlag()) {
                     List<SourceIssue.ChannelListDTO.InharmModel> inharmList = channelListDTO.getInharmList();
-                    double sum = inharmList.stream().map(harmModel -> harmModel.getFAmp() * harmModel.getFAmp()).mapToDouble(x -> x).sum();
+                    double sum = inharmList.stream().map(harmModel -> harmModel.getFAmp() * harmModel.getFAmp() / 10000).mapToDouble(x -> x).sum();
                     if (channelType.contains("U")) {
                         if (maxVoltage.compareTo(BigDecimal.valueOf(Math.sqrt(1 + sum) * fAmp)) < 0) {
                             return 1;
diff --git a/detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java b/detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java
index 170ca2c2..5ad50968 100644
--- a/detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java
+++ b/detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java
@@ -389,19 +389,22 @@ public class SocketSourceResponseService {
                         overloadSocketDataMsg.setRequestId("overloadTest");
                         overloadSocketDataMsg.setCode(FormalTestManager.overload);
                         sendWebSocketMessage(param.getUserPageId(), overloadSocketDataMsg);
-
-                        //todo 前端推送收到的消息暂未处理好
-                        sendWebSocketMessage(param.getUserPageId(), socketDataMsg);
-                        //开始设备通讯检测(发送设备初始化)
-                        Map<String, List<PreDetection>> map = new HashMap<>(1);
-                        map.put("deviceList", FormalTestManager.devList);
-                        String jsonString = JSON.toJSONString(map);
-                        socketMsg.setRequestId(SourceOperateCodeEnum.YJC_SBTXJY.getValue());
-                        socketMsg.setOperateCode(SourceOperateCodeEnum.DEV_INIT_GATHER_01.getValue());
-                        socketMsg.setData(jsonString);
-                        String json = JSON.toJSONString(socketMsg);
-                        // 使用智能发送工具类，自动管理设备连接
-                        socketManager.smartSendToDevice(param, json);
+                        if (FormalTestManager.overload != 4) {
+                            CnSocketUtil.quitSendSource(param);
+                        } else {
+                            //todo 前端推送收到的消息暂未处理好
+                            sendWebSocketMessage(param.getUserPageId(), socketDataMsg);
+                            //开始设备通讯检测(发送设备初始化)
+                            Map<String, List<PreDetection>> map = new HashMap<>(1);
+                            map.put("deviceList", FormalTestManager.devList);
+                            String jsonString = JSON.toJSONString(map);
+                            socketMsg.setRequestId(SourceOperateCodeEnum.YJC_SBTXJY.getValue());
+                            socketMsg.setOperateCode(SourceOperateCodeEnum.DEV_INIT_GATHER_01.getValue());
+                            socketMsg.setData(jsonString);
+                            String json = JSON.toJSONString(socketMsg);
+                            // 使用智能发送工具类，自动管理设备连接
+                            socketManager.smartSendToDevice(param, json);
+                        }
                     }
                     break;
                 case UNPROCESSED_BUSINESS: