From a1caa85b16e9ed10d365e0d21baec550c9ff7d11 Mon Sep 17 00:00:00 2001
From: chendaofei <857448963@qq.com>
Date: Tue, 1 Jul 2025 10:21:17 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/device/pq/mapper/mapping/DeviceMapper.xml     | 4 ++--
 .../njcn/device/pq/service/impl/RunManageServiceImpl.java  | 1 -
 .../harmonic/service/impl/HistoryResultServiceImpl.java    | 7 +++----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml
index 4c3f0da34..4f20b63e5 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml
@@ -308,8 +308,8 @@
         INNER JOIN pq_line areaId ON areaId.Id = gd.Pid
         INNER JOIN sys_area area ON area.Id = areaId.NAME
         INNER JOIN pq_device device ON device.Id = dev.Id
-        INNER JOIN sys_dict_data manufacturerId ON manufacturerId.Id = device.Manufacturer
-        INNER JOIN sys_dict_data devT ON devT.Id = device.Dev_Type
+        left JOIN sys_dict_data manufacturerId ON manufacturerId.Id = device.Manufacturer
+        left JOIN sys_dict_data devT ON devT.Id = device.Dev_Type
         WHERE dev.Id in
         <foreach item="item" collection="list" open="(" separator="," close=")">
             #{item}
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java
index b509a5aba..3c1fea45d 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java
@@ -147,7 +147,6 @@ public class RunManageServiceImpl implements RunManageService {
         if(CollUtil.isEmpty(devIndexes)){
             return new Page<>();
         }
-        //List<String> manuList = runManageParam.getManufacturer().stream().map(SimpleDTO::getId).collect(Collectors.toList());
         return deviceMapper.getDeviceLedger(new Page<>(PageFactory.getPageNum(runManageParam), PageFactory.getPageSize(runManageParam)), devIndexes, new ArrayList<>(), new ArrayList<>(), new ArrayList<>(), runManageParam.getSearchValue());
     }
 
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java
index 76b91552e..01c286eed 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HistoryResultServiceImpl.java
@@ -540,21 +540,20 @@ public class HistoryResultServiceImpl implements HistoryResultService {
                 case 44:
                     //谐波电压相角
                     if (number == 1) {
+                        targetName = "基波电压相角";
+
                         sql = "SELECT time as time, v_1 as aValue ," + InfluxDBTableConstant.PHASIC_TYPE + " FROM data_harmphasic_v WHERE " + stringBuilder +
                                 " and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') order by time asc tz('Asia/Shanghai');";
                     } else {
+                        targetName = "谐波电压相角";
                         sql = "SELECT time as time, v_" + number + " as aValue ," + InfluxDBTableConstant.PHASIC_TYPE + " FROM data_harmphasic_v WHERE " + stringBuilder +
                                 " and (phasic_type ='A' or phasic_type ='B' or phasic_type ='C') order by time asc tz('Asia/Shanghai');";
                     }
                     if (ptType == 0) {
-                        targetName = "基波电压相角";
-
                         phasicType.add("A相");
                         phasicType.add("B相");
                         phasicType.add("C相");
                     } else {
-                        targetName = "谐波电压相角";
-
                         phasicType.add("AB相");
                         phasicType.add("BC相");
                         phasicType.add("CA相");