提交配置信息2

CZT

2023-11-27 c206acfaedc69c390fb67daa81bc686f58a212ef

 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));