From 75bdadc0c4e468217b93142d965cd92ee52838ec Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期一, 20 五月 2024 09:01:27 +0800
Subject: [PATCH] 粮情协议优化
---
src/main/java/com/fzzy/protocol/xsyg/analysis/AnalysisService.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 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..59ebe4f 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);
}
@@ -182,15 +177,19 @@
outPut.setTemperature(temperature);
outPut.setAvgTemperature(NumberUtil.keepPrecision((sumT / sumNum), 1) + "");
outPut.setMinTemperature(min + "");
- outPut.setMaxTemperature(min + "");
+ outPut.setMaxTemperature(max + "");
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);
//灏佽濂界殑鏁版嵁
@@ -198,17 +197,18 @@
reqData.setData(JSONObject.toJSONString(grain));
- doPushGrain(reqData);
+ doPushGrain(reqData,grain);
}
- private void doPushGrain(BaseReqData reqData) {
+ private void doPushGrain(BaseReqData reqData,GrainData grainData) {
GatewayDeviceReportService reportService = gatewayRemoteManager.getDeviceReportService(reqData.getDevice().getPushProtocol());
if (null == reportService) {
log.error("------------绮儏鎺ㄩ�佸け璐ワ紝绯荤粺涓嶅瓨鍦ㄥ綋鍓嶅崗璁墽琛岀被----{}", reqData.getDevice().getDeviceName());
return;
}
-
reportService.reportGrainData(reqData);
+ reqData.setData(reportService.grainData2GatewayApiInfoKafka(grainData,reqData.getDevice()).getData());
+ reportService.reportGrainDataByKafka(reqData);
}
}
--
Gitblit v1.9.3