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/controller/IdxBizFanHealthIndexController.java

@@ -644,7 +644,7 @@ public class IdxBizFanHealthIndexController extends BaseController {
 //				Date startDate = DateUtils.dateAddHours(DateUtils.longStr2Date(startTimeTop), -8);
 //				startTimeTop = formatter.format(startDate);
 //			}
-			List<FanHealthIndexMoment> fanHealthIndexMoments = fanHealthIndexMomentMapper.selectData(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,(current-1)*size,size, gatewayIds);
+			List<FanHealthIndexMoment> fanHealthIndexMoments = fanHealthIndexMomentMapper.selectData(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,(current-1)*size,size, orgCode);
 			fanHealthIndexMoments.forEach(item -> {
 				item.setHealthIndex(Double.parseDouble(df.format(item.getHealthIndex())));
 			});
@@ -816,7 +816,7 @@ public class IdxBizFanHealthIndexController extends BaseController {
 				Date startDate = DateUtils.dateAddHours(DateUtils.longStr2Date(startTimeTop), -8);
 				startTimeTop = formatter.format(startDate);
 
-			List<FanHealthIndexMoment> fanHealthIndexMoments = fanHealthIndexMomentMapper.selectData(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,null,null, gatewayIds);
+			List<FanHealthIndexMoment> fanHealthIndexMoments = fanHealthIndexMomentMapper.selectData(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,null,null, orgCode);
 			fanHealthIndexMoments=	fanHealthIndexMoments.stream().sorted(Comparator.comparing(FanHealthIndexMoment::getAnalysisTime)).collect(Collectors.toList());
 			for (FanHealthIndexMoment obj : fanHealthIndexMoments) {
 				if (type.equals("0")){

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

@@ -309,7 +309,7 @@ public class IdxBizPvHealthIndexController extends BaseController {
 			date = DateUtils.dateAddHours(date, -8);
 			SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 			startTimeTop = formatter.format(date);
-			List<PvHealthIndexMoment> fanHealthIndexMoments = pvHealthIndexMomentMapper.selectData(healthLevel, area, equipmentName, subarray, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,(current-1)*size,size, gatewayIds);
+			List<PvHealthIndexMoment> fanHealthIndexMoments = pvHealthIndexMomentMapper.selectData(healthLevel, area, equipmentName, subarray, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,(current-1)*size,size, orgCode);
 			fanHealthIndexMoments.forEach(item -> {
 				item.setHealthIndex(Double.parseDouble(df.format(item.getHealthIndex())));
 			});
@@ -317,7 +317,7 @@ public class IdxBizPvHealthIndexController extends BaseController {
 			page.setCurrent(current);
 			page.setSize(size);
 			page.setRecords(fanHealthIndexMoments);
-			int total = pvHealthIndexMomentMapper.selectDataTotal(healthLevel, area, equipmentName, subarray, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop, gatewayIds);
+			int total = pvHealthIndexMomentMapper.selectDataTotal(healthLevel, area, equipmentName, subarray, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop, orgCode);
 			page.setTotal(total);
 			return 	ResponseHelper.buildResponse(page);
 		}
@@ -384,7 +384,7 @@ public class IdxBizPvHealthIndexController extends BaseController {
 			date = DateUtils.dateAddHours(date, -8);
 			SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 			startTimeTop = formatter.format(date);
-			List<PvHealthIndexMoment> fanHealthIndexMoments = pvHealthIndexMomentMapper.selectData(station, analysisType, indexAddress, healthLevel, area, analysisObjType, subarray, pointName, startTimeTop, endTimeTop, equipmentName,(current-1)*size,size, gatewayIds);
+			List<PvHealthIndexMoment> fanHealthIndexMoments = pvHealthIndexMomentMapper.selectData(station, analysisType, indexAddress, healthLevel, area, analysisObjType, subarray, pointName, startTimeTop, endTimeTop, equipmentName,(current-1)*size,size, orgCode);
 			Map<String,Object> map = new HashMap<>();
 
 			map.put("value", Double.parseDouble(df.format(fanHealthIndexMoments.get(0).getHealthIndex())));
@@ -480,7 +480,7 @@ public class IdxBizPvHealthIndexController extends BaseController {
 			Date startDate = DateUtils.dateAddHours(DateUtils.longStr2Date(startTimeTop), -8);
 			startTimeTop = formatter.format(startDate);
 
-			List<PvHealthIndexMoment> fanHealthIndexMoments = pvHealthIndexMomentMapper.selectData(healthLevel, area, equipmentName, subarray, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,null,null, gatewayIds);
+			List<PvHealthIndexMoment> fanHealthIndexMoments = pvHealthIndexMomentMapper.selectData(healthLevel, area, equipmentName, subarray, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,null,null, orgCode);
 			fanHealthIndexMoments=	fanHealthIndexMoments.stream().sorted(Comparator.comparing(PvHealthIndexMoment::getAnalysisTime)).collect(Collectors.toList());
 			for (PvHealthIndexMoment obj : fanHealthIndexMoments) {
 				if (type.equals("0")){

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

@@ -10,7 +10,7 @@ import java.util.List;
 
 public interface FanHealthIndexMomentMapper extends BaseMapper<FanHealthIndexMoment> {
     @Select("<script>"+
-            "SELECT `health_index` AS healthIndex,`health_index` AS `value`, anomaly, analysis_time AS  analysisTime,point_name as pointName,  station,equipment_name AS equipmentName,  ( CASE HEALTH_LEVEL WHEN '危险' THEN 3 WHEN '警告' THEN 2 WHEN '注意' THEN 1 ELSE 0 END ) AS status FROM analysis_data.fan_health_index_moment WHERE analysis_obj_type = #{analysisObjType}" +
+            "SELECT `health_index` AS healthIndex,`health_index` AS `value`, rec_date AS recDate,anomaly, analysis_time AS  analysisTime,point_name as pointName,  station,equipment_name AS equipmentName,  ( CASE HEALTH_LEVEL WHEN '危险' THEN 3 WHEN '警告' THEN 2 WHEN '注意' THEN 1 ELSE 0 END ) AS status FROM analysis_data.fan_health_index_moment WHERE analysis_obj_type = #{analysisObjType}" +
             "<if test='endTimeTop!= null'>  and ts &lt;= #{endTimeTop} </if> " +
             "<if test='startTimeTop!= null'>  and  ts &gt;= #{startTimeTop} </if> " +
             "<if test='area!= null'> AND area = #{area} </if> " +
@@ -20,10 +20,11 @@ public interface FanHealthIndexMomentMapper extends BaseMapper<FanHealthIndexMom
             "<if test='healthLevel!= null'>AND health_level = #{healthLevel} </if>" +
             "<if test='subSystem!= null'>AND sub_system = #{subSystem} </if> " +
             "<if test='equipmentName!= null'>AND equipment_name = #{equipmentName} </if>" +
-            "<if test='gatewayIds != null and gatewayIds.size() > 0'><foreach collection='gatewayIds' item='gatewayId'>AND org_code like '%${gatewayId}%'</foreach></if>" +
+            //"<if test='gatewayIds != null and gatewayIds.size() > 0'><foreach collection='gatewayIds' item='gatewayId'>AND org_code like '%${gatewayId}%'</foreach></if>" +
+            "<if test='orgCode!= null'>AND org_code  like '${orgCode}' </if>" +
             "order by health_index "+
             "<if test='current != null and size != null'>limit ${current},${size} </if>" +
             "</script>")
-    List<FanHealthIndexMoment> selectData (@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, @Param("current")Integer current,@Param("size") Integer size,@Param("gatewayIds") List<String> gatewayIds);
+    List<FanHealthIndexMoment> selectData (@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, @Param("current")Integer current,@Param("size") Integer size,@Param("orgCode") String orgCode);
 
 }

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

@@ -21,12 +21,13 @@ public interface PvHealthIndexMomentMapper extends BaseMapper<PvHealthIndexMomen
             "<if test='healthLevel!= null '>AND health_level = #{healthLevel} </if>" +
             "<if test='subarray!= null'>AND subarray = #{subarray} </if> " +
             "<if test='equipmentName!= null'>AND equipment_name = #{equipmentName} </if>" +
-            "<if test='gatewayIds != null and gatewayIds.size() > 0'>AND GATEWAY_ID IN <foreach collection='gatewayIds' item='gatewayId' open='(' separator=',' close=')'>#{gatewayId}</foreach></if>" +
+            //"<if test='gatewayIds != null and gatewayIds.size() > 0'>AND GATEWAY_ID IN <foreach collection='gatewayIds' item='gatewayId' open='(' separator=',' close=')'>#{gatewayId}</foreach></if>" +
+            "<if test='orgCode!= null'>AND org_code  like '${orgCode}' </if>" +
             "order by health_index "+
             "<if test='current != null and size != null'>limit ${current},${size} </if>" +
             "</script>")
     List<PvHealthIndexMoment> selectData(@Param("healthLevel")String healthLevel, @Param("area")String area, @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("current")Integer current, @Param("size")Integer size,@Param("gatewayIds") List<String> gatewayIds);
+            , @Param("current")Integer current, @Param("size")Integer size,@Param("orgCode") String orgCode);
 
     @Select("<script>"+
             "SELECT count(1)" +
@@ -40,8 +41,9 @@ public interface PvHealthIndexMomentMapper extends BaseMapper<PvHealthIndexMomen
             "<if test='healthLevel!= null '>AND health_level = #{healthLevel} </if>" +
             "<if test='subarray!= null'>AND subarray = #{subarray} </if> " +
             "<if test='equipmentName!= null'>AND equipment_name = #{equipmentName} </if>" +
-            "<if test='gatewayIds != null and gatewayIds.size() > 0'>AND GATEWAY_ID IN <foreach collection='gatewayIds' item='gatewayId' open='(' separator=',' close=')'>#{gatewayId}</foreach></if>" +
-            "</script>")
-    int selectDataTotal(@Param("healthLevel")String healthLevel, @Param("area")String area, @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("gatewayIds") List<String> gatewayIds);
+            //"<if test='gatewayIds != null and gatewayIds.size() > 0'>AND GATEWAY_ID IN <foreach collection='gatewayIds' item='gatewayId' open='(' separator=',' close=')'>#{gatewayId}</foreach></if>" +
+            "<if test='orgCode!= null'>AND org_code  like '${orgCode}' </if>" +
+    		"</script>")
+    int selectDataTotal(@Param("healthLevel")String healthLevel, @Param("area")String area, @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("orgCode") String orgCode);
 
 }