修改谐波bug

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

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());
     }