From b193c7ade86d2eb0f5150afb7ef8a7b1021d49a6 Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期二, 17 十月 2023 11:48:27 +0800
Subject: [PATCH] 邦海温湿度修复
---
igds-inout/src/main/java/com/ld/igds/inout/dto/WeightBill.java | 2 +-
igds-web/src/main/resources/static/img/aerial-5322.png | 0
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/msg/AnalysisService.java | 9 +++++----
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/dto/WeightBill.java b/igds-inout/src/main/java/com/ld/igds/inout/dto/WeightBill.java
index 36894db..a75caef 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/dto/WeightBill.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/dto/WeightBill.java
@@ -94,6 +94,6 @@
//澶囨敞
private String remark = "";
//淇濈鍛�
- private String handleUser;
+ private String handleUser = "";
}
diff --git a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/msg/AnalysisService.java b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/msg/AnalysisService.java
index 4a33cf9..462ba97 100644
--- a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/msg/AnalysisService.java
+++ b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/msg/AnalysisService.java
@@ -436,6 +436,7 @@
th.setCompanyId(ContextUtil.getDefaultCompanyId());
String data = message.getContent();
String houseNo = data.substring(0, 2);
+ int depotId = BytesUtil.hexToInt(houseNo);
String t = data.substring(4, 8);
String h = data.substring(8, 12);
double temp, humy;
@@ -452,9 +453,9 @@
th.setTempIn(temp);
th.setHumidityIn(humy);
- log.info("涓绘満--------->>>骞冲彴锛岃В鏋愪粨娓╀粨婀夸俊鎭紝浠撳簱={},缁撴灉={}", houseNo, th.toString());
+ log.info("涓绘満--------->>>骞冲彴锛岃В鏋愪粨娓╀粨婀夸俊鎭紝浠撳簱={},缁撴灉={}", depotId, th.toString());
- String key = "TH_" + houseNo;
+ String key = "TH_" + depotId;
contextMapTH.put(key, th);
} catch (Exception e) {
@@ -469,8 +470,8 @@
private THDto getTH(IoMessage message) {
String data = message.getContent();
String houseNo = data.substring(0, 2);
-
- String key = "TH_" + houseNo;
+ Integer depotId = BytesUtil.hexToInt(houseNo);
+ String key = "TH_" + depotId;
return contextMapTH.get(key);
}
diff --git a/igds-web/src/main/resources/static/img/aerial-5322.png b/igds-web/src/main/resources/static/img/aerial-5322.png
new file mode 100644
index 0000000..ac52fb7
--- /dev/null
+++ b/igds-web/src/main/resources/static/img/aerial-5322.png
Binary files differ
--
Gitblit v1.9.3