From c206acfaedc69c390fb67daa81bc686f58a212ef Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 27 十一月 2023 16:12:11 +0800
Subject: [PATCH] 提交配置信息2
---
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/RemoteGrainV2ServiceImpl.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/RemoteGrainV2ServiceImpl.java b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/RemoteGrainV2ServiceImpl.java
index 7202e5d..bfcd4ff 100644
--- a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/RemoteGrainV2ServiceImpl.java
+++ b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/RemoteGrainV2ServiceImpl.java
@@ -1,16 +1,18 @@
package com.ld.igds.protocol.bhzn.grainv2;
-import com.ld.igds.common.CoreSerService;
+import com.ld.igds.common.CoreCommonService;
import com.ld.igds.io.RemoteGrainService;
import com.ld.igds.io.constant.OrderRespEnum;
import com.ld.igds.io.constant.ProtocolEnum;
import com.ld.igds.io.request.CheckGrainRequest;
import com.ld.igds.io.response.GrainResponse;
+import com.ld.igds.models.Depot;
import com.ld.igds.protocol.bhzn.grainv2.msg.builder.CommandBuild;
import com.ld.igds.protocol.bhzn.grainv2.server.BhznGrainV2ServerEngine;
import com.ld.igds.util.BytesUtil;
import com.ld.io.api.InvokeResult;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -27,7 +29,7 @@
public static final String BEAN_ID = "bhznGrainv2.remoteGrainService";
@Autowired
- private CoreSerService coreSerService;
+ private CoreCommonService coreCommonService;
@Autowired
private BhznGrainV2ServerEngine bhznGrainServerEngine;
@@ -39,14 +41,16 @@
@Override
public GrainResponse checkGrain(CheckGrainRequest request) {
try {
+ String depotId = request.getDepotId();
+
+ //鍒ゆ柇閭︽捣浠撳簱缂栫爜鏄惁閰嶇疆
+ Depot depot = coreCommonService.getCacheDepot(request.getCompanyId(), request.getDepotId());
+ if(null != depot && StringUtils.isNotEmpty(depot.getBhId())){
+ depotId = depot.getBhId();
+ }
+
// 鐢熸垚绮儏淇℃伅
- String hexStr = CommandBuild.getInstance().getMsgCheck(request.getSerId(), request.getDepotId());
-
-
-// //閫氳浣跨敤鐨勬槸涓绘満閫氳
-// DeviceSer mainSer = coreSerService.getCacheSer(ContextUtil.getDefaultCompanyId(), BhznGrainV1ServerUtils.DEFAULT_MAC_ID);
-// request.setIp(mainSer.getIp());
-// request.setPort(mainSer.getPort());
+ String hexStr = CommandBuild.getInstance().getMsgCheck(request.getSerId(), depotId);
// 鍙戦�佸懡浠�
InvokeResult result = bhznGrainServerEngine.push(request.getIp(),request.getPort(), BytesUtil.hexStrToBytes(hexStr));
--
Gitblit v1.9.3