修改状态优先级

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

@@ -408,26 +408,32 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 			if(Boolean.TRUE.toString().equalsIgnoreCase(elecStatus)&&"8.0".equals(fanStatus)&&power>0&&!isWarn) 
 			{
 				equipMap.put(entry.getKey(), "正常运行");
-			}else if(Boolean.TRUE.toString().equalsIgnoreCase(warnStatus)) 
-			{
-				equipMap.put(entry.getKey(), "报警运行");
 			}
 			else if("9.0".equals(fault22)) 
 			{
 				equipMap.put(entry.getKey(), "限功率");
-			}else if(Boolean.TRUE.toString().equalsIgnoreCase(standbyStatus)&&"3.0".equals(fanStatus)) 
+			}
+			else if(Boolean.TRUE.toString().equalsIgnoreCase(warnStatus)) 
+			{
+				equipMap.put(entry.getKey(), "报警运行");
+			}
+			else if(Boolean.TRUE.toString().equalsIgnoreCase(standbyStatus)&&"3.0".equals(fanStatus)) 
 			{
 				equipMap.put(entry.getKey(), "待机状态");
-			}else if(Boolean.TRUE.toString().equalsIgnoreCase(stopStatus)&&"1.0".equals(fanStatus)) 
+			}
+			else if(Boolean.TRUE.toString().equalsIgnoreCase(stopStatus)&&"1.0".equals(fanStatus)) 
 			{
 				equipMap.put(entry.getKey(), "停机状态");
-			}else if(Boolean.TRUE.toString().equalsIgnoreCase(stopStatus)&&Boolean.TRUE.toString().equalsIgnoreCase(faultStatus)) 
+			}
+			else if(Boolean.TRUE.toString().equalsIgnoreCase(stopStatus)&&Boolean.TRUE.toString().equalsIgnoreCase(faultStatus)) 
 			{
 				equipMap.put(entry.getKey(), "故障状态");
-			}else if(Boolean.TRUE.toString().equalsIgnoreCase(mainStatus)&&"2.0".equals(fanStatus)) 
+			}
+			else if(Boolean.TRUE.toString().equalsIgnoreCase(mainStatus)&&"2.0".equals(fanStatus)) 
 			{
 				equipMap.put(entry.getKey(), "维护状态");
-			}else if(fdjSpeed>0&&min!=null&&min>=10) 
+			}
+			else if(fdjSpeed>0&&min!=null&&min>=10) 
 			{
 				equipMap.put(entry.getKey(), "通讯中断");
 			}