Merge remote-tracking branch 'origin/developer' into developer

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdMapper2/FanHealthIndexDayMapper.java

@@ -80,7 +80,7 @@ public interface FanHealthIndexDayMapper extends BaseMapper<FanHealthIndexDay> {
             "<if test='subSystem!= null'>AND sub_system = #{subSystem} </if> " +
             "<if test='equipmentName!= null'>AND equipment_name = #{equipmentName} </if>" +
             "<if test='orgCode!= null'>AND org_code  like '${orgCode}' </if>" +
-            "order by health_index " +
+            "order by rec_date " +
             "<if test='current != null and size != null'>limit ${current},${size} </if>" +
             "</script>")
     List<FanHealthIndexDay> selectTrendData(@Param("healthLevel") String healthLevel, @Param("area") String area, @Param("equipmentName") String equipmentName, @Param("subSystem") String subSystem, @Param("analysisType") String analysisType, @Param("analysisObjType") String analysisObjType, @Param("station") String station, @Param("pointName") String pointName, @Param("indexAddress") String indexAddress, @Param("startTimeTop") String startTimeTop, @Param("endTimeTop") String endTimeTop,

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdMapper2/FanHealthIndexHourMapper.java

@@ -40,7 +40,7 @@ public interface FanHealthIndexHourMapper extends BaseMapper<FanHealthIndexHour>
             "<if test='subSystem!= null'>AND sub_system = #{subSystem} </if> " +
             "<if test='equipmentName!= null'>AND equipment_name = #{equipmentName} </if>" +
             "<if test='orgCode!= null'>AND org_code  like '${orgCode}' </if>" +
-            "order by health_index " +
+            "order by rec_date" +
             "<if test='current != null and size != null'>limit ${current},${size} </if>" +
             "</script>")
     List<FanHealthIndexHour> selectTrendData(@Param("healthLevel") String healthLevel, @Param("area") String area, @Param("equipmentName") String equipmentName, @Param("subSystem") String subSystem, @Param("analysisType") String analysisType, @Param("analysisObjType") String analysisObjType, @Param("station") String station, @Param("pointName") String pointName, @Param("indexAddress") String indexAddress, @Param("startTimeTop") String startTimeTop, @Param("endTimeTop") String endTimeTop,

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdMapper2/FanHealthIndexMomentMapper.java

@@ -39,7 +39,7 @@ public interface FanHealthIndexMomentMapper extends BaseMapper<FanHealthIndexMom
             "<if test='subSystem!= null'>AND sub_system = #{subSystem} </if> " +
             "<if test='equipmentName!= null'>AND equipment_name = #{equipmentName} </if>" +
             "<if test='orgCode!= null'>AND org_code  like '${orgCode}' </if>" +
-            "order by health_index " +
+            "order by rec_date " +
             "<if test='current != null and size != null'>limit ${current},${size} </if>" +
             "</script>")
     List<FanHealthIndexMoment> selectTrendData(@Param("healthLevel") String healthLevel, @Param("area") String area, @Param("equipmentName") String equipmentName, @Param("subSystem") String subSystem, @Param("analysisType") String analysisType, @Param("analysisObjType") String analysisObjType, @Param("station") String station, @Param("pointName") String pointName, @Param("indexAddress") String indexAddress, @Param("startTimeTop") String startTimeTop, @Param("endTimeTop") String endTimeTop,

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdMapper2/PvHealthIndexDayMapper.java

@@ -93,7 +93,7 @@ public interface PvHealthIndexDayMapper extends BaseMapper<PvHealthIndexDay> {
             "<if test='equipmentName!= null'>AND equipment_name = #{equipmentName} </if>" +
             "<if test='orgCode!= null'>AND org_code  like '${orgCode}' </if>" +
 //            "<if test='gatewayIds != null and gatewayIds.size() > 0'>AND GATEWAY_ID IN <foreach collection='gatewayIds' item='gatewayId' open='(' separator=',' close=')'>#{gatewayId}</foreach></if>" +
-            "order by health_index "+
+            "order by rec_date "+
             "<if test='current != null and size != null'>limit ${current},${size} </if>" +
             "</script>")
     List<PvHealthIndexDay> selectTrendData(@Param("station")String station,

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdMapper2/PvHealthIndexHourMapper.java

@@ -61,7 +61,7 @@ public interface PvHealthIndexHourMapper extends BaseMapper<PvHealthIndexHour> {
             "<if test='equipmentName!= null'>AND equipment_name = #{equipmentName} </if>" +
             "<if test='orgCode!= null'>AND org_code  like '${orgCode}' </if>" +
 //            "<if test='gatewayIds != null and gatewayIds.size() > 0'>AND GATEWAY_ID IN <foreach collection='gatewayIds' item='gatewayId' open='(' separator=',' close=')'>#{gatewayId}</foreach></if>" +
-            "order by health_index " +
+            "order by rec_date " +
             "<if test='current != null and size != null'>limit ${current},${size} </if>" +
             "</script>")
 

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdMapper2/PvHealthIndexMomentMapper.java

@@ -60,7 +60,7 @@ public interface PvHealthIndexMomentMapper extends BaseMapper<PvHealthIndexMomen
             "<if test='subarray!= null'>AND subarray = #{subarray} </if> " +
             "<if test='equipmentName!= null'>AND equipment_name = #{equipmentName} </if>" +
             "<if test='orgCode!= null'>AND org_code  like '${orgCode}' </if>" +
-            "order by health_index " +
+            "order by rec_date " +
             "<if test='current != null and size != null'>limit ${current},${size} </if>" +
             "</script>")
     List<PvHealthIndexMoment> selectTrendData(@Param("healthLevel") String healthLevel,