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/PvHealthIndexHourMapper.java

@@ -64,18 +64,21 @@ public interface PvHealthIndexHourMapper extends BaseMapper<PvHealthIndexHour> {
             "order by health_index " +
             "<if test='current != null and size != null'>limit ${current},${size} </if>" +
             "</script>")
-    List<PvHealthIndexHour> selectTrendData(@Param("station") String station,
-                                           @Param("analysisType") String analysisType,
-                                           @Param("indexAddress") String indexAddress,
-                                           @Param("healthLevel") String healthLevel,
+
+    List<PvHealthIndexHour> selectTrendData(@Param("healthLevel") String healthLevel,
                                             @Param("area") String area,
-                                           @Param("analysisObjType") String analysisObjType,
+                                            @Param("equipmentName") String equipmentName,
                                             @Param("subarray") String subarray,
+                                            @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,
-                                           @Param("equipmentName") String equipmentName
-            , @Param("current") Integer current, @Param("size") Integer size, @Param("orgCode") String orgCode);
+                                            @Param("current") Integer current,
+                                            @Param("size") Integer size,
+                                            @Param("orgCode") String orgCode);
 
 
     @Select("<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,22 +60,23 @@ 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>" +
-//            "<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 " +
             "<if test='current != null and size != null'>limit ${current},${size} </if>" +
             "</script>")
-    List<PvHealthIndexMoment> selectTrendData(@Param("station") String station,
-                                           @Param("analysisType") String analysisType,
-                                           @Param("indexAddress") String indexAddress,
-                                           @Param("healthLevel") String healthLevel,
+    List<PvHealthIndexMoment> selectTrendData(@Param("healthLevel") String healthLevel,
                                               @Param("area") String area,
-                                           @Param("analysisObjType") String analysisObjType,
+                                              @Param("equipmentName") String equipmentName,
                                               @Param("subarray") String subarray,
+                                              @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,
-                                           @Param("equipmentName") String equipmentName
-            , @Param("current") Integer current, @Param("size") Integer size, @Param("orgCode") String orgCode);
+                                              @Param("current") Integer current,
+                                              @Param("size") Integer size,
+                                              @Param("orgCode") String orgCode);
 
     @Select("<script>"+
             "SELECT distinct d.`health_index` AS healthIndex,d.rec_date as recDate, d.`health_index` AS `value`, d.anomaly, substr(d.analysis_time,1,10) as analysisTime,d.station,d.equipment_name AS equipmentName, d.point_name as pointName, d.index_address as indexAddress, ( CASE d.HEALTH_LEVEL WHEN '危险' THEN 3 WHEN '警告' THEN 2 WHEN '注意' THEN 1 ELSE 0 END ) AS status" +