读设备数据 写日志 增加

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/equiplog/MesWorkCellScanMonitorLogExtService.java

@@ -105,9 +105,9 @@ public class MesWorkCellScanMonitorLogExtService implements ISwsWriteDbLogServic
 
         synchronized ((resultBean.getClientInfo() + this.getClass().getSimpleName()).intern()) {
 
-            if (cellMsg2RepeatMap.get(resultBean.getClientInfo()).contains(resultBean.getMessage())) return true;
+            if (cellMsg2RepeatMap.get(resultBean.getClientInfo()).contains(removeDatetime(resultBean.getMessage()))) return true;
 
-            cellMsg2RepeatMap.get(resultBean.getClientInfo()).add(resultBean.getMessage());
+            cellMsg2RepeatMap.get(resultBean.getClientInfo()).add(removeDatetime(resultBean.getMessage()));
 
             return false;
 
@@ -129,6 +129,14 @@ public class MesWorkCellScanMonitorLogExtService implements ISwsWriteDbLogServic
 
     }
 
+    private String removeDatetime(String message) {
+        if (StringUtils.isEmpty(message)) return message;
+        message = message.replaceAll("[0-9]{4}[-][0-9]{2}[-][0-9]{2}", MesPcnExtConstWords.DATE_FORMAT_SEPARATOR);
+        message = message.replaceAll("[0-9]{2}[:][0-9]{2}[:][0-9]{2}", MesPcnExtConstWords.TIME_FORMAT);
+        message = message.replaceAll("[HH:mm:ss.][0-9]{3}", MesPcnExtConstWords.SSS);
+        return message;
+    }
+
     @Override
     public void doRestoreDbLog(StationResultBean resultBean) {
 

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesEquipVariableCollectContext.java

@@ -87,6 +87,9 @@ public class MesEquipVariableCollectContext implements Serializable {
     @ApiParam("设备质量")
     private Integer quality;
 
+    @ApiParam("写入时间")
+    private String writeDatetime;
+
     @ApiParam("信息来源")
     private Integer messageSource;
 
@@ -110,6 +113,7 @@ public class MesEquipVariableCollectContext implements Serializable {
     public void copyValue(MesEquipmentLog equipmentLog) {
         if (null == equipmentLog) return;
         BeanUtils.copyProperties(equipmentLog, this, MesPcnExtConstWords.CATEGORY_LEVEL_TWO);
+        this.writeDatetime = equipmentLog.getModifyDatetime();
         this.messageSource = MesExtEnumUtil.CELL_MESSAGE_SOURCE.READ.getValue();
     }
 

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java

@@ -182,6 +182,8 @@ public class MesPcnExtConstWords {
     public static final String DATE_FORMAT_SSS = "yyyy-MM-dd HH:mm:ss.SSS";
     public static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
     public static final String DATE_FORMAT_SEPARATOR = "yyyy-MM-dd";
+    public static final String TIME_FORMAT = "HH:mm:ss";
+    public static final String SSS = ".SSS";
     public static final String DATE_FORMAT_SHORT = "yyMMdd";
     public static final String DATE_FORMAT_yyyyMMdd = "yyyyMMdd";
     public static final String DATE_FORMAT_POINT = "yyyy.MM.dd";