邦海粮情

vince

2023-06-28 9abb8808eeadfd13ab4d15f780c5d808d382877d

邦海粮情

 igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/RemoteGrainV2ServiceImpl.java

@@ -8,6 +8,7 @@
import com.ld.igds.io.response.GrainResponse;
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.springframework.beans.factory.annotation.Autowired;
@@ -48,7 +49,7 @@
//            request.setPort(mainSer.getPort());

            // 发送命令
            InvokeResult result = bhznGrainServerEngine.pushByMin(hexStr);
            InvokeResult result = bhznGrainServerEngine.push(request.getIp(),request.getPort(), BytesUtil.hexStrToBytes(hexStr));

            log.error("平台------>>>>控制柜：粮情检测-{}", hexStr);


 igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/msg/AnalysisService.java

@@ -210,7 +210,7 @@
    private void replayGrain(IoMessage message) {
        String hexStr = CommandBuild.getMsgGrainReply(message.getAddr());
        log.info("平台--------->>>主机，返回粮情报文收到信息，报文={}", hexStr);
        serverEngine.pushByMin(hexStr);
        serverEngine.push(message.getIp(),message.getPort(),BytesUtil.hexStrToBytes(hexStr));
    }

    private void analysisGrain2(DeviceSer ser, IoMessage message, ExeRequest exeRequest, DepotConf depotConf, DicSysConf sysConf, String batchId, String grainStr) {
@@ -459,7 +459,7 @@
        } finally {
            String hexStr = CommandBuild.getMsgTHReply(message.getAddr());
            log.info("平台--------->>>主机，返回仓温仓湿收到信息，报文={}", hexStr);
            serverEngine.pushByMin(hexStr);
            serverEngine.push(message.getIp(),message.getPort(),BytesUtil.hexStrToBytes(hexStr));
        }
    }


 igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/server/BhznGrainV2HeartbeatImpl.java

@@ -20,9 +20,9 @@


        //直接根据主机SESSIOn判断
        IoSession session1 = BhznGrainV2ServerUtils.getSession();
        //IoSession session1 = BhznGrainV2ServerUtils.getSession();

        Long lastBeatTime = BhznGrainV2ServerUtils.getHearBeat(session1);
        Long lastBeatTime = BhznGrainV2ServerUtils.getHearBeat(session);

        if (null == lastBeatTime) {
            return null;

 igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/server/BhznGrainV2MessageConsumer.java

@@ -38,7 +38,7 @@
        BhznGrainV2ServerUtils.addHeartBeat(ioSession);

        //默认设置主通讯服务
        BhznGrainV2ServerUtils.addSession(ioSession);
        //BhznGrainV2ServerUtils.addSession(ioSession);

        try {
            String hexStr = BytesUtil.bytesToString(bytes);

 igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/server/BhznGrainV2ServerEngine.java

@@ -114,18 +114,6 @@
//        return session.invoke(msg);
//    }

    /**
     * 直接使用内存的Session执行
     */
    public InvokeResult pushByMin(String hexStr) {

        IoSession session = BhznGrainV2ServerUtils.getSession();

        if (null == session) {
            return InvokeResult.CHANNEL_CLOSED;
        }
        byte[] msg = BytesUtil.hexStrToBytes(hexStr);
        return session.invoke(msg);
    }

}

 igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/server/BhznGrainV2ServerUtils.java

@@ -93,11 +93,11 @@
        return BytesUtil.intToHexStr(256 - check).substring(2);
    }

    public static void addSession(IoSession session) {
        contextIoSession.put(DEFAULT_MAC_ID, session);
    }

    public static IoSession getSession() {
        return contextIoSession.get(DEFAULT_MAC_ID);
    }
//    public static void addSession(IoSession session) {
//        contextIoSession.put(DEFAULT_MAC_ID, session);
//    }
//
//    public static IoSession getSession() {
//        return contextIoSession.get(DEFAULT_MAC_ID);
//    }
}

 igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/server/BhznGrainV2SessionListener.java

@@ -25,8 +25,8 @@
    @Override
    public void onCreate(IoSession session) {

        //添加到内存
        BhznGrainV2ServerUtils.addSession(session);
//        //添加到内存
//        BhznGrainV2ServerUtils.addSession(session);

        log.info("++++新建连接++++-IP={}，PORT={}", session.getAddress(), session.getPort());