bug修改

src/main/java/com/neotel/smfcore/core/dashboard/box/SmdBoxController.java

@@ -105,7 +105,7 @@ public class SmdBoxController {
                         dto.setHumidity(boxStatusBean.getHumidity());
                         dto.setHumidity(boxStatusBean.getHumidity());
                         dto.setTemperature(boxStatusBean.getTemperature());
                         dto.setTemperature(boxStatusBean.getTemperature());
                         dto.setStatus(boxStatusBean.getStatus());
                         dto.setStatus(boxStatusBean.getStatus());
-                        dto.setMsg(statusBean.getShowMsg(servletRequest.getLocale()));
+                        dto.setMsg(statusBean.getErrorMsg(servletRequest.getLocale()));
                         dto.setData(statusBean.getData());
                         dto.setData(statusBean.getData());
                     }
                     }
                 }
                 }
@@ -151,7 +151,7 @@ public class SmdBoxController {
             dto.setMinTemperature(msdSettiings.getMinTemperature());
             dto.setMinTemperature(msdSettiings.getMinTemperature());
             dto.setMaxTemperature(msdSettiings.getMaxTemperature());
             dto.setMaxTemperature(msdSettiings.getMaxTemperature());
             dto.setUsageMap(storage.getUsageMap());
             dto.setUsageMap(storage.getUsageMap());
-            MesInfoDto mesInfoDto=DevicesStatusUtil.getLastAgvInfo(cid);
+            MesInfoDto mesInfoDto=DevicesStatusUtil.getLastAgvInfo(theCid);
             if(mesInfoDto!=null){
             if(mesInfoDto!=null){
                 dto.getData().put("AGV", JsonUtil.toJsonStr(mesInfoDto));
                 dto.getData().put("AGV", JsonUtil.toJsonStr(mesInfoDto));
             }
             }

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

@@ -47,4 +47,8 @@ public class MsgInfo implements Serializable {
      *报警错误码
      *报警错误码
      */
      */
     private String alarmCode="";
     private String alarmCode="";
+    /**
+     * 模块
+     */
+    private String moudle="";
 }
 }

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

@@ -757,7 +757,7 @@ public class StatusBean {
                     }
                     }
 
 
                     if (msgArray.length == 1) {
                     if (msgArray.length == 1) {
-                        mergeMsgList.add(new MsgInfo(msg, msgType, msgEn, msgJp, msgCode, msgParam, "", ""));
+                        mergeMsgList.add(new MsgInfo(msg, msgType, msgEn, msgJp, msgCode, msgParam, "", "",""));
                     } else {
                     } else {
                         mergeMsgList.add(new MsgInfo(msg, msgType));
                         mergeMsgList.add(new MsgInfo(msg, msgType));
                     }
                     }

src/main/java/com/neotel/smfcore/core/device/util/DataCache.java

@@ -504,7 +504,7 @@ public class DataCache {
     public  List<Map<String,StoragePos>> getAllUsedPosMap() {
     public  List<Map<String,StoragePos>> getAllUsedPosMap() {
         List<Map<String,StoragePos>> posList = new ArrayList<>();
         List<Map<String,StoragePos>> posList = new ArrayList<>();
 
 
-        Set<String> keys = allStorage.keySet();
+        List<String> keys =new ArrayList<>(allStorage.keySet()) ;
         Set<String> mapKeys = usedPosMap.keySet();
         Set<String> mapKeys = usedPosMap.keySet();
         for (String m:
         for (String m:
                 mapKeys) {
                 mapKeys) {

src/main/java/com/neotel/smfcore/core/message/service/po/Message.java

@@ -45,7 +45,7 @@ public class Message extends BasePo implements Serializable {
                 &&module.equals(msg.getModule())
                 &&module.equals(msg.getModule())
                 &&type.equals(msg.getType())
                 &&type.equals(msg.getType())
                 &&getMsg().equals(msg.getMsg())
                 &&getMsg().equals(msg.getMsg())
-                &&msgCode.equals(msg.getMsgCode())
+                &&(ObjectUtil.isEmpty(msgCode)|| msgCode.equals(msg.getMsgCode()))
         ){
         ){
             return true;
             return true;
         }
         }
@@ -72,7 +72,7 @@ public class Message extends BasePo implements Serializable {
     /**
     /**
      * 消息字符串Code
      * 消息字符串Code
      */
      */
-    private String msgCode;
+    private String msgCode="";
     /**
     /**
      * 消息内容
      * 消息内容
      */
      */

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

@@ -195,7 +195,7 @@ public class DevicesStatusUtil {
                     }
                     }
                 }
                 }
                 if (newMsg) {
                 if (newMsg) {
-                    DeviceMessageUtil.addDeviceMessage(cid, MessageType.ERROR.name(), "", msg.getMsgKey(), msg.getMsg(), msg.getMsgParam(),msg.getAlarmType(),msg.getAlarmCode());
+                    DeviceMessageUtil.addDeviceMessage(cid, MessageType.ERROR.name(), msg.getMoudle(), msg.getMsgKey(), msg.getMsg(), msg.getMsgParam(),msg.getAlarmType(),msg.getAlarmCode());
                 }
                 }
             }
             }