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;jit.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 harmonicRelationMap = new HashMap<>(); + + }