From d3e48589ea2719cdde41b87fc1ad80f4ee509bac Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期五, 13 十二月 2024 10:29:56 +0800
Subject: [PATCH] 优化测温协议
---
src/main/java/com/fzzy/protocol/fzzy/analysis/AnalysisGrain.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/fzzy/protocol/fzzy/analysis/AnalysisGrain.java b/src/main/java/com/fzzy/protocol/fzzy/analysis/AnalysisGrain.java
index 0c70f31..fbaad25 100644
--- a/src/main/java/com/fzzy/protocol/fzzy/analysis/AnalysisGrain.java
+++ b/src/main/java/com/fzzy/protocol/fzzy/analysis/AnalysisGrain.java
@@ -13,6 +13,7 @@
import com.fzzy.gateway.entity.GatewayDevice;
import com.fzzy.gateway.hx2023.ScConstant;
import com.fzzy.gateway.hx2023.data.*;
+import com.fzzy.protocol.ProtocolUtils;
import com.fzzy.protocol.fzzy.builder.SimpleCommandBuilder;
import com.fzzy.protocol.fzzy.cmd.BaseRemoteImpl;
import com.fzzy.protocol.fzzy.data.ReMessage;
@@ -93,7 +94,7 @@
private void buildBizInfo1(Response2102 response) {
//鑾峰彇璇锋眰淇℃伅
- BaseReqData reqData = ServerUtils.getSyncReq(response.getHouseId());
+ BaseReqData reqData = ProtocolUtils.getSyncReq(response.getHouseId());
if (null == reqData) {
log.error("--绮儏灏佽瑙ｆ瀽锛屾湭鑾峰彇鍒拌姹傜浉鍏冲弬鏁�----");
@@ -142,7 +143,7 @@
}
//鏁版嵁浼樺寲
- if (curTemp > 35) {
+ if (curTemp > 40) {
curTemp = response.getTAvg();
}
@@ -158,7 +159,11 @@
}
outPut.setTemperature(temperature);
+ List<GrainTH> ths = new ArrayList<>();
+ ths.add(new GrainTH(response.getTIn()!=null?response.getTIn()+"":"",response.getHIn()!=null?response.getHIn()+"":"","1"));
+ outPut.setTemperatureAndhumidity(ths);
+ //grain.setOutput(JSONObject.toJSONString(outPut));
grain.setOutput(com.alibaba.fastjson2.JSONObject.toJSONString(outPut));
@@ -179,7 +184,7 @@
weatherStation.setId(device.getDeviceId());
}
weatherStation.setAirPressure(weather.getPressure());
- weatherStation.setHumidity(weather.getHumidity());
+ weatherStation.setHumidity(weather.getHumidity().replaceAll("%",""));
weatherStation.setPm(weather.getAir_pm25());
weatherStation.setRadiation("0");
weatherStation.setRainfallAmount(weather.getWea());
@@ -194,10 +199,10 @@
log.info("---绮儏鏈烘灏佽瀹屾垚----寮�濮嬫墽琛屾帹閫�");
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) {
@@ -205,6 +210,8 @@
return;
}
reportService.reportGrainData(reqData);
+ reqData.setData(reportService.grainData2GatewayApiInfoKafka(grainData,reqData.getDevice()).getData());
+ reportService.reportGrainDataByKafka(reqData);
}
private void returnMsg(ApiCommonDevice ser) {
--
Gitblit v1.9.3