From 947ee4f7716e98aa803fe8dbde1b6e64b2fece62 Mon Sep 17 00:00:00 2001
From: caozehui <2427765068@qq.com>
Date: Thu, 18 Sep 2025 08:58:48 +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/PreDetectionServiceImpl.java | 16 +++++-----
 .../mapper/mapping/PqMonitorMapper.xml        |  1 +
 .../service/impl/PqScriptDtlsServiceImpl.java | 18 +++++------
 .../impl/DetectionDataServiceImpl.java        | 30 +++++++++----------
 4 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/detection/src/main/java/com/njcn/gather/detection/service/impl/PreDetectionServiceImpl.java b/detection/src/main/java/com/njcn/gather/detection/service/impl/PreDetectionServiceImpl.java
index 56e73009..4f9f8f3e 100644
--- a/detection/src/main/java/com/njcn/gather/detection/service/impl/PreDetectionServiceImpl.java
+++ b/detection/src/main/java/com/njcn/gather/detection/service/impl/PreDetectionServiceImpl.java
@@ -273,14 +273,14 @@ public class PreDetectionServiceImpl implements PreDetectionService {
     @Override
     public void sendScript(SimulateDetectionParam param) {
         Channel channel = SocketManager.getChannelByUserId(param.getUserPageId() + DetectionCommunicateConstant.SOURCE);
-//        if (Objects.isNull(channel) || !channel.isActive()) {
-//            // 进行源通信连接
-//            PreDetectionParam preDetectionParam = new PreDetectionParam();
-//            preDetectionParam.setSourceId(param.getSourceId());
-//            preDetectionParam.setUserPageId(param.getUserPageId());
-//            preDetectionParam.setSendWebMsg(false);
-//            this.sendYtxSocketSimulate(preDetectionParam);
-//        }
+        if (Objects.isNull(channel) || !channel.isActive()) {
+            // 进行源通信连接
+            PreDetectionParam preDetectionParam = new PreDetectionParam();
+            preDetectionParam.setSourceId(param.getSourceId());
+            preDetectionParam.setUserPageId(param.getUserPageId());
+            preDetectionParam.setSendWebMsg(false);
+            this.sendYtxSocketSimulate(preDetectionParam);
+        }
         //组装源控制脚本
         PqScriptIssueParam issueParam = new PqScriptIssueParam();
         issueParam.setSourceId(param.getSourceId());
diff --git a/detection/src/main/java/com/njcn/gather/monitor/mapper/mapping/PqMonitorMapper.xml b/detection/src/main/java/com/njcn/gather/monitor/mapper/mapping/PqMonitorMapper.xml
index bd5289cd..eb0ea731 100644
--- a/detection/src/main/java/com/njcn/gather/monitor/mapper/mapping/PqMonitorMapper.xml
+++ b/detection/src/main/java/com/njcn/gather/monitor/mapper/mapping/PqMonitorMapper.xml
@@ -39,6 +39,7 @@
         <foreach collection="devIds" item="devId" open="(" separator="," close=")">
             #{devId}
         </foreach>
+        order by Num
     </select>
 </mapper>
 
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 e37a2bb5..4c2453ca 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
@@ -628,9 +628,9 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
                                         checkData.setEnable(channelListDTO.getEnable());
                                         //电压*电流*cos（电压角度-电流角度）
                                         checkData.setValue(channelI.get(0).getFAmp() * listDTO.getFAmp() / 10000 * Math.cos((listDTO.getFPhase() - channelI.get(0).getFPhase()) * Math.PI / 180));
-                                        if (valueType) {
-                                            checkData.setValue(checkData.getValue() * 57.74 * 5);
-                                        }
+//                                        if (valueType) {
+                                        checkData.setValue(checkData.getValue() * 57.74 * 5);
+//                                        }
                                         setCheck(info, checkData, channelListDTO, checkArchive, listDTO);
                                     }
                                 }
@@ -651,9 +651,9 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
                                         checkData.setEnable(channelListDTO.getEnable());
                                         //电压*电流*cos（电压角度-电流角度）
                                         checkData.setValue(channelI.get(0).getFAmp() * listDTO.getFAmp() / 10000 * Math.sin((listDTO.getFPhase() - channelI.get(0).getFPhase()) * Math.PI / 180));
-                                        if (valueType) {
-                                            checkData.setValue(checkData.getValue() * 57.74 * 5);
-                                        }
+//                                        if (valueType) {
+                                        checkData.setValue(checkData.getValue() * 57.74 * 5);
+//                                        }
                                         setCheck(info, checkData, channelListDTO, checkArchive, listDTO);
                                     }
                                 }
@@ -674,9 +674,9 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
                                         checkData.setEnable(channelListDTO.getEnable());
                                         //电压*电流*cos（电压角度-电流角度）
                                         checkData.setValue(channelI.get(0).getFAmp() * listDTO.getFAmp() / 10000);
-                                        if (valueType) {
-                                            checkData.setValue(checkData.getValue() * 57.74 * 5);
-                                        }
+//                                        if (valueType) {
+                                        checkData.setValue(checkData.getValue() * 57.74 * 5);
+//                                        }
                                         setCheck(info, checkData, channelListDTO, checkArchive, listDTO);
                                     }
                                 }
diff --git a/storage/src/main/java/com/njcn/gather/storage/service/impl/DetectionDataServiceImpl.java b/storage/src/main/java/com/njcn/gather/storage/service/impl/DetectionDataServiceImpl.java
index ed6b9e81..88a61f22 100644
--- a/storage/src/main/java/com/njcn/gather/storage/service/impl/DetectionDataServiceImpl.java
+++ b/storage/src/main/java/com/njcn/gather/storage/service/impl/DetectionDataServiceImpl.java
@@ -109,14 +109,13 @@ public class DetectionDataServiceImpl extends ReplenishMybatisServiceImpl<Detect
             }
             if (nonHarmonicResultList.get(0) instanceof ContrastNonHarmonicResult) {
                 List<ContrastNonHarmonicResult> contrastNonHarmonicResultList = BeanUtil.copyToList(nonHarmonicResultList, ContrastNonHarmonicResult.class);
-                List<String> monitorIds = contrastNonHarmonicResultList.stream().map(ContrastNonHarmonicResult::getDevMonitorId).distinct().collect(Collectors.toList());
-                if (CollUtil.isNotEmpty(monitorIds)) {
-                    contrastNonHarmonicService.remove(new LambdaQueryWrapper<ContrastNonHarmonicResult>().in(ContrastNonHarmonicResult::getDevMonitorId, monitorIds)
-                            .eq(ContrastNonHarmonicResult::getNum, contrastNonHarmonicResultList.get(0).getNum())
-                            .eq(ContrastNonHarmonicResult::getDataType, contrastNonHarmonicResultList.get(0).getDataType())
-                            .eq(ObjectUtil.isNotNull(contrastNonHarmonicResultList.get(0).getWaveNum()), ContrastNonHarmonicResult::getWaveNum, contrastNonHarmonicResultList.get(0).getWaveNum())
-                            .isNull(ObjectUtil.isNull(contrastNonHarmonicResultList.get(0).getWaveNum()), ContrastNonHarmonicResult::getWaveNum));
-                }
+                ContrastNonHarmonicResult contrastNonHarmonicResult = contrastNonHarmonicResultList.get(0);
+                contrastNonHarmonicService.remove(new LambdaQueryWrapper<ContrastNonHarmonicResult>().in(ContrastNonHarmonicResult::getDevMonitorId, contrastNonHarmonicResult.getDevMonitorId())
+                        .eq(ContrastNonHarmonicResult::getNum, contrastNonHarmonicResult.getNum())
+                        .eq(ContrastNonHarmonicResult::getAdType, contrastNonHarmonicResult.getAdType())
+                        .eq(ContrastNonHarmonicResult::getDataType, contrastNonHarmonicResult.getDataType())
+                        .eq(ObjectUtil.isNotNull(contrastNonHarmonicResult.getWaveNum()), ContrastNonHarmonicResult::getWaveNum, contrastNonHarmonicResult.getWaveNum())
+                        .isNull(ObjectUtil.isNull(contrastNonHarmonicResult.getWaveNum()), ContrastNonHarmonicResult::getWaveNum));
                 contrastNonHarmonicService.saveBatch(contrastNonHarmonicResultList);
             }
             DynamicTableNameHandler.remove();
@@ -143,14 +142,13 @@ public class DetectionDataServiceImpl extends ReplenishMybatisServiceImpl<Detect
 
             if (harmonicResultList.get(0) instanceof ContrastHarmonicResult) {
                 List<ContrastHarmonicResult> contrastHarmonicResultList = BeanUtil.copyToList(harmonicResultList, ContrastHarmonicResult.class);
-                List<String> monitorIds = contrastHarmonicResultList.stream().map(ContrastHarmonicResult::getDevMonitorId).distinct().collect(Collectors.toList());
-                if (CollUtil.isNotEmpty(monitorIds)) {
-                    contrastHarmonicService.remove(new LambdaQueryWrapper<ContrastHarmonicResult>().in(ContrastHarmonicResult::getDevMonitorId, monitorIds)
-                            .eq(ContrastHarmonicResult::getNum, contrastHarmonicResultList.get(0).getNum())
-                            .eq(ContrastHarmonicResult::getDataType, contrastHarmonicResultList.get(0).getDataType())
-                            .eq(ObjectUtil.isNotNull(contrastHarmonicResultList.get(0).getWaveNum()), ContrastHarmonicResult::getWaveNum, contrastHarmonicResultList.get(0).getWaveNum())
-                            .isNull(ObjectUtil.isNull(contrastHarmonicResultList.get(0).getWaveNum()), ContrastHarmonicResult::getWaveNum));
-                }
+                ContrastHarmonicResult contrastHarmonicResult = contrastHarmonicResultList.get(0);
+                contrastHarmonicService.remove(new LambdaQueryWrapper<ContrastHarmonicResult>().eq(ContrastHarmonicResult::getDevMonitorId, contrastHarmonicResult.getDevMonitorId())
+                        .eq(ContrastHarmonicResult::getNum, contrastHarmonicResult.getNum())
+                        .eq(ContrastHarmonicResult::getAdType, contrastHarmonicResult.getAdType())
+                        .eq(ContrastHarmonicResult::getDataType, contrastHarmonicResult.getDataType())
+                        .eq(ObjectUtil.isNotNull(contrastHarmonicResult.getWaveNum()), ContrastHarmonicResult::getWaveNum, contrastHarmonicResult.getWaveNum())
+                        .isNull(ObjectUtil.isNull(contrastHarmonicResult.getWaveNum()), ContrastHarmonicResult::getWaveNum));
                 contrastHarmonicService.saveBatch(contrastHarmonicResultList);
             }
             DynamicTableNameHandler.remove();