From bf34444f482223d291830c13cb147392298d99ee Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期五, 15 三月 2024 09:39:25 +0800
Subject: [PATCH] 粮情协议优化
---
src/main/java/com/fzzy/protocol/xsyg/analysis/AnalysisService.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/fzzy/protocol/xsyg/analysis/AnalysisService.java b/src/main/java/com/fzzy/protocol/xsyg/analysis/AnalysisService.java
index e4b44fb..6e19b30 100644
--- a/src/main/java/com/fzzy/protocol/xsyg/analysis/AnalysisService.java
+++ b/src/main/java/com/fzzy/protocol/xsyg/analysis/AnalysisService.java
@@ -43,12 +43,7 @@
*/
public void analysis(InetAddress address, int port, String strMsg) {
- if (strMsg.startsWith("FE")) {
-
- //DO NOTHING
- } else {
this.analysisGrainStep1(address, strMsg);
- }
}
/**
@@ -99,7 +94,7 @@
points.add(-100.00);
continue;
}
- temp = BytesUtil.hexToInt(BytesUtil.tran_LH(tag)) * 0.0625;
+ temp = BytesUtil.hexToInt(tag) * 0.0625;
temp = NumberUtil.keepPrecision(temp, 1);
points.add(temp);
}
@@ -186,11 +181,15 @@
JSONObject properties = new JSONObject();
- properties.put("data", outPut);
- properties.put("timestamp", grain.getTimestamp());
+ properties.put("timestamp", grain.getTimestamp());
+ outPut.setDetectTime( grain.getTimestamp());
+ if (StringUtils.isEmpty(height+"")) height = 0.0;
properties.put("liquidHeight", height);
+ outPut.setLiquidHeight(height+"");
+ grain.setOutput(JSONObject.toJSONString(outPut));
+ properties.put("output", outPut);
grain.setProperties(properties);
//灏佽濂界殑鏁版嵁
--
Gitblit v1.9.3