Merge branch 'developer' of http://36.40.66.175:5000/moa/jxdj_zx/amos-boot-zx-biz into developer

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/TDBigScreenAnalyseController.java

@@ -867,7 +867,7 @@ public class TDBigScreenAnalyseController extends BaseController implements Appl
 
 	private Page<Map<String, Object>> subSystemPointInfo(String subSystem, String stationId, String equipmentName) {
 		StationBasic stationBasic = stationBasicMapper.selectById(stationId);
-		equipmentName = StrUtil.isNotEmpty(equipmentName) ? "%" + equipmentName + "风机%" : equipmentName;
+		equipmentName = StrUtil.isNotEmpty(equipmentName) && !equipmentName.equals("升压站") ? "%" + equipmentName + "风机%" : equipmentName;
 		List<Map<String, Object>> healthListInfo = idxBizFanHealthIndexMapper.getHealthInfoBySubSystem(subSystem,
 				stationBasic.getFanGatewayId(), equipmentName,stationBasic.getBoosterGatewayId());
 

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/tdengine2/FanHealthIndex.xml

@@ -189,10 +189,10 @@
     </where>
 
     <if test="dto.orderColumns != null and dto.orderColumns != ''">
-        order by ${dto.orderColumns}
+        order by ${dto.orderColumns},ts desc
     </if>
     <if test="(dto.orderColumns == null or dto.orderColumns == '') and dto.sortOne != null and dto.sortOne != ''">
-        order by ${dto.sortOne}
+        order by ${dto.sortOne},ts desc
     </if>
     limit #{dto.current}, #{dto.size}
 </select>

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/tdengine2/PvHealthIndex.xml

@@ -220,10 +220,10 @@
         </where>
 
         <if test="dto.orderColumns != null and dto.orderColumns != ''">
-            order by ${dto.orderColumns}
+            order by ${dto.orderColumns},ts desc
         </if>
         <if test="(dto.orderColumns == null or dto.orderColumns == '') and dto.sortOne != null and dto.sortOne != ''">
-            order by ${dto.sortOne}
+            order by ${dto.sortOne},ts desc
         </if>
         limit #{dto.current}, #{dto.size}
     </select>