bug修改

src/main/java/com/neotel/smfcore/core/equipment/rest/EquipViewController.java

@@ -6,6 +6,7 @@ import com.neotel.smfcore.core.equipment.bean.EquipStatusBean;
 import com.neotel.smfcore.core.equipment.bean.EquipStatusDto;
 import com.neotel.smfcore.core.equipment.service.po.Equipment; ;
 import com.neotel.smfcore.core.message.enums.MessageType;
+import com.neotel.smfcore.core.message.service.po.Message;
 import com.neotel.smfcore.core.system.util.EquipStatusUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -51,13 +52,21 @@ public class EquipViewController {
                     dto.setOnLine(false);
                 }else{
                     dto.setOnLine(true);
-                    if(bean.getMsgList()!=null){
-                        for (EquipMsg msg : bean.getMsgList()){
-                            if(msg.getType().equals(MessageType.ERROR.name())){
-                                dto.setMsg(msg.getShowMsg(locale));
-                            }
-                        }
+                    dto.setStatus(bean.getStatus());
+                    EquipMsg showMsg=  bean.getMsgByType(MessageType.ERROR.name());
+                    if(showMsg==null){
+                        showMsg=bean.getMsgByType(MessageType.WARNING.name());
                     }
+                    if(showMsg!=null){
+                        dto.setMsg(showMsg.getShowMsg(locale));
+                    }
+//                    if(bean.getMsgList()!=null){
+//                        for (EquipMsg msg : bean.getMsgList()){
+//                            if(msg.getType().equals(MessageType.ERROR.name())){
+//                                dto.setMsg(msg.getShowMsg(locale));
+//                            }
+//                        }
+//                    }
                 }
             }
             resultList.add(dto);