From a4f5034c7fd2a1549bf3929010c1eff7d397672b Mon Sep 17 00:00:00 2001
From: wr <1754607820@qq.com>
Date: Thu, 27 Feb 2025 16:23:59 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E8=84=9A=E6=9C=AC=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=80=BC=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PqScriptDtlsServiceImpl.java | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

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<PqScriptDtlsMapper, PqS
                             checkData.setDataType(channelListDTO.getDataType());
                             if (CollUtil.isNotEmpty(checkArchive)) {
                                 checkData.setValue(checkArchive.get(0).getValue());
+                                checkData.setDataType(checkArchive.get(0).getDataType());
                             } else {
                                 checkData.setValue(sourceIssue.getFFreq());
                             }
@@ -456,10 +457,10 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
                                         checkData.setErrorFlag(channelListDTO.getErrorFlag());
                                         checkData.setEnable(channelListDTO.getEnable());
                                         checkData.setValue(listDTO.getFPhase());
-                                        setCheckValue(checkArchive, checkData, listDTO);
                                         checkData.setDataType(channelListDTO.getDataType());
                                         checkData.setValueType(channelListDTO.getValueType());
                                         checkData.setPid(channelListDTO.getPid());
+                                        setCheckValue(checkArchive, checkData, listDTO);
                                         info.add(checkData);
                                     }
                                 }
@@ -498,6 +499,7 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
                                                     checkData = new PqScriptDtlsParam.CheckData();
                                                     checkData.setErrorFlag(channelListDTO.getErrorFlag());
                                                     checkData.setEnable(channelListDTO.getEnable());
+                                                    checkData.setHarmNum(harmModel.getHarm());
                                                     if (harmIMap.containsKey(harmModel.getHarm())) {
                                                         PqScriptDtlsParam.ChannelListDTO.HarmModel i = harmIMap.get(harmModel.getHarm());
                                                         //电压*电流*cos（电压角度-电流角度）
@@ -592,11 +594,11 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
     }
 
     private void setCheck(List<PqScriptDtlsParam.CheckData> info, PqScriptDtlsParam.CheckData checkData, PqScriptDtlsParam.CheckData channelListDTO, List<PqScriptCheckData> 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<PqScriptDtlsMapper, PqS
             checkData = new PqScriptDtlsParam.CheckData();
             checkData.setErrorFlag(channelListDTO.getErrorFlag());
             checkData.setEnable(channelListDTO.getEnable());
+            checkData.setPhase("T");
+            checkData.setDataType(channelListDTO.getDataType());
+            checkData.setValueType(channelListDTO.getValueType());
+            checkData.setPid(channelListDTO.getPid());
             List<PqScriptDtlsParam.ChannelListDTO> channelA = list.stream().filter(x -> x.getChannelType().contains("a")).collect(Collectors.toList());
             List<PqScriptDtlsParam.ChannelListDTO> channelB = list.stream().filter(x -> x.getChannelType().contains("b")).collect(Collectors.toList());
             List<PqScriptDtlsParam.ChannelListDTO> channelC = list.stream().filter(x -> x.getChannelType().contains("c")).collect(Collectors.toList());
@@ -661,11 +667,8 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
             }
             if (CollUtil.isNotEmpty(checkArchive)) {
                 checkData.setValue(checkArchive.get(0).getValue());
+                checkData.setDataType(checkArchive.get(0).getDataType());
             }
-            checkData.setPhase("T");
-            checkData.setDataType(channelListDTO.getDataType());
-            checkData.setValueType(channelListDTO.getValueType());
-            checkData.setPid(channelListDTO.getPid());
             info.add(checkData);
         }
     }
@@ -683,9 +686,13 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
                 checkData.setErrorFlag(channelListDTO.getErrorFlag());
                 checkData.setEnable(channelListDTO.getEnable());
                 checkData.setPhase(listDTO.getChannelType().substring(1, 2).toUpperCase());
+                checkData.setDataType(channelListDTO.getDataType());
+                checkData.setValueType(channelListDTO.getValueType());
+                checkData.setPid(channelListDTO.getPid());
                 List<PqScriptCheckData> 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<PqScriptDtlsMapper, PqS
                         checkData.setValue(listDTO.getFAmp());
                     }
                 }
-                checkData.setDataType(channelListDTO.getDataType());
-                checkData.setValueType(channelListDTO.getValueType());
-                checkData.setPid(channelListDTO.getPid());
                 info.add(checkData);
             }
 
@@ -717,11 +721,11 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
                         checkData.setErrorFlag(channelListDTO.getErrorFlag());
                         checkData.setEnable(channelListDTO.getEnable());
                         checkData.setValue(inharmModel.getFAmp());
-                        setCheckValue(checkArchive, checkData, listDTO);
                         checkData.setHarmNum(inharmModel.getInharm());
                         checkData.setDataType(channelListDTO.getDataType());
                         checkData.setValueType(channelListDTO.getValueType());
                         checkData.setPid(channelListDTO.getPid());
+                        setCheckValue(checkArchive, checkData, listDTO);
                         info.add(checkData);
                     }
                 }
@@ -733,6 +737,7 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
         List<PqScriptCheckData> 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<PqScriptDtlsMapper, PqS
                         checkData.setErrorFlag(channelListDTO.getErrorFlag());
                         checkData.setEnable(channelListDTO.getEnable());
                         checkData.setValue(harmModel.getFAmp());
-                        setCheckValue(checkArchive, checkData, listDTO);
                         checkData.setPhase(listDTO.getChannelType().substring(1, 2).toUpperCase());
                         checkData.setHarmNum(harmModel.getHarm());
                         checkData.setDataType(channelListDTO.getDataType());
                         checkData.setValueType(channelListDTO.getValueType());
                         checkData.setPid(channelListDTO.getPid());
+                        setCheckValue(checkArchive, checkData, listDTO);
                         info.add(checkData);
                     }
                 }