From fbbb3cbdba8c2813944d743e719502473716238b Mon Sep 17 00:00:00 2001
From: lihongjie0209 <lihongjie0209@gmail.com>
Date: Sun, 21 Apr 2024 18:07:48 +0800
Subject: [PATCH] bugfix

---
 .../coal/dataCollector/listener/WeightListener.java       | 8 ++++----
 .../weightDeviceData/entity/WeightDeviceDataEntity.java   | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/cn/lihongjie/coal/dataCollector/listener/WeightListener.java b/src/main/java/cn/lihongjie/coal/dataCollector/listener/WeightListener.java
index d9c84bd9..dbc9e6a0 100644
--- a/src/main/java/cn/lihongjie/coal/dataCollector/listener/WeightListener.java
+++ b/src/main/java/cn/lihongjie/coal/dataCollector/listener/WeightListener.java
@@ -147,7 +147,7 @@ public class WeightListener {
                                 .map(x -> x.get("序号").asInt())
                                 .collect(Collectors.toList());
 
-                Map<String, WeightDeviceDataEntity> seqNumberMap =
+                Map<Integer, WeightDeviceDataEntity> seqNumberMap =
                         weightDeviceDataService
                                 .findAll(
                                         (Specification<WeightDeviceDataEntity>)
@@ -161,13 +161,13 @@ public class WeightListener {
                                 .stream()
                                 .collect(
                                         Collectors.toMap(
-                                                WeightDeviceDataEntity::getFlowNumber, e -> e));
+                                                WeightDeviceDataEntity::getSequenceNumber, e -> e));
 
                 nodes.forEach(
                         x -> {
                             WeightDeviceDataEntity deviceData = new WeightDeviceDataEntity();
                             var flowNumber = x.get("流水号").asText();
-                            var seqNumber = x.get("序号").asText();
+                            var seqNumber = x.get("序号").asInt();
                             log.info("data from weight20: {} {} {} {} ", seqNumber, flowNumber, x.get("更新时间").asText() ,device.getId());
                             if (seqNumberMap.containsKey(seqNumber)) {
                                 log.info("data already exists: {} {} {}", seqNumber, flowNumber, device.getId());
@@ -205,7 +205,7 @@ public class WeightListener {
                             deviceData.setYcgbTIme(toLocalDateTime(x.get("一次过磅时间")));
                             deviceData.setEcgbTime(toLocalDateTime(x.get("二次过磅时间")));
                             deviceData.setUpdateUser(toString(x.get("更新人")));
-                            deviceData.setUpdateTime(toLocalDateTime(x.get("更新时间")));
+                            deviceData.setDataUpdateTime(toLocalDateTime(x.get("更新时间")));
                             deviceData.setRemark(toString(x.get("备注")));
                             deviceData.setPrintCount(toInteger(x.get("打印次数")));
                             deviceData.setUpload(toBoolean(x.get("上传否")));
diff --git a/src/main/java/cn/lihongjie/coal/weightDeviceData/entity/WeightDeviceDataEntity.java b/src/main/java/cn/lihongjie/coal/weightDeviceData/entity/WeightDeviceDataEntity.java
index 3001327c..e8c0e1bc 100644
--- a/src/main/java/cn/lihongjie/coal/weightDeviceData/entity/WeightDeviceDataEntity.java
+++ b/src/main/java/cn/lihongjie/coal/weightDeviceData/entity/WeightDeviceDataEntity.java
@@ -277,12 +277,13 @@ public class WeightDeviceDataEntity extends OrgCommonEntity {
     @Comment("更新人")
     private String updateUser;
 
-    @Comment("更新时间")
-    private LocalDateTime updateTime;
+    @Comment("数据更新时间")
 
+    private LocalDateTime dataUpdateTime;
     @Comment("备注")
     private String remark;
 
+
     @Comment("打印次数")
     private Integer printCount;