From bedbebabc30f6f07253b337b23107236dd088d3a Mon Sep 17 00:00:00 2001
From: cdf <857448963@qq.com>
Date: Tue, 11 Apr 2023 16:05:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B0=90=E6=B3=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/device/pq/mapper/mapping/DeviceMapper.xml | 10 ++++++++--
 .../pq/service/impl/TerminalTreeServiceImpl.java       |  9 ++++++++-
 .../harmonic/service/impl/THDistortionServiceImpl.java |  7 ++++---
 3 files changed, 20 insertions(+), 6 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 043a32d6c..a37dc9b92 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
@@ -113,7 +113,11 @@
             OR dev.name LIKE #{searchValueLike}
             OR line.NAME LIKE #{searchValueLike}
         </if>
-        ORDER BY areaId.NAME
+        ORDER BY
+            gdName,
+            bdName,
+            devNAME,
+            objName;
     </select>
 
     <select id="getRunManageDevList" resultType="com.njcn.device.pq.pojo.vo.RunTimeVO">
@@ -184,7 +188,9 @@
             OR device.IP LIKE #{searchValueLike}
         </if>
         ORDER BY
-        areaId.NAME
+            gdName,
+            bdName,
+            devName;
     </select>
     <select id="getOnlineEvaluate" resultType="com.njcn.device.pq.pojo.vo.LineInfluxDbOnlineVO">
         SELECT
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java
index 4d1368f33..1e9733f3b 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java
@@ -167,7 +167,14 @@ public class TerminalTreeServiceImpl implements TerminalTreeService {
             groupLine = childrenData.stream().collect(Collectors.groupingBy(TerminalTree::getPid));
         }
         targetData = targetData.stream().peek(terminalTree -> {
-            terminalTree.setChildren(groupLine.get(terminalTree.getId()));
+            if(isLine){
+                //监测点的数量
+                int size = groupLine.get(terminalTree.getId()).size();
+                terminalTree.setName(terminalTree.getName()+"（"+size+"台装置）");
+                terminalTree.setChildren(groupLine.get(terminalTree.getId()));
+            }else{
+                terminalTree.setChildren(groupLine.get(terminalTree.getId()));
+            }
         }).collect(Collectors.toList());
     }
 
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/THDistortionServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/THDistortionServiceImpl.java
index 51866a459..06d13b8d5 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/THDistortionServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/THDistortionServiceImpl.java
@@ -135,9 +135,10 @@ public class THDistortionServiceImpl implements THDistortionService {
         /*监测点ID扁平化*/
         List<String> collect = deviceList.stream ( ).map (GeneralDeviceDTO::getLineIndexes).flatMap (Collection::stream).distinct ( ).collect (Collectors.toList ( ));
         QueryWrapper<RMpVThd> wrapper = new QueryWrapper<>();
-        wrapper.in ("measurement_point_id",collect).
-                between ("data_date", statisticsBizBaseParam.getStartTime (), statisticsBizBaseParam.getEndTime ()).
-                orderByDesc ("v_thd");
+        wrapper.in ("measurement_point_id",collect)
+                .between ("data_date", statisticsBizBaseParam.getStartTime (), statisticsBizBaseParam.getEndTime ())
+                .eq("data_type",1)
+                .orderByDesc ("v_thd");
         List<RMpVThd> rMpVThdList = rMpVThdMapper.selectList (wrapper);
         rMpVThdVOList = rMpVThdList.stream ( ).limit (topNum).map (rMpVThd -> {
             RMpVThdVO rMpVThdVO = new RMpVThdVO ( );