1.稳态区域报告功能微调

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/enums/LineBaseEnum.java

@@ -42,6 +42,13 @@ public enum LineBaseEnum {
     POWER_FLAG_NOT(1,"非电网侧"),
 
 
+    /**
+     * 装置系统类型
+     */
+    DEV_DATA_TYPE_ZT(0,"暂态系统装置"),
+    DEV_DATA_TYPE_WT(1,"稳态系统装置"),
+    DEV_DATA_TYPE_ALL(2,"全部系统装置")
+
 
     ;
 

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommTerminalServiceImpl.java

@@ -29,6 +29,8 @@ import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static com.njcn.device.pq.enums.LineBaseEnum.DEV_DATA_TYPE_ALL;
+
 /**
  * pqs
  *
@@ -120,7 +122,7 @@ public class CommTerminalServiceImpl implements CommTerminalService {
     @Override
     public List<MonitorCommLedgerInfoDTO> deptGetLineInfo(DeptGetLineParam deptGetLineParam) {
         List<String> deptIds = deptFeignClient.getDepSonIdtByDeptId(deptGetLineParam.getDeptId()).getData();
-        List<MonitorCommLedgerInfoDTO> ledgerList = deptLineMapper.getMonitorByDeptIds(Stream.of(2).collect(Collectors.toList()),deptIds);
+        List<MonitorCommLedgerInfoDTO> ledgerList = deptLineMapper.getMonitorByDeptIds(Stream.of(DEV_DATA_TYPE_ALL.getCode()).collect(Collectors.toList()),deptIds);
         return ledgerList;
     }
 

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/DeptLineMapper.xml

@@ -109,6 +109,7 @@
         <foreach collection="deptIds" item="item" open="(" close=")" separator=",">
             #{item}
         </foreach>
+        order by point.name asc
     </select>