From 9abb8808eeadfd13ab4d15f780c5d808d382877d Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期三, 28 六月 2023 15:16:15 +0800
Subject: [PATCH] 邦海粮情
---
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/server/BhznGrainV2HeartbeatImpl.java | 4 ++--
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/server/BhznGrainV2MessageConsumer.java | 2 +-
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/server/BhznGrainV2ServerUtils.java | 14 +++++++-------
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/msg/AnalysisService.java | 4 ++--
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/server/BhznGrainV2ServerEngine.java | 12 ------------
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/RemoteGrainV2ServiceImpl.java | 3 ++-
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/server/BhznGrainV2SessionListener.java | 4 ++--
7 files changed, 16 insertions(+), 27 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 f696c7c..7202e5d 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
@@ -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);
diff --git a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/msg/AnalysisService.java b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/msg/AnalysisService.java
index 5d4e413..3a46bff 100644
--- a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/msg/AnalysisService.java
+++ b/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));
}
}
diff --git a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/server/BhznGrainV2HeartbeatImpl.java b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/server/BhznGrainV2HeartbeatImpl.java
index 4c0b514..841c910 100644
--- a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/server/BhznGrainV2HeartbeatImpl.java
+++ b/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;
diff --git a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/server/BhznGrainV2MessageConsumer.java b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/server/BhznGrainV2MessageConsumer.java
index ca3a4cd..c5021da 100644
--- a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/server/BhznGrainV2MessageConsumer.java
+++ b/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);
diff --git a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/server/BhznGrainV2ServerEngine.java b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/server/BhznGrainV2ServerEngine.java
index 02b6f13..1881e68 100644
--- a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/server/BhznGrainV2ServerEngine.java
+++ b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/server/BhznGrainV2ServerEngine.java
@@ -114,18 +114,6 @@
// return session.invoke(msg);
// }
- /**
- * 鐩存帴浣跨敤鍐呭瓨鐨凷ession鎵ц
- */
- 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);
- }
}
\ No newline at end of file
diff --git a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/server/BhznGrainV2ServerUtils.java b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/server/BhznGrainV2ServerUtils.java
index da16dc7..7e97c3d 100644
--- a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/server/BhznGrainV2ServerUtils.java
+++ b/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);
+// }
}
diff --git a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/server/BhznGrainV2SessionListener.java b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/server/BhznGrainV2SessionListener.java
index eab5872..2ab0b83 100644
--- a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/grainv2/server/BhznGrainV2SessionListener.java
+++ b/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={}锛孭ORT={}", session.getAddress(), session.getPort());
--
Gitblit v1.9.3