diff --git a/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java b/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java index 2576324f..ee671dfc 100644 --- a/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java @@ -427,6 +427,7 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl info, PqScriptDtlsParam.CheckData checkData, PqScriptDtlsParam.CheckData channelListDTO, List checkArchive, PqScriptDtlsParam.ChannelListDTO listDTO) { - setCheckValue(checkArchive, checkData, listDTO); checkData.setPhase(listDTO.getChannelType().substring(1, 2).toUpperCase()); checkData.setDataType(channelListDTO.getDataType()); checkData.setValueType(channelListDTO.getValueType()); checkData.setPid(channelListDTO.getPid()); + setCheckValue(checkArchive, checkData, listDTO); info.add(checkData); } @@ -650,6 +652,10 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl channelA = list.stream().filter(x -> x.getChannelType().contains("a")).collect(Collectors.toList()); List channelB = list.stream().filter(x -> x.getChannelType().contains("b")).collect(Collectors.toList()); List channelC = list.stream().filter(x -> x.getChannelType().contains("c")).collect(Collectors.toList()); @@ -661,11 +667,8 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl collect = checkArchive.stream().filter(x -> x.getPhase().equals(listDTO.getChannelType().substring(1, 2).toUpperCase())).collect(Collectors.toList()); if (CollUtil.isNotEmpty(collect)) { checkData.setValue(collect.get(0).getValue()); + checkData.setDataType(collect.get(0).getDataType()); } else { if (flyDeltaV) { checkData.setValue(0.0); @@ -693,9 +700,6 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl collect = checkArchive.stream().filter(x -> x.getPhase().equals(listDTO.getChannelType().substring(1, 2).toUpperCase())).collect(Collectors.toList()); if (CollUtil.isNotEmpty(collect)) { checkData.setValue(collect.get(0).getValue()); + checkData.setDataType(collect.get(0).getDataType()); } checkData.setPhase(listDTO.getChannelType().substring(1, 2).toUpperCase()); } @@ -752,12 +757,12 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl