bug调整

pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/PollutionLineDTO.java

@@ -40,6 +40,9 @@ public class PollutionLineDTO {
     @ApiModelProperty("变电站id")
     private String substationId;
 
+    @ApiModelProperty("变电站排序")
+    private Integer substationSort;
+
     @ApiModelProperty("母线")
     private String busBar;
 

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml

@@ -676,6 +676,7 @@
         A1.Name busBar,
         A3.Name substation,
         A3.Id substationId,
+        A3.sort substationSort,
         A4.Name powerCompany
         FROM
         pq_line A,

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalOnlineRateDataMapper.xml

@@ -124,6 +124,7 @@
         <foreach collection="subIndex" item="item" open="(" close=")" separator=",">
             #{item}
         </foreach>
+        order by sub.Sort asc
     </select>
 
     <!--根据监测点索引集合获取监测点详细参数-->