From 14f2c4fce50c871d84f89d2dca2298e0892b4672 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 05 五月 2026 08:25:26 +0800
Subject: [PATCH] Merge branch 'rcs_master_1.0' into rcs_master_all
---
zy-acs-gateway/src/main/java/com/zy/acs/gateway/handler/AgvPackageServerHandler.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 54 insertions(+), 5 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 21d6741..3d12e07 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
@@ -2,18 +2,22 @@
import com.zy.acs.common.constant.RedisConstant;
import com.zy.acs.common.domain.AgvProtocol;
+import com.zy.acs.common.domain.mq.DeviceMessage;
import com.zy.acs.common.domain.protocol.*;
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.gateway.AbstractInboundHandler;
import com.zy.acs.gateway.Executors;
import com.zy.acs.gateway.constant.ProtocolType;
+import com.zy.acs.gateway.constant.RabbitmqConstant;
import com.zy.acs.gateway.domain.AgvPackage;
import com.zy.acs.gateway.process.AckMsgBuilder;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
/**
@@ -31,6 +35,13 @@
@Autowired
private Executors executors;
+ @Autowired
+ private RabbitTemplate rabbitTemplate;
+
+ @Value("${spring.rabbitmq.enable}")
+ private Boolean flag;
+
+
@Override
@SuppressWarnings("all")
protected boolean channelRead0(ChannelHandlerContext ctx, AgvPackage pac) throws Exception {
@@ -39,7 +50,8 @@
final String uniqueNo = pac.getHeader().getUniqueNo();
- label : switch (pac.getHeader().getProtocolType()){
+ label:
+ switch (pac.getHeader().getProtocolType()) {
case PATH_ACK: // 璺緞鍖� ack
AGV_01_UP agv_01_up = (AGV_01_UP) pac.getBody().getMessageBody();
@@ -55,12 +67,20 @@
agv_b1_down.setPathLen(agv_01_up.getPathLen());
ctx.writeAndFlush(pathAckPac);
+ // 鍐欏叆闃熷垪
+ saveLogToMq(RabbitmqConstant.TOPIC_EXCHANGE, RabbitmqConstant.ROUTING_KEY_UP.replaceFirst(RabbitmqConstant.SPILT_REGEX, uniqueNo).replaceFirst(RabbitmqConstant.SPILT_REGEX, ProtocolType.PATH_ACK.name()), new DeviceMessage(pac.getSourceHexStr()));
+ saveLogToMq(RabbitmqConstant.TOPIC_EXCHANGE, RabbitmqConstant.ROUTING_KEY_DOWN.replaceFirst(RabbitmqConstant.SPILT_REGEX, uniqueNo).replaceFirst(RabbitmqConstant.SPILT_REGEX, ProtocolType.PATH_ACK_RESPONSE.name()), new DeviceMessage(pathAckPac.getSourceHexStr()));
+
+
break label;
case PICK_PLACE_REQUEST: // 鍙栨斁璐ц姹傚寘
AGV_06_UP agv_06_up = (AGV_06_UP) pac.getBody().getMessageBody();
redis.push(RedisConstant.AGV_COMPLETE_FLAG, AgvProtocol.build(uniqueNo).setMessageBody(agv_06_up));
+ // 鍐欏叆闃熷垪
+ saveLogToMq(RabbitmqConstant.TOPIC_EXCHANGE, RabbitmqConstant.ROUTING_KEY_UP.replaceFirst(RabbitmqConstant.SPILT_REGEX, uniqueNo).replaceFirst(RabbitmqConstant.SPILT_REGEX, ProtocolType.PICK_PLACE_REQUEST.name()), new DeviceMessage(pac.getSourceHexStr()));
+
break label;
@@ -71,6 +91,9 @@
redis.setObject(RedisConstant.AGV_CMD_UP_FLAG
, pac.getHeader().getUniqueNo() + "_" + agv_02_up.getSerialNo()
, agv_02_up);
+ // 鍐欏叆闃熷垪
+ saveLogToMq(RabbitmqConstant.TOPIC_EXCHANGE, RabbitmqConstant.ROUTING_KEY_UP.replaceFirst(RabbitmqConstant.SPILT_REGEX, uniqueNo).replaceFirst(RabbitmqConstant.SPILT_REGEX, ProtocolType.COMMAND_ACK.name()), new DeviceMessage(pac.getSourceHexStr()));
+
break label;
@@ -80,6 +103,10 @@
AGV_11_UP agv_11_up = (AGV_11_UP) pac.getBody().getMessageBody();
redis.push(RedisConstant.AGV_COMPLETE_FLAG, AgvProtocol.build(uniqueNo).setMessageBody(agv_11_up));
+ // 鍐欏叆闃熷垪
+ saveLogToMq(RabbitmqConstant.TOPIC_EXCHANGE, RabbitmqConstant.ROUTING_KEY_UP.replaceFirst(RabbitmqConstant.SPILT_REGEX, uniqueNo).replaceFirst(RabbitmqConstant.SPILT_REGEX, ProtocolType.ACTION_COMPLETE.name()), new DeviceMessage(pac.getSourceHexStr()));
+
+
// 鍔ㄤ綔瀹屾垚搴旂瓟
if (null != ackType) {
AgvPackage ackPac = AckMsgBuilder.ofSuccess(pac, ackType);
@@ -88,8 +115,9 @@
agv_a1_down.setAckSign((byte) agv_11_up.getCompleteCode());
ctx.writeAndFlush(ackPac);
- }
+ saveLogToMq(RabbitmqConstant.TOPIC_EXCHANGE, RabbitmqConstant.ROUTING_KEY_DOWN.replaceFirst(RabbitmqConstant.SPILT_REGEX, uniqueNo).replaceFirst(RabbitmqConstant.SPILT_REGEX, ackType.name()), new DeviceMessage(ackPac.getSourceHexStr()));
+ }
break label;
@@ -105,6 +133,9 @@
// }
//
// });
+ // 鍐欏叆闃熷垪
+ saveLogToMq(RabbitmqConstant.TOPIC_EXCHANGE, RabbitmqConstant.ROUTING_KEY_UP.replaceFirst(RabbitmqConstant.SPILT_REGEX, uniqueNo).replaceFirst(RabbitmqConstant.SPILT_REGEX, ProtocolType.DATA_CODE_REPORT.name()), new DeviceMessage(pac.getSourceHexStr()));
+
break label;
@@ -120,6 +151,8 @@
// }
//
// });
+ // 鍐欏叆闃熷垪
+ saveLogToMq(RabbitmqConstant.TOPIC_EXCHANGE, RabbitmqConstant.ROUTING_KEY_UP.replaceFirst(RabbitmqConstant.SPILT_REGEX, uniqueNo).replaceFirst(RabbitmqConstant.SPILT_REGEX, ProtocolType.DATA_WITHOUT_CODE_REPORT.name()), new DeviceMessage(pac.getSourceHexStr()));
break label;
@@ -143,9 +176,12 @@
// }
//
// });
+ // 鍐欏叆闃熷垪
+ saveLogToMq(RabbitmqConstant.TOPIC_EXCHANGE, RabbitmqConstant.ROUTING_KEY_UP.replaceFirst(RabbitmqConstant.SPILT_REGEX, uniqueNo).replaceFirst(RabbitmqConstant.SPILT_REGEX, ProtocolType.HEARTBEAT_REPORT.name()), new DeviceMessage(pac.getSourceHexStr()));
+
break label;
-
+
case SILO_REPORT: // 鏂欎粨淇℃伅鍖�
AGV_70_UP agv_70_up = (AGV_70_UP) pac.getBody().getMessageBody();
@@ -158,7 +194,8 @@
// }
//
// });
-
+ // 鍐欏叆闃熷垪
+ saveLogToMq(RabbitmqConstant.TOPIC_EXCHANGE, RabbitmqConstant.ROUTING_KEY_UP.replaceFirst(RabbitmqConstant.SPILT_REGEX, uniqueNo).replaceFirst(RabbitmqConstant.SPILT_REGEX, ProtocolType.SILO_REPORT.name()), new DeviceMessage(pac.getSourceHexStr()));
break label;
@@ -166,12 +203,15 @@
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));
+ // 鍐欏叆闃熷垪
+ saveLogToMq(RabbitmqConstant.TOPIC_EXCHANGE, RabbitmqConstant.ROUTING_KEY_UP.replaceFirst(RabbitmqConstant.SPILT_REGEX, uniqueNo).replaceFirst(RabbitmqConstant.SPILT_REGEX, ProtocolType.LOGIN_REPORT.name()), new DeviceMessage(pac.getSourceHexStr()));
// 鐧诲綍搴旂瓟
if (null != ackType) {
AgvPackage ackPac = AckMsgBuilder.ofSuccess(pac, ackType);
ctx.writeAndFlush(ackPac);
+ saveLogToMq(RabbitmqConstant.TOPIC_EXCHANGE, RabbitmqConstant.ROUTING_KEY_DOWN.replaceFirst(RabbitmqConstant.SPILT_REGEX, uniqueNo).replaceFirst(RabbitmqConstant.SPILT_REGEX, ackType.name()), new DeviceMessage(ackPac.getSourceHexStr()));
}
// 30s redis
@@ -184,6 +224,8 @@
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));
+ // 鍐欏叆闃熷垪
+ saveLogToMq(RabbitmqConstant.TOPIC_EXCHANGE, RabbitmqConstant.ROUTING_KEY_UP.replaceFirst(RabbitmqConstant.SPILT_REGEX, uniqueNo).replaceFirst(RabbitmqConstant.SPILT_REGEX, ProtocolType.FAULT_REPORT.name()), new DeviceMessage(pac.getSourceHexStr()));
break label;
@@ -208,7 +250,14 @@
}
}
-
+ public void saveLogToMq(String topic_exchange, String routingKey, DeviceMessage message) {
+ if (flag) {
+ // 鍐欏叆闃熷垪
+ rabbitTemplate.convertAndSend(topic_exchange, routingKey, message);
+ } else {
+ log.warn("RabbitTemplate is not running, message not sent");
+ }
+ }
}
--
Gitblit v1.9.1