CZT
2023-09-25 b9e930a68548bbaa9b67b29541b74c013f3fb9eb
优化提交
已修改4个文件
31 ■■■■ 文件已修改
igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/RemoteGrainServiceImpl.java 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/builder/CommandBuild.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/client/ClientHandler.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-protocol-es/src/main/java/com/ld/igds/protocol/es/dlt645/client/ClientHandler.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/RemoteGrainServiceImpl.java
@@ -1,5 +1,6 @@
package com.ld.igds.protocol.beibo.grain;
import com.ld.igds.constant.RedisConst;
import com.ld.igds.io.RemoteGrainService;
import com.ld.igds.io.constant.OrderRespEnum;
import com.ld.igds.io.constant.ProtocolEnum;
@@ -8,8 +9,10 @@
import com.ld.igds.protocol.beibo.grain.builder.CommandBuild;
import com.ld.igds.protocol.beibo.grain.client.BeiboClientEngine;
import com.ld.igds.util.BytesUtil;
import com.ld.igds.util.RedisUtil;
import com.ld.io.api.InvokeResult;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
/**
@@ -23,6 +26,9 @@
    public static final String BEAN_ID = "beiboGrain.remoteGrainService";
    @Autowired
    private RedisUtil redisUtil;
    @Override
    public String getProtocol() {
        return ProtocolEnum.TCP_BEIBO_GRAIN_V1.getCode();
@@ -31,8 +37,8 @@
    @Override
    public GrainResponse checkGrain(CheckGrainRequest request) {
        try {
            log.info("贝博粮情分机开始检测,分机{}的IP={},端口={}",request.getSerId(),request.getIp(),request.getPort());
            BeiboClientEngine beibo = new BeiboClientEngine(request.getIp(),request.getPort());
            log.info("贝博粮情分机开始检测,分机{}的IP={},端口={}", request.getSerId(), request.getIp(), request.getPort());
            BeiboClientEngine beibo = new BeiboClientEngine(request.getIp(), request.getPort());
            beibo.start();
            Thread.sleep(3000);
@@ -41,10 +47,13 @@
            InvokeResult result = beibo.send(BytesUtil.hexStrToBytes(hexStr));
            log.info("result=" +result.getMessage());
            log.info("result=" + result.getMessage());
            // 封装返回信息
            if (InvokeResult.SUCCESS == result) {
                String key = RedisConst.buildKey(request.getCompanyId(), "GRAIN_BEIBO");
                redisUtil.set(key, request.getDepotId());
                return new GrainResponse(OrderRespEnum.ORDER_SUCCESS.getCode(),
                        "粮情粮情发送成功!");
            } else {
igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/builder/CommandBuild.java
@@ -23,10 +23,10 @@
     * 粮情采集命令
     *
     * @param grainAddr 粮情分机地址
     * @param deptId    仓库编号地址
     * @param depotId    仓库编号地址
     * @return
     */
    public static String getMsgCheck(String grainAddr, String deptId) {
    public static String getMsgCheck(String grainAddr, String depotId) {
        StringBuffer sb = new StringBuffer();
igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/client/ClientHandler.java
@@ -2,6 +2,7 @@
import com.ld.igds.protocol.beibo.grain.analysis.AnalysisService;
import com.ld.igds.util.BytesUtil;
import com.ld.igds.util.SpringUtil;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.SimpleChannelInboundHandler;
import io.netty.util.internal.logging.InternalLogger;
@@ -15,10 +16,11 @@
 */
public class ClientHandler extends SimpleChannelInboundHandler<Object> {
    @Autowired
    private AnalysisService analysisService;
    private final InternalLogger log = InternalLoggerFactory.getInstance(this
            .getClass());
    private final InternalLogger log = InternalLoggerFactory.getInstance(this.getClass());
    @Override
    public void channelActive(ChannelHandlerContext ctx) {
        InetSocketAddress insocket = (InetSocketAddress) ctx.channel()
@@ -47,6 +49,9 @@
        InetSocketAddress insocket = (InetSocketAddress) ctx.channel().remoteAddress();
        //解析
        if (null == analysisService) {
            analysisService = (AnalysisService) SpringUtil.getBean(AnalysisService.BEAN_ID);
        }
        analysisService.analysis(result);
    }
igds-protocol-es/src/main/java/com/ld/igds/protocol/es/dlt645/client/ClientHandler.java
@@ -7,7 +7,6 @@
import io.netty.channel.SimpleChannelInboundHandler;
import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.logging.InternalLoggerFactory;
import org.springframework.stereotype.Component;
import java.net.InetSocketAddress;