From c8ff96af8647474b1d03f5f374bb18eb59f65987 Mon Sep 17 00:00:00 2001 From: jiazx0107@163.com <jiazx0107@163.com> Date: 星期日, 24 十二月 2023 12:30:09 +0800 Subject: [PATCH] 游仙协议解析-2 --- src/main/java/com/fzzy/protocol/bhzn/service/Bhzn2GatewayGrainService.java | 38 ++++++++++++++++++++++++++++++++++---- 1 files changed, 34 insertions(+), 4 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 0cde399..9d0a916 100644 --- a/src/main/java/com/fzzy/protocol/bhzn/service/Bhzn2GatewayGrainService.java +++ b/src/main/java/com/fzzy/protocol/bhzn/service/Bhzn2GatewayGrainService.java @@ -8,15 +8,15 @@ 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.bhzn.cmd.CommandBuild; import com.fzzy.protocol.bhzn.server.BhznGrainV2ServerEngine; -import com.fzzy.protocol.bhzn.server.BhznGrainV2ServerUtils; import com.ld.io.api.InvokeResult; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; /** - * 椋庢鑷磋繙鎺у埗鏌滃崗璁� + * 閭︽捣鏅鸿兘绮儏鍗忚-缃戝彛璁惧 */ @Slf4j @Component @@ -35,7 +35,7 @@ GatewayDevice device = reqData.getDevice(); //鑾峰彇杩炴帴涓殑璁惧淇℃伅 - ApiCommonDevice apiCommonDevice = Constant.getCommonDeviceCache(device.getDeviceSn()); + ApiCommonDevice apiCommonDevice = Constant.getCommonDeviceCache(device.getIp()); if (null == apiCommonDevice) { resp.setCode(500); @@ -58,7 +58,7 @@ try { //Step 璇锋眰淇℃伅鏀惧叆鍐呭瓨 - BhznGrainV2ServerUtils.addSyncReq2Map(device.getDepotIdSys(), reqData); + ProtocolUtils.addSyncReq2Map(device.getDepotIdSys(), reqData); // 鐢熸垚绮儏淇℃伅 String hexStr = CommandBuild.getInstance().getMsgCheck(device.getDeviceSn(), device.getDepotIdSys()); @@ -82,4 +82,34 @@ } return resp; } + + @Override + public BaseResp syncGrainTh(BaseReqData reqData) { + return new BaseResp(); + } + + @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