lihongjie/coal
1
0
Fork 0
mirror of https://codeup.aliyun.com/64f7d6b8ce01efaafef1e678/coal/coal.git synced 2026-01-24 23:41:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
lihongjie0209
2024-04-21 18:07:48 +08:00
parent fcc8c0c959
commit fbbb3cbdba
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/cn/lihongjie/coal/dataCollector/listener/WeightListener.java
View File

@@ -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("上传否")));

5
src/main/java/cn/lihongjie/coal/weightDeviceData/entity/WeightDeviceDataEntity.java
View File

@@ -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;