msgList修改

src/main/java/com/neotel/smfcore/core/equipment/bean/EquipStatusBean.java

@@ -4,6 +4,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.google.common.base.Strings;
 import com.neotel.smfcore.core.equipment.enums.EquipmentType;
 import com.neotel.smfcore.core.message.enums.MessageType;
+import com.neotel.smfcore.custom.micron1551.bean.dto.EquipMsgDto;
 import lombok.Data;
 import lombok.ToString;
 
@@ -165,6 +166,19 @@ public class EquipStatusBean implements Serializable {
         }
         return "";
     }
+
+    public List<EquipMsgDto> getMsgDtoList(Locale locale) {
+        List<EquipMsgDto> equipMsgDtos=new ArrayList<>();
+        for (EquipMsg msg :
+                getMsgList()) {
+            EquipMsgDto dtoMsg=new EquipMsgDto();
+            dtoMsg.setMsg(msg.getShowMsg(locale));
+            dtoMsg.setType(msg.getType());
+            dtoMsg.setUTime(new Date(getTime()));
+            equipMsgDtos.add(dtoMsg);
+        }
+        return equipMsgDtos;
+    }
 //    public String getShowMsg(Locale locale){
 //        MessageType[] types=new MessageType[]{MessageType.ERROR,MessageType.WARNING,MessageType.INFO,MessageType.SHOW   };
 //        for (MessageType type :

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

@@ -310,6 +310,7 @@ public class EquipViewController {
                 if(mesInfo!=null){
                     dto.setMesInfo(mesInfo);
                 }
+                dto.getData().put("MsgList", bean.getMsgDtoList(servletRequest.getLocale()));
 
             }
         }

src/main/java/com/neotel/smfcore/custom/micron1551/bean/dto/EquipMsgDto.java

+package com.neotel.smfcore.custom.micron1551.bean.dto;
+
+import cn.hutool.core.date.DateTime;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class EquipMsgDto implements Serializable {
+
+    /**
+     * 消息类型，为：INFO，WARNING，ERROR，DATA
+     */
+    private String type;
+    /**
+     * 消息内容
+     */
+    private String msg;
+
+    /**
+     *
+     */
+    private Date uTime;
+}

src/main/java/com/neotel/smfcore/custom/micron1551/controller/ML5ODeviceController.java

@@ -3,14 +3,17 @@ package com.neotel.smfcore.custom.micron1551.controller;
 import cn.hutool.core.util.ObjectUtil;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.utils.QueryHelp;
+import com.neotel.smfcore.core.equipment.bean.EquipMsg;
 import com.neotel.smfcore.core.equipment.bean.EquipStatusBean;
 import com.neotel.smfcore.core.equipment.enums.EquipmentType;
+import com.neotel.smfcore.core.equipment.rest.dto.EquipmentDto;
 import com.neotel.smfcore.core.equipment.service.po.Equipment;
 import com.neotel.smfcore.core.equipment.util.EquipmentCache;
 import com.neotel.smfcore.core.system.service.po.DataLog;
 import com.neotel.smfcore.core.system.util.EquipStatusUtil;
 import com.neotel.smfcore.core.system.util.TaskService;
 import com.neotel.smfcore.custom.micron1053.api.MicronApi;
+import com.neotel.smfcore.custom.micron1551.bean.dto.EquipMsgDto;
 import com.neotel.smfcore.custom.micron1551.bean.dto.InOutReelDto;
 import com.neotel.smfcore.custom.micron1551.bean.dto.ML5OViewDto;
 import com.neotel.smfcore.custom.micron1551.util.Micron1551DataCache;
@@ -25,6 +28,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -72,6 +76,7 @@ private TaskService taskService;
                 dto.setMsg(bean.getShowMsg(servletRequest.getLocale()));
                 dto.setData(bean.getData());
                 dto.setShowLogs(bean.getShowLogs());
+                dto.getData().put("MsgList", bean.getMsgDtoList(servletRequest.getLocale()));
             }
         }
 

src/main/java/com/neotel/smfcore/custom/micron1551/controller/ML5SDeviceController.java

@@ -69,6 +69,7 @@ public class ML5SDeviceController {
                 dto.setMsg(bean.getShowMsg(servletRequest.getLocale()));
                 dto.setData(bean.getData());
                 dto.setShowLogs(bean.getShowLogs());
+                dto.getData().put("MsgList", bean.getMsgDtoList(servletRequest.getLocale()));
             }
         }
         dto.getData().put(Micron1551DataCache.NgType_ML5S1,micron1551DataCache.getNgDetials(Micron1551DataCache.NgType_ML5S1));

修改记录.txt

+1053条码规则
+
+
+
+
 
 20251024 从1053新拉分支SO1584,主要增加X800对接及历史记录查询功能。