From ea585a65ffcd17a6b4e41a74b5e08505d46b46cd Mon Sep 17 00:00:00 2001
From: chendaofei <857448963@qq.com>
Date: Tue, 22 Apr 2025 16:56:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=9F=E5=A7=8B=E6=95=B0=E6=8D=AE=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detection/handler/SocketDevResponseService.java   | 11 +++++++++--
 .../detection/util/socket/FormalTestManager.java      |  6 ++++++
 2 files changed, 15 insertions(+), 2 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 13e2cab8..352ec9a8 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
@@ -55,6 +55,8 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static com.njcn.gather.detection.util.socket.FormalTestManager.harmonicRelationMap;
+
 
 @Service
 @RequiredArgsConstructor
@@ -1613,6 +1615,9 @@ public class SocketDevResponseService {
         if (param.getOperateType().equals(SourceOperateCodeEnum.COEFFICIENT_TEST.getValue())) {
             initXiManager(param);
         }
+
+        harmonicRelationMap.put(DetectionCodeEnum.V2_50.getCode(),DetectionCodeEnum.U1.getCode());
+        harmonicRelationMap.put(DetectionCodeEnum.I2_50.getCode(),DetectionCodeEnum.I1.getCode());
     }
 
     //初始化系数校验参数
@@ -1692,6 +1697,7 @@ public class SocketDevResponseService {
                         adNonHarmonicResult.setMonitorId(temId);
                         adNonHarmonicResult.setScriptId(param.getScriptId());
                         adNonHarmonicResult.setSort(sourceIssue.getIndex());
+
                         adNonHarmonicResult.setAdType(checkDataMap.get(sqlDataDTO.getDesc()));
                         adNonHarmonicResult.setDataType("avg");
 
@@ -1714,9 +1720,10 @@ public class SocketDevResponseService {
                         adNonHarmonicResultList.add(adNonHarmonicResult);
                     }
                 } else {
+
                     for(int j=0;j<data.getSqlDataHarm().size();j++){
                         DevData.SqlDataHarmDTO sqlDataDTO = data.getSqlDataHarm().get(j);
-
+                        String dui = harmonicRelationMap.get(sqlDataDTO.getDesc());
                         AdHarmonicResult adHarmonicResult = new AdHarmonicResult();
                         adHarmonicResult.setTimeId(localDateTime);
 
@@ -1728,7 +1735,7 @@ public class SocketDevResponseService {
 
                         if (!DicDataEnum.HSV.getCode().equals(sourceIssue.getType()) && !DicDataEnum.HSI.getCode().equals(sourceIssue.getType()) && !DicDataEnum.HP.getCode().equals(sourceIssue.getType())) {
                             if (CollUtil.isNotEmpty(data.getSqlData())) {
-                                DevData.SqlDataDTO.ListDTO vvv = data.getSqlData().get(j).getList();
+                                DevData.SqlDataDTO.ListDTO vvv = data.getSqlData().stream().filter(it->it.getDesc().equals(dui)).collect(Collectors.toList()).get(0).getList();
                                 Double aV = vvv.getA();
                                 Double bV = vvv.getB();
                                 Double cV = vvv.getC();
diff --git a/detection/src/main/java/com/njcn/gather/detection/util/socket/FormalTestManager.java b/detection/src/main/java/com/njcn/gather/detection/util/socket/FormalTestManager.java
index 9966ea0e..2c6e141b 100644
--- a/detection/src/main/java/com/njcn/gather/detection/util/socket/FormalTestManager.java
+++ b/detection/src/main/java/com/njcn/gather/detection/util/socket/FormalTestManager.java
@@ -66,4 +66,10 @@ public class FormalTestManager {
     public static Integer stopTime = 0;
 
 
+    /**
+     * 强行赋值关系
+     */
+    public static Map<String,String> harmonicRelationMap = new HashMap<>();
+
+
 }