From b7edb0f3526d5ca32016d5f332ddf957d74c01c2 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期日, 24 十二月 2023 01:24:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/igds-api-gateway' into igds-api-gateway
---
src/main/java/com/fzzy/protocol/fzzy/service/FzzyGatewayGrainService.java | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/fzzy/protocol/fzzy/service/FzzyGatewayGrainService.java b/src/main/java/com/fzzy/protocol/fzzy/service/FzzyGatewayGrainService.java
index 8b96cef..ede70f3 100644
--- a/src/main/java/com/fzzy/protocol/fzzy/service/FzzyGatewayGrainService.java
+++ b/src/main/java/com/fzzy/protocol/fzzy/service/FzzyGatewayGrainService.java
@@ -7,6 +7,7 @@
import com.fzzy.gateway.data.BaseReqData;
import com.fzzy.gateway.data.BaseResp;
import com.fzzy.gateway.entity.GatewayDevice;
+import com.fzzy.protocol.ProtocolUtils;
import com.fzzy.protocol.fzzy.builder.GrainCommandBuilder;
import com.fzzy.protocol.fzzy.cmd.BaseRemoteImpl;
import com.fzzy.protocol.fzzy.data.SendMessage;
@@ -35,7 +36,7 @@
GatewayDevice device = reqData.getDevice();
//鑾峰彇杩炴帴涓殑璁惧淇℃伅
- ApiCommonDevice apiCommonDevice = Constant.getCommonDeviceCache(device.getDeviceSn());
+ ApiCommonDevice apiCommonDevice = Constant.getCommonDeviceCache(device.getIp());
if (null == apiCommonDevice) {
resp.setCode(500);
@@ -60,28 +61,54 @@
try {
//Step 璇锋眰淇℃伅鏀惧叆鍐呭瓨
- ServerUtils.addSyncReq2Map(device.getDepotId(), reqData);
+ ProtocolUtils.addSyncReq2Map(device.getDepotIdSys(), reqData);
// Step1 鐢熸垚绮儏淇℃伅
SendMessage message = GrainCommandBuilder.getInstance().buildMessage(device,apiCommonDevice);
// 鍙戦�佸懡浠�
InvokeResult result = send(device.getIp(), device.getPort(), message.getByteMsg());
- log.error("骞冲彴------>>>>鎺у埗鏌滐細绮儏妫�娴�-{}", message);
+ log.error("骞冲彴------>>>>鎺у埗鏌滐細鍙戦�佺伯鎯呮娴嬪懡浠�-{}", message);
// 灏佽杩斿洖淇℃伅
if (!InvokeResult.SUCCESS.getCode().equals(result.getCode())) {
- log.error("骞冲彴------>>>>鎺у埗鏌滐細绮儏妫�娴�-澶辫触{}", result.getMessage());
+ log.error("骞冲彴------>>>>鎺у埗鏌滐細鍙戦�佺伯鎯呮娴嬪懡浠�-澶辫触{}", result.getMessage());
resp.setCode(500);
- resp.setMsg("骞冲彴------>>>>鎺у埗鏌滐細绮儏妫�娴�-澶辫触锛�" + result.getMessage());
+ resp.setMsg("骞冲彴------>>>>鎺у埗鏌滐細鍙戦�佺伯鎯呮娴嬪懡浠�-澶辫触锛�" + result.getMessage());
}
} catch (Exception e) {
log.error("绮儏妫�娴嬪紓甯革細{}", e);
resp.setCode(500);
- resp.setMsg("绮儏妫�娴嬪紓甯革細" + e.getMessage());
+ resp.setMsg("骞冲彴------>>>>鎺у埗鏌滐細鍙戦�佺伯鎯呮娴嬪懡浠わ細" + e.getMessage());
return resp;
}
return resp;
}
+
+ @Override
+ public BaseResp syncConf(BaseReqData reqData) {
+ return new BaseResp();
+ }
+
+ @Override
+ public BaseResp writeConf(BaseReqData reqData) {
+ return new BaseResp();
+ }
+
+ @Override
+ public BaseResp initCable(BaseReqData reqData) {
+ return new BaseResp();
+ }
+
+
+ @Override
+ public BaseResp disconnect(BaseReqData reqData) {
+ return new BaseResp();
+ }
+
+ @Override
+ public BaseResp transparent(BaseReqData reqData) {
+ return new BaseResp();
+ }
}
--
Gitblit v1.9.3