From caf2599a9869244ded811018811c37a2aabac3fc Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期三, 08 一月 2025 11:29:05 +0800
Subject: [PATCH] 优化测温协议

---
 src/main/java/com/fzzy/protocol/bhzn/service/Bhzn2GatewayGrainService.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/fzzy/protocol/bhzn/service/Bhzn2GatewayGrainService.java b/src/main/java/com/fzzy/protocol/bhzn/service/Bhzn2GatewayGrainService.java
index cbdc7ea..a6c3c6d 100644
--- a/src/main/java/com/fzzy/protocol/bhzn/service/Bhzn2GatewayGrainService.java
+++ b/src/main/java/com/fzzy/protocol/bhzn/service/Bhzn2GatewayGrainService.java
@@ -35,7 +35,7 @@
         GatewayDevice device = reqData.getDevice();
 
         //鑾峰彇杩炴帴涓殑璁惧淇℃伅
-        ApiCommonDevice apiCommonDevice = Constant.getCommonDeviceCache(device.getDeviceSn());
+        ApiCommonDevice apiCommonDevice = Constant.getCommonDeviceCacheByIp(device.getIp());
 
         if (null == apiCommonDevice) {
             resp.setCode(500);
@@ -58,10 +58,10 @@
 
         try {
             //Step 璇锋眰淇℃伅鏀惧叆鍐呭瓨
-            ProtocolUtils.addSyncReq2Map(device.getDepotIdSys(), reqData);
+            ProtocolUtils.addSyncReq2Map(device.getDeviceSn(), reqData);
 
             // 鐢熸垚绮儏淇℃伅
-            String hexStr = CommandBuild.getInstance().getMsgCheck(device.getDeviceSn(), device.getDepotIdSys());
+            String hexStr = CommandBuild.getInstance().getMsgCheck(device.getDeviceSn(), device.getBhId());
             // 鍙戦�佸懡浠�
             InvokeResult message = BhznGrainV2ServerEngine.push(device.getIp(), device.getPort(), BytesUtil.hexStrToBytes(hexStr));
 
@@ -84,6 +84,11 @@
     }
 
     @Override
+    public BaseResp syncGrainTh(BaseReqData reqData) {
+        return new BaseResp();
+    }
+
+    @Override
     public BaseResp syncConf(BaseReqData reqData) {
         return new BaseResp();
     }

--
Gitblit v1.9.3