From e0e1b6ea9ebbed44ff0e5073bf25baa86cea5f4a Mon Sep 17 00:00:00 2001
From: wr <1754607820@qq.com>
Date: Thu, 6 Mar 2025 16:00:15 +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

---
 .../service/impl/PqScriptDtlsServiceImpl.java | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 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 7a643593..569ddaf0 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
@@ -129,7 +129,8 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
         List<SourceIssue> sourceIssues = new ArrayList<>();
         Set<Double> voltSet = new HashSet<>(1);
         Set<Double> currSet = new HashSet<>(1);
-        if (CollUtil.isNotEmpty(param.getDevIds())) {
+        boolean devFly = CollUtil.isNotEmpty(param.getDevIds());
+        if (devFly) {
             //校验终端额定电压电流是否相同
             List<PqDev> list = pqDevService.list(new LambdaQueryWrapper<PqDev>()
                     .eq(PqDev::getPlanId, param.getPlanId())
@@ -206,7 +207,7 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
                                 )
                                 .sorted(Comparator.comparing(PqScriptDtls::getPhase))
                                 .collect(Collectors.toList());
-                        issueAdd(volList, dtlsVList, HARM_V, INHARM_V, freqDtls.getValue(), "U", channelListDTOS, checkDataParam, isValueType);
+                        issueAdd(volList, dtlsVList, HARM_V, INHARM_V, freqDtls.getValue(), "U", channelListDTOS, checkDataParam,devFly, isValueType);
 
                         //2.通道电流(ABC)
                         List<PqScriptDtls> curList = value.stream().filter(x -> CUR.equals(x.getValueType()))
@@ -218,7 +219,7 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
                                 )
                                 .sorted(Comparator.comparing(PqScriptDtls::getPhase))
                                 .collect(Collectors.toList());
-                        issueAdd(curList, dtlsIList, HARM_I, INHARM_I, freqDtls.getValue(), "I", channelListDTOS, checkDataParam, isValueType);
+                        issueAdd(curList, dtlsIList, HARM_I, INHARM_I, freqDtls.getValue(), "I", channelListDTOS, checkDataParam,devFly, isValueType);
 
                         issue.setChannelList(channelListDTOS);
                         sourceIssues.add(issue);
@@ -869,6 +870,7 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
                           String code,
                           List<SourceIssue.ChannelListDTO> channelListDTOS,
                           PqScriptCheckDataParam checkDataParam,
+                          Boolean devFly,
                           Boolean isValueType) {
         List<String> info = new ArrayList<>();
         info.add("A");
@@ -939,10 +941,13 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
                                 .collect(Collectors.toList());
                         if (CollUtil.isNotEmpty(dipList)) {
                             PqScriptDtls dip = dipList.get(0);
-                            if (isValueType) {
-                                dipDataDTO.setFTransValue(dip.getTransValue() * dtls.getValue() * 0.01);
-                            } else {
-                                dipDataDTO.setFTransValue(dip.getTransValue());
+                            dipDataDTO.setFTransValue(dip.getTransValue());
+                            if(devFly){
+                                if (isValueType) {
+                                    dipDataDTO.setFTransValue(dip.getTransValue() * dtls.getValue() * 0.01);
+                                } else {
+                                    dipDataDTO.setFTransValue(dip.getTransValue());
+                                }
                             }
                             //  1.0/频率*持续时间（周波）= 暂态持续时间（s）
                             dipDataDTO.setFRetainTime(NumberUtil.round(1.0 / fFreq * dip.getRetainTime(), 3).doubleValue());