From b9e930a68548bbaa9b67b29541b74c013f3fb9eb Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 25 九月 2023 21:49:19 +0800
Subject: [PATCH] 优化提交
---
igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/builder/CommandBuild.java | 4 ++--
igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/RemoteGrainServiceImpl.java | 15 ++++++++++++---
igds-protocol-es/src/main/java/com/ld/igds/protocol/es/dlt645/client/ClientHandler.java | 1 -
igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/client/ClientHandler.java | 11 ++++++++---
4 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/RemoteGrainServiceImpl.java b/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/RemoteGrainServiceImpl.java
index 601dccb..ab545e1 100644
--- a/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/RemoteGrainServiceImpl.java
+++ b/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("璐濆崥绮儏鍒嗘満寮�濮嬫娴嬶紝鍒嗘満{}鐨処P={},绔彛={}",request.getSerId(),request.getIp(),request.getPort());
- BeiboClientEngine beibo = new BeiboClientEngine(request.getIp(),request.getPort());
+ log.info("璐濆崥绮儏鍒嗘満寮�濮嬫娴嬶紝鍒嗘満{}鐨処P={},绔彛={}", 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 {
diff --git a/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/builder/CommandBuild.java b/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/builder/CommandBuild.java
index 8b02a21..6c1ce26 100644
--- a/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/builder/CommandBuild.java
+++ b/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();
diff --git a/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/client/ClientHandler.java b/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/client/ClientHandler.java
index ad53e2c..9fdb924 100644
--- a/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grain/client/ClientHandler.java
+++ b/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);
}
diff --git a/igds-protocol-es/src/main/java/com/ld/igds/protocol/es/dlt645/client/ClientHandler.java b/igds-protocol-es/src/main/java/com/ld/igds/protocol/es/dlt645/client/ClientHandler.java
index c1895ea..673ae52 100644
--- a/igds-protocol-es/src/main/java/com/ld/igds/protocol/es/dlt645/client/ClientHandler.java
+++ b/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;
--
Gitblit v1.9.3