From 9483baffba9a24a2a36fc8739fc65b59317d9142 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 03 七月 2025 14:18:46 +0800
Subject: [PATCH] 队列拆分
---
zy-acs-gateway/src/main/java/com/zy/acs/gateway/handler/AgvPackageServerHandler.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/zy-acs-gateway/src/main/java/com/zy/acs/gateway/handler/AgvPackageServerHandler.java b/zy-acs-gateway/src/main/java/com/zy/acs/gateway/handler/AgvPackageServerHandler.java
index 9223b29..4715710 100644
--- a/zy-acs-gateway/src/main/java/com/zy/acs/gateway/handler/AgvPackageServerHandler.java
+++ b/zy-acs-gateway/src/main/java/com/zy/acs/gateway/handler/AgvPackageServerHandler.java
@@ -9,7 +9,6 @@
import com.zy.acs.gateway.constant.ProtocolType;
import com.zy.acs.gateway.domain.AgvPackage;
import com.zy.acs.gateway.process.AckMsgBuilder;
-import com.zy.acs.rpc.gateway.control.AgvDataFeignApi;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
import org.slf4j.Logger;
@@ -31,8 +30,6 @@
@Autowired
private Executors executors;
- @Autowired
- private AgvDataFeignApi agvDataFeignApi;
@Override
@SuppressWarnings("all")
@@ -47,9 +44,16 @@
AGV_01_UP agv_01_up = (AGV_01_UP) pac.getBody().getMessageBody();
- redis.setObject(RedisConstant.AGV_CMD_UP_FLAG
+ redis.setObject(RedisConstant.AGV_PATH_UP_FLAG
, pac.getHeader().getUniqueNo() + "_" + agv_01_up.getSerialNo()
, agv_01_up);
+
+ AgvPackage pathAckPac = AckMsgBuilder.ofSuccess(pac, ProtocolType.PATH_ACK_RESPONSE);
+
+ AGV_B1_DOWN agv_b1_down = (AGV_B1_DOWN) pathAckPac.getBody().getMessageBody();
+ agv_b1_down.setSerialNo(agv_01_up.getSerialNo());
+ agv_b1_down.setPathLen(agv_01_up.getPathLen());
+ ctx.writeAndFlush(pathAckPac);
break label;
@@ -100,7 +104,7 @@
case DATA_WITHOUT_CODE_REPORT: // 鏃犵爜瀹炴椂鏁版嵁
AGV_13_UP agv_13_up = (AGV_13_UP) pac.getBody().getMessageBody();
- redis.push(RedisConstant.AGV_DATA_FLAG, AgvProtocol.build(uniqueNo).setMessageBody(agv_13_up));
+ redis.push(RedisConstant.AGV_DATA_NO_CODE_FLAG, AgvProtocol.build(uniqueNo).setMessageBody(agv_13_up));
// executors.getInstance().execute(() -> {
//
@@ -119,7 +123,7 @@
redis.setObject(RedisConstant.AGV_ONLINE_FLAG, pac.getHeader().getUniqueNo(), 1, 30);
AGV_03_UP agv_03_up = (AGV_03_UP) pac.getBody().getMessageBody();
- redis.push(RedisConstant.AGV_DATA_FLAG, AgvProtocol.build(uniqueNo).setMessageBody(agv_03_up));
+ redis.push(RedisConstant.AGV_DATA_HEARTBEAT_FLAG, AgvProtocol.build(uniqueNo).setMessageBody(agv_03_up));
// executors.getInstance().execute(() -> {
@@ -154,7 +158,7 @@
case LOGIN_REPORT: // 鐧诲綍
AGV_F0_UP agv_f0_up = (AGV_F0_UP) pac.getBody().getMessageBody();
- redis.push(RedisConstant.AGV_DATA_FLAG, AgvProtocol.build(uniqueNo).setMessageBody(agv_f0_up));
+ redis.push(RedisConstant.AGV_DATA_LOGIN_FLAG, AgvProtocol.build(uniqueNo).setMessageBody(agv_f0_up));
// 鐧诲綍搴旂瓟
if (null != ackType) {
@@ -171,7 +175,7 @@
case FAULT_REPORT: // 鏁呴殰鏁版嵁鍖�
AGV_04_UP agv_04_up = (AGV_04_UP) pac.getBody().getMessageBody();
- redis.push(RedisConstant.AGV_DATA_FLAG, AgvProtocol.build(uniqueNo).setMessageBody(agv_04_up));
+ redis.push(RedisConstant.AGV_DATA_ERROR_FLAG, AgvProtocol.build(uniqueNo).setMessageBody(agv_04_up));
break label;
--
Gitblit v1.9.1