漏信号 代码 报错 问题修复 查询id bigint 转long

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

@@ -13,6 +13,7 @@ import org.springframework.util.StringUtils;
 
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
+import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -49,7 +50,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 +60,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]);
 
         }