From 8419450427040453fc13d32b031c2ff3acb9b564 Mon Sep 17 00:00:00 2001
From: wr <1754607820@qq.com>
Date: Thu, 6 Mar 2025 08:46: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      | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 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 94c6622a..70e19c28 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
@@ -34,6 +34,7 @@ import com.njcn.gather.type.pojo.po.DevType;
 import com.njcn.gather.type.service.IDevTypeService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.hamcrest.core.Is;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -205,7 +206,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);
+                        issueAdd(volList, dtlsVList, HARM_V, INHARM_V, freqDtls.getValue(), "U", channelListDTOS, checkDataParam, isValueType);
 
                         //2.通道电流(ABC)
                         List<PqScriptDtls> curList = value.stream().filter(x -> CUR.equals(x.getValueType()))
@@ -217,7 +218,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);
+                        issueAdd(curList, dtlsIList, HARM_I, INHARM_I, freqDtls.getValue(), "I", channelListDTOS, checkDataParam, isValueType);
 
                         issue.setChannelList(channelListDTOS);
                         sourceIssues.add(issue);
@@ -867,7 +868,8 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
                           Double fFreq,
                           String code,
                           List<SourceIssue.ChannelListDTO> channelListDTOS,
-                          PqScriptCheckDataParam checkDataParam) {
+                          PqScriptCheckDataParam checkDataParam,
+                          Boolean isValueType) {
         List<String> info = new ArrayList<>();
         info.add("A");
         info.add("B");
@@ -937,7 +939,11 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
                                 .collect(Collectors.toList());
                         if (CollUtil.isNotEmpty(dipList)) {
                             PqScriptDtls dip = dipList.get(0);
-                            dipDataDTO.setFTransValue(dip.getTransValue() * dtls.getValue());
+                            if (isValueType) {
+                                dipDataDTO.setFTransValue(dip.getTransValue() * dtls.getValue());
+                            } else {
+                                dipDataDTO.setFTransValue(dip.getTransValue());
+                            }
                             //  1.0/频率*持续时间（周波）= 暂态持续时间（s）
                             dipDataDTO.setFRetainTime(NumberUtil.round(1.0 / fFreq * dip.getRetainTime(), 3).doubleValue());
                             dipDataDTO.setRetainTime(dip.getRetainTime());