漏信号 bug

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/daoimpl/MesEquipmentLogDao.java

@@ -49,7 +49,7 @@ public class MesEquipmentLogDao implements IMesEquipmentLogDao {
 
         if (CollectionUtils.isEmpty(list)) return null;
 
-        List<Long> equipVariableIdList = equipmentVariableList.stream().filter(o -> null != o).map(MesEquipmentVariable::getId).collect(Collectors.toList());
+        List<String> equipVariableIdList = equipmentVariableList.stream().filter(o -> null != o).map(o -> o.getId().toString()).collect(Collectors.toList());
 
         List<MesEquipVariableCollectContext> equipVariableCollectContextList = generateEquipVariableCollectContextList(equipmentVariableList);
 
@@ -59,9 +59,9 @@ public class MesEquipmentLogDao implements IMesEquipmentLogDao {
 
             Object[] equipmentLogArr = (Object[]) equipmentLog;
 
-            if (null == equipmentLogArr || equipmentLogArr.length != 6 || equipVariableIdList.contains(equipmentLogArr[0])) continue;
+            if (null == equipmentLogArr || equipmentLogArr.length != 6 || StringUtils.isEmpty(equipmentLogArr[0]) || !equipVariableIdList.contains(equipmentLogArr[0].toString())) continue;
 
-            equipVariableCollectContextList.stream().filter(o -> (null != o && o.getEquipVariableId().compareTo((Long) equipmentLogArr[0]) == 0)).findFirst().get().copyValue(equipmentLogArr[1], equipmentLogArr[2], equipmentLogArr[3], equipmentLogArr[4], equipmentLogArr[5]);
+            equipVariableCollectContextList.stream().filter(o -> (null != o && o.getEquipVariableId().toString().equals(equipmentLogArr[0].toString()))).findFirst().get().copyValue(equipmentLogArr[1], equipmentLogArr[2], equipmentLogArr[3], equipmentLogArr[4], equipmentLogArr[5]);
 
         }
 

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

@@ -116,7 +116,7 @@ public class MesEquipVariableCollectContext implements Serializable {
         if (!StringUtils.isEmpty(equipVariableStatus)) this.equipVariableStatus = (Integer) equipVariableStatus;
         if (!StringUtils.isEmpty(quality)) this.quality = (Integer) quality;
         if (!StringUtils.isEmpty(modifyDatetime)) this.writeDatetime = (String) modifyDatetime;
-        if (!StringUtils.isEmpty(id)) this.equipmentLogId = (Long) id;
+        if (!StringUtils.isEmpty(id)) this.equipmentLogId = Long.valueOf(id.toString());
         this.messageSource = MesExtEnumUtil.CELL_MESSAGE_SOURCE.READ.getValue();
     }
 

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

@@ -242,7 +242,7 @@ public class MesProductionProcessContext implements Serializable {
     public List<MesEquipmentVariableCfg> getEquipVariableCfgListByVct(String variableCfgType) {
         List<MesEquipmentVariableCfg> equipmentVariableCfgList = getEquipVariableCfgList();
         return (StringUtils.isEmpty(variableCfgType) || CollectionUtils.isEmpty(equipmentVariableCfgList)) ? null :
-                equipmentVariableCfgList.stream().filter(o -> (null != o && o.getVariableCfgType().equals(variableCfgType))).collect(Collectors.toList());
+                equipmentVariableCfgList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getCategoryLevelTwo()) && o.getVariableCfgType().equals(variableCfgType))).collect(Collectors.toList());
     }
 
     //上下文赋值数据变量接口逻辑对象集合