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/bhzn/analysis/AnalysisService.java | 6 +++---
src/main/java/com/fzzy/protocol/xsyg/analysis/AnalysisService.java | 15 +++++++--------
src/main/java/com/fzzy/protocol/xsyg/client/ClientHandler.java | 3 +--
src/main/java/com/fzzy/gateway/GatewayUtils.java | 2 +-
src/main/java/com/fzzy/protocol/xsyg/service/XsygGatewayGrainService.java | 2 +-
5 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/GatewayUtils.java b/src/main/java/com/fzzy/gateway/GatewayUtils.java
index 00fc7f8..c0e9aee 100644
--- a/src/main/java/com/fzzy/gateway/GatewayUtils.java
+++ b/src/main/java/com/fzzy/gateway/GatewayUtils.java
@@ -164,7 +164,7 @@
cableY = 1;
cableX = 0;
//閽堝澶氬湀璁＄畻鎬昏繃澶氬皯鏍圭數缂�
- for (int i = 0; i < cableCir.length(); i++) {
+ for (int i = 0; i < attCir.length; i++) {
cableX += Integer.valueOf(attCable[i]);
}
}
diff --git a/src/main/java/com/fzzy/protocol/bhzn/analysis/AnalysisService.java b/src/main/java/com/fzzy/protocol/bhzn/analysis/AnalysisService.java
index 3c22d41..28668ed 100644
--- a/src/main/java/com/fzzy/protocol/bhzn/analysis/AnalysisService.java
+++ b/src/main/java/com/fzzy/protocol/bhzn/analysis/AnalysisService.java
@@ -201,13 +201,13 @@
int sumNum = cableData.getSumNum();
// 鏍规嵁灞傝鍒楄幏鍙栨寚瀹氶暱搴�
- int start = 0;
+ int start = (Integer.valueOf(device.getCableStart()) - 1) * cableData.getCableZ() * 4;
int len = 4 * sumNum;
log.info("鍒嗘満------>>>骞冲彴锛氳繑鍥炵伯鎯呭畬鏁翠俊鎭紝鍒嗘満={}", device.getDeviceName());
String strPoints = grainStr.substring(start, start + len);
-
+ log.info("strPoints = "+ strPoints);
// 灏嗙伯鎯呰В鏋愭垚鏁扮粍
List<Double> temps = new ArrayList<>();
double tempValue;
@@ -278,7 +278,7 @@
int cableY = cableData.getCableY();
int sumNum = temps.size();
-
+ log.info("temps:" + temps.toString());
//鏁版嵁灏佽
GrainData grain = new GrainData();
grain.setMessageId(ScConstant.getMessageId());
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);
//灏佽濂界殑鏁版嵁
diff --git a/src/main/java/com/fzzy/protocol/xsyg/client/ClientHandler.java b/src/main/java/com/fzzy/protocol/xsyg/client/ClientHandler.java
index 339b0e6..ef1bb30 100644
--- a/src/main/java/com/fzzy/protocol/xsyg/client/ClientHandler.java
+++ b/src/main/java/com/fzzy/protocol/xsyg/client/ClientHandler.java
@@ -2,8 +2,7 @@
import com.fzzy.api.utils.BytesUtil;
import com.fzzy.api.utils.SpringUtil;
-import com.fzzy.protocol.youxian0.analysis.AnalysisService;
-import com.fzzy.protocol.youxian0.client.ClientEngine;
+import com.fzzy.protocol.xsyg.analysis.AnalysisService;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.SimpleChannelInboundHandler;
import lombok.extern.slf4j.Slf4j;
diff --git a/src/main/java/com/fzzy/protocol/xsyg/service/XsygGatewayGrainService.java b/src/main/java/com/fzzy/protocol/xsyg/service/XsygGatewayGrainService.java
index cf1dd38..35334eb 100644
--- a/src/main/java/com/fzzy/protocol/xsyg/service/XsygGatewayGrainService.java
+++ b/src/main/java/com/fzzy/protocol/xsyg/service/XsygGatewayGrainService.java
@@ -6,7 +6,7 @@
import com.fzzy.gateway.data.BaseResp;
import com.fzzy.gateway.entity.GatewayDevice;
import com.fzzy.protocol.ProtocolUtils;
-import com.fzzy.protocol.wujia.client.ClientEngine;
+import com.fzzy.protocol.xsyg.client.ClientEngine;
import com.ld.io.api.InvokeResult;
import io.netty.channel.Channel;
import lombok.extern.slf4j.Slf4j;
--
Gitblit v1.9.3