From a2359cd94c82ad61bc32a24bf1d25fc0f9c7cb68 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 24 三月 2026 12:37:40 +0800
Subject: [PATCH] 是否将rabbitmq集成来，进行配置化
---
zy-acs-gateway/src/main/java/com/zy/acs/gateway/handler/AgvPackageServerHandler.java | 6 +++++-
zy-acs-gateway/src/main/java/com/zy/acs/gateway/listen/MessageListener.java | 7 ++++++-
zy-acs-gateway/src/main/resources/application.yml | 1 +
3 files changed, 12 insertions(+), 2 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 3dab8bf..fd2d322 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
@@ -17,6 +17,7 @@
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;
/**
@@ -36,6 +37,9 @@
@Autowired
private RabbitTemplate rabbitTemplate;
+
+ @Value("${spring.rabbitmq.enable}")
+ private Boolean flag;
@Override
@@ -247,7 +251,7 @@
}
public void saveLogToMq(String topic_exchange, String routingKey, DeviceMessage message) {
- if (rabbitTemplate.isRunning()) {
+ if (flag && rabbitTemplate.isRunning()) {
// 鍐欏叆闃熷垪
rabbitTemplate.convertAndSend(topic_exchange, routingKey, message);
} else {
diff --git a/zy-acs-gateway/src/main/java/com/zy/acs/gateway/listen/MessageListener.java b/zy-acs-gateway/src/main/java/com/zy/acs/gateway/listen/MessageListener.java
index 72a005b..b3820f1 100644
--- a/zy-acs-gateway/src/main/java/com/zy/acs/gateway/listen/MessageListener.java
+++ b/zy-acs-gateway/src/main/java/com/zy/acs/gateway/listen/MessageListener.java
@@ -16,6 +16,7 @@
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;
import javax.annotation.PostConstruct;
@@ -35,11 +36,15 @@
@Autowired
private DispatcherPublisher publisher;
+
@Autowired
private SystemProperties systemProperties;
@Autowired
private RabbitTemplate rabbitTemplate;
+
+ @Value("${spring.rabbitmq.enable}")
+ private Boolean flag;
@PostConstruct
@@ -54,7 +59,7 @@
if (!Cools.isEmpty(protocol.getAgvNo())) {
AgvPackage agvPackage = ProtocolUtils.installDownProtocol(protocol);
publisher.publish(agvPackage);
- if (rabbitTemplate.isRunning()) {
+ if (flag && rabbitTemplate.isRunning()) {
// 鍐欏叆闃熷垪
rabbitTemplate.convertAndSend(RabbitmqConstant.TOPIC_EXCHANGE, RabbitmqConstant.ROUTING_KEY_DOWN.replaceFirst(RabbitmqConstant.SPILT_REGEX, protocol.getAgvNo()).replaceFirst(RabbitmqConstant.SPILT_REGEX, agvPackage.getHeader().getProtocolType().name()),new DeviceMessage(agvPackage.getSourceHexStr()));
} else {
diff --git a/zy-acs-gateway/src/main/resources/application.yml b/zy-acs-gateway/src/main/resources/application.yml
index 327e9e3..7200ec3 100644
--- a/zy-acs-gateway/src/main/resources/application.yml
+++ b/zy-acs-gateway/src/main/resources/application.yml
@@ -11,6 +11,7 @@
password: xltys1995
rabbitmq:
+ enable: false
host: localhost
port: 5672
username: root
--
Gitblit v1.9.1