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/bhzn/v0/service/Bhzn0GatewayGrainService.java | 45 +++++++++++++++++++++++----------------------
1 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/fzzy/protocol/bhzn/v0/service/Bhzn0GatewayGrainService.java b/src/main/java/com/fzzy/protocol/bhzn/v0/service/Bhzn0GatewayGrainService.java
index 3ec7257..70b8010 100644
--- a/src/main/java/com/fzzy/protocol/bhzn/v0/service/Bhzn0GatewayGrainService.java
+++ b/src/main/java/com/fzzy/protocol/bhzn/v0/service/Bhzn0GatewayGrainService.java
@@ -9,8 +9,9 @@
import com.fzzy.gateway.data.BaseResp;
import com.fzzy.gateway.entity.GatewayDevice;
import com.fzzy.protocol.ProtocolUtils;
-import com.fzzy.protocol.bhzn.cmd.CommandBuild;
-import com.fzzy.protocol.bhzn.server.BhznGrainV2ServerEngine;
+import com.fzzy.protocol.bhzn.v0.cmd.CommandBuild;
+import com.fzzy.protocol.bhzn.v0.server.BhznGrainV0ServerEngine;
+import com.fzzy.protocol.bhzn.v0.server.BhznGrainV0ServerUtils;
import com.ld.io.api.InvokeResult;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@@ -33,26 +34,26 @@
BaseResp resp = new BaseResp();
GatewayDevice device = reqData.getDevice();
-
+ BhznGrainV0ServerUtils.contextOrder = device;
//鑾峰彇杩炴帴涓殑璁惧淇℃伅
- ApiCommonDevice apiCommonDevice = Constant.getCommonDeviceCache(device.getIp());
+// ApiCommonDevice apiCommonDevice = Constant.getCommonDeviceCacheBySn(device.getDeviceSn());
+//
+// if (null == apiCommonDevice) {
+// resp.setCode(500);
+// resp.setMsg("绯荤粺鏈幏鍙栧埌涓嬭杩炴帴璁惧淇℃伅锛屾棤娉曟墽琛�");
+// log.error("----------------绯荤粺鏈幏鍙栧埌涓嬭杩炴帴璁惧淇℃伅,鏃犳硶鎵ц---------");
+// return resp;
+// }
+//
+// if (Constant.YN_N.equals(apiCommonDevice.getStatus())) {
+// resp.setCode(500);
+// resp.setMsg("涓嬭璁惧涓嶅湪绾�---鏃犳硶鎵ц----" + device.getDeviceName());
+// log.error("涓嬭璁惧涓嶅湪绾�---鏃犳硶鎵ц----" + device.getDeviceName());
+// return resp;
+// }
- if (null == apiCommonDevice) {
- resp.setCode(500);
- resp.setMsg("绯荤粺鏈幏鍙栧埌涓嬭杩炴帴璁惧淇℃伅锛屾棤娉曟墽琛�");
- log.error("----------------绯荤粺鏈幏鍙栧埌涓嬭杩炴帴璁惧淇℃伅,鏃犳硶鎵ц---------");
- return resp;
- }
-
- if (Constant.YN_N.equals(apiCommonDevice.getStatus())) {
- resp.setCode(500);
- resp.setMsg("涓嬭璁惧涓嶅湪绾�---鏃犳硶鎵ц----" + device.getDeviceName());
- log.error("涓嬭璁惧涓嶅湪绾�---鏃犳硶鎵ц----" + device.getDeviceName());
- return resp;
- }
-
- device.setIp(apiCommonDevice.getIp());
- device.setPort(apiCommonDevice.getPort());
+// device.setIp(apiCommonDevice.getIp());
+// device.setPort(apiCommonDevice.getPort());
reqData.setDevice(device);
@@ -63,9 +64,9 @@
// 鐢熸垚绮儏淇℃伅
String hexStr = CommandBuild.getInstance().getMsgCheck(device.getDeviceSn(), device.getDepotIdSys());
// 鍙戦�佸懡浠�
- InvokeResult message = BhznGrainV2ServerEngine.push(device.getIp(), device.getPort(), BytesUtil.hexStrToBytes(hexStr));
+ InvokeResult message = BhznGrainV0ServerEngine.pushByMin(hexStr);
- log.error("骞冲彴------>>>>鎺у埗鏌滐細鍙戦�佺伯鎯呮娴嬪懡浠�-{}", message);
+ log.error("骞冲彴------>>>>鎺у埗鏌滐細鍙戦�佺伯鎯呮娴嬪懡浠�-{} -------------- {}", message,hexStr);
// 灏佽杩斿洖淇℃伅
if (!InvokeResult.SUCCESS.getCode().equals(message.getCode())) {
--
Gitblit v1.9.3