1.入库成功时清除lastLineMsg。2.看板只显示报警提示

src/main/java/com/neotel/smfcore/core/device/bean/StatusBean.java

@@ -4,6 +4,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.google.common.base.Strings;
 import com.neotel.smfcore.core.device.enums.BOX_STATUS;
 import com.neotel.smfcore.core.language.util.MessageUtils;
+import com.neotel.smfcore.core.message.enums.MessageType;
 import com.neotel.smfcore.core.storage.enums.DeviceType;
 import com.neotel.smfcore.core.system.service.po.AlarmInfo;
 import lombok.Data;
@@ -511,18 +512,56 @@ public class StatusBean {
         return doorReelSignal;
     }
 
-    public String getShowMsg(Locale locale){
+    public String getShowMsg(Locale locale) {
+        if(ObjectUtil.isEmpty(this.msg)){
+            return "";
+        }
+        //从收到数据中查找
+        String lan = locale.toLanguageTag();
+        if (lan.equals(MessageUtils.EN_US) && ObjectUtil.isNotEmpty(getMsgEn())) {
+            String resultMsg= getMsgEn().replace("A=","").replace("I=","").replace("W=","");
+            return resultMsg;
+        }
         //提示信息国际化
-        if(ObjectUtil.isEmpty(getMsgCode())||ObjectUtil.isEmpty(getMsgEn()) ){
-           return this.msg;
-        }else {
-            String code=this.msgCode;
-            if(!code.startsWith(MessageUtils.smfcore)){
-                code=MessageUtils.smfcore+"."+this.msgCode;
+        if (ObjectUtil.isEmpty(getMsgCode())) {
+            return this.msg.replace("A=","").replace("I=","").replace("W=","");
+        } else {
+            String code = this.msgCode;
+            if (!code.startsWith(MessageUtils.smfcore)) {
+                code = MessageUtils.smfcore + "." + this.msgCode;
             }
-            String newMsg = MessageUtils.getText(code, getMsgParam(), locale, getMsg());
+            String newMsg=this.msg.replace("A=","").replace("I=","").replace("W=","");
+            newMsg = MessageUtils.getText(code, getMsgParam(), locale, newMsg);
             return newMsg;
         }
     }
+    public String getErrorMsg(Locale locale) {
+        if(ObjectUtil.isEmpty(this.msg)){
+            return "";
+        }
+
+        //判断是否有换行
+        String[] msgArray=this.msg.split("\r\n");
+        if(msgArray.length>0) {
+            for (String msg :
+                    msgArray) {
+                String msgType = MessageType.ERROR.name();
+                if (msg.startsWith("A=")) {
+                    msgType = MessageType.ERROR.name();
+                    msg = msg.substring(2);
+                } else if (msg.startsWith("I=")) {
+                    msgType = MessageType.INFO.name();
+                    msg = msg.substring(2);
+                } else if (msg.startsWith("W=")) {
+                    msgType = MessageType.WARNING.name();
+                    msg = msg.substring(2);
+                }
+                if(msgType.equals(MessageType.ERROR.name())){
+                    return msg;
+                }
+            }
+        }
+        return "";
+    }
 
 }

src/main/java/com/neotel/smfcore/core/device/rest/DeviceController.java

@@ -290,6 +290,7 @@ public class DeviceController {
             DeviceMessageUtil.updateLineMsg(lineMsg,code,cids,"","",null );
         } else {
             lineMsg = okMsg;
+            DeviceMessageUtil.lastLineMsg = null;
         }
         return resultMap;
     }

src/main/java/com/neotel/smfcore/core/kanban/rest/BoxKanbanController.java

@@ -492,7 +492,7 @@ public class BoxKanbanController {
                     boxDto.setHumidity(humidity);
                     boxDto.setTemperature(temperature);
                     boxDto.setStatus(bean.getStatus());
-                    boxDto.setMsg(bean.getShowMsg(locale));
+                    boxDto.setMsg(bean.getErrorMsg(locale));
                     boxDto.setBarcode(bean.getCode());
                     boxDto.setPosName(bean.getPosId());
                     boxDto.setData(bean.getData());