看板报警文字使用客户端发过来的文字

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

@@ -33,7 +33,17 @@ public class BoxStatusBean {
     /// 入库失败原因：
     /// 出库失败原因：
     /// </summary>
-    public String msg;
+    public String msg = "";
+    /**
+     * 英文提示消息
+     */
+    public String msgEn = "";
+
+    public String msgJp="";
+
+    public String msgCode="";
+
+    public String[] msgParam ;
     /// <summary>
     /// 温度
     /// </summary>

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

@@ -76,6 +76,8 @@ public class StatusBean {
      */
     public String msgEn = "";
 
+    public String msgJp="";
+
     public String msgCode="";
 
     public String[] msgParam ;
@@ -515,14 +517,22 @@ public class StatusBean {
         return doorReelSignal;
     }
 
-    public String getShowMsg(Locale locale){
+    public String getShowMsg(Locale locale) {
+        //从收到数据中查找
+        String lan = locale.toLanguageTag();
+        if (lan.equals(MessageUtils.JA_JP) && ObjectUtil.isNotEmpty(getMsgJp())) {
+            return getMsgJp();
+        } else if (lan.equals(MessageUtils.EN_US) && ObjectUtil.isNotEmpty(getMsgEn())) {
+            return getMsgEn();
+        }
         //提示信息国际化
-        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()) || ObjectUtil.isEmpty(getMsgEn())) {
+
+            return this.msg;
+        } else {
+            String code = this.msgCode;
+            if (!code.startsWith(MessageUtils.smfcore)) {
+                code = MessageUtils.smfcore + "." + this.msgCode;
             }
             String newMsg = MessageUtils.getText(code, getMsgParam(), locale, getMsg());
             return newMsg;

src/main/java/com/neotel/smfcore/core/device/handler/impl/BaseDeviceHandler.java

@@ -745,19 +745,20 @@ public class BaseDeviceHandler implements IDeviceHandler {
             StatusBean bean = DevicesStatusUtil.getStatusBean(statusBean.getCid());
             if (bean == null || bean.getBoxStatus() == null) {
                 DeviceMessageUtil.addOnlineMessage(statusBean.getCid(), "",statusBean.getClientIp());
-                DevicesStatusUtil.updateClientMsg(statusBean.getCid(), "", "", "", null);
+                DevicesStatusUtil.updateClientMsg(statusBean.getCid(), "", "", "","", null);
             } else if (bean.timeOut() && (bean.getOfflineTime() > -1)) {
                 DeviceMessageUtil.addOnlineMessage(statusBean.getCid(), "",statusBean.getClientIp());
-                DevicesStatusUtil.updateClientMsg(statusBean.getCid(), "", "", "", null);
+                DevicesStatusUtil.updateClientMsg(statusBean.getCid(), "", "", "","", null);
             }
 
             //展示到界面
             String msg = statusBean.getMsg();
             String msgEn = statusBean.getMsgEn();
             String msgCode = statusBean.getMsgCode();
+            String msgJp=statusBean.getMsgJp();
 
             if(ObjectUtil.isNotEmpty(msg)||ObjectUtil.isNotEmpty(msgCode)) {
-                DevicesStatusUtil.updateClientMsg(statusBean.getCid(), msgCode, msg, msgEn, statusBean.getMsgParam());
+                DevicesStatusUtil.updateClientMsg(statusBean.getCid(), msgCode, msg, msgEn, msgJp,statusBean.getMsgParam());
             }
         } catch (Exception e) {
             log.error("客户端故障消息处理出错", e);

src/main/java/com/neotel/smfcore/core/system/util/DevicesStatusUtil.java

@@ -43,6 +43,7 @@ public class DevicesStatusUtil {
                 statusBean.setMsgEn(msgBean.getMsgEn());
                 statusBean.setMsgCode(msgBean.getMsgCode());
                 statusBean.setMsgParam(msgBean.getMsgParam());
+                statusBean.setMsgJp(msgBean.getMsgJp());
             }
         }
         return statusBean;
@@ -58,10 +59,11 @@ public class DevicesStatusUtil {
     /**
      * 更新客户端发上来的消息(设备故障等消息)
      */
-    public static StatusBean updateClientMsg(String cid,String msgCode, String clientMsg, String clientMsgEn,String[] msgParam) {
+    public static StatusBean updateClientMsg(String cid,String msgCode, String clientMsg, String clientMsgEn,String clientMsgJp,String[] msgParam) {
         if (clientMsg == null) {
             clientMsg = "";
             clientMsgEn = "";
+            clientMsgJp="";
         }
         if(msgCode==null){
             msgCode="";
@@ -93,6 +95,7 @@ public class DevicesStatusUtil {
         statusBean.setMsgEn(clientMsgEn);
         statusBean.setMsgCode(msgCode);
         statusBean.setMsgParam(msgParam);
+        statusBean.setMsgJp(clientMsgJp);
         clientMsgs.put(cid, statusBean);
         return statusBean;
     }