Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java

@@ -336,6 +336,10 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 
 	public List<ESEquipmentsDTO> getFanStatusList(String stationId) {
 		StationBasic stationBasic = getOneByStationNumber(stationId);
+		if(stationBasic.getStationName().contains("GFDZ")) 
+		{
+			return new ArrayList<ESEquipmentsDTO>();
+		}
 		Map<String, List<String>> queryCondtion = new HashMap<>();
 		queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName,
 				Arrays.asList("风机状态", "有功功率", "发电状态", "报警状态", "停机状态", "故障状态", "待机状态", "维护状态", "发电机转速", "正常发电状态"));
@@ -401,7 +405,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 				equipMap.put(entry.getKey(), "正常运行");
 			}else if(Boolean.TRUE.toString().equalsIgnoreCase(warnStatus)) 
 			{
-				equipMap.put(entry.getKey(), "报警状态");
+				equipMap.put(entry.getKey(), "报警运行");
 			}
 			else if("9.0".equals(fault22)) 
 			{
@@ -426,7 +430,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 
 		HashMap<String, String> colorMap = new HashMap<>();
 		colorMap.put("正常运行", "#00aa00");
-		colorMap.put("报警状态", "#ffc400");
+		colorMap.put("报警运行", "#ffc400");
 		colorMap.put("停机状态", "#a3f5aa");
 		colorMap.put("故障状态", "#ff0000");
 		colorMap.put("限功率", "#0055ff");
@@ -633,7 +637,8 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
             activePowerList = indicatorDataMapper.selectDataByequipmentIndexNameAndtime(CommonConstans.taiheActivePowerPoint, stationBasic.getBoosterGatewayId());
             otherList = indicatorDataMapper.selectDataByequipmentIndexNameAndtime(CommonConstans.taiheIrradiationPonit, stationBasic.getBoosterGatewayId());
         }
-        for (int i = 0; i < activePowerList.size(); i++) {
+        Integer size = activePowerList.size() > otherList.size() ? otherList.size() : activePowerList.size();
+        for (int i = 0; i < size; i++) {
             IndicatorData indicatorData = activePowerList.get(i);
             time.add(DateUtil.format(indicatorData.getCreatedTime(), "HH:mm"));
             if ("FDZ".equals(stationBasic.getStationType())) {