From 842b40596dba5cc6b2e3bf15f5cf948b8aca914c Mon Sep 17 00:00:00 2001 From: lzh Date: Wed, 21 Jan 2026 22:35:22 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DRocketMQ=20topic?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E9=9D=9E=E6=B3=95=E5=AD=97=E7=AC=A6=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RocketMQ topic 只允许 ^[%|a-zA-Z0-9_-]+$ 字符，不支持 `.` IoT 模块 Topic 变更： - integration.device.status → integration-device-status - integration.device.property → integration-device-property - integration.device.event → integration-device-event Ops 模块 Topic 变更： - ops.order.create → ops-order-create - ops.order.arrive → ops-order-arrive - ops.order.complete → ops-order-complete - ops.order.audit → ops-order-audit - ops.order.confirm → ops-order-confirm Co-Authored-By: Claude Opus 4.5 --- .../core/integration/constants/CleanOrderTopics.java | 10 +++++----- .../core/integration/constants/IntegrationTopics.java | 6 +++--- .../consumer/CleanOrderArriveEventHandler.java | 4 ++-- .../consumer/CleanOrderAuditEventHandler.java | 4 ++-- .../consumer/CleanOrderCompleteEventHandler.java | 4 ++-- .../consumer/CleanOrderConfirmEventHandler.java | 2 +- .../consumer/CleanOrderCreateEventHandler.java | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/viewsh-module-iot/viewsh-module-iot-core/src/main/java/com/viewsh/module/iot/core/integration/constants/CleanOrderTopics.java b/viewsh-module-iot/viewsh-module-iot-core/src/main/java/com/viewsh/module/iot/core/integration/constants/CleanOrderTopics.java index b0e53fa..09636c7 100644 --- a/viewsh-module-iot/viewsh-module-iot-core/src/main/java/com/viewsh/module/iot/core/integration/constants/CleanOrderTopics.java +++ b/viewsh-module-iot/viewsh-module-iot-core/src/main/java/com/viewsh/module/iot/core/integration/constants/CleanOrderTopics.java @@ -12,26 +12,26 @@ public interface CleanOrderTopics { /** * 保洁工单创建事件 */ - String ORDER_CREATE = "ops.order.create"; + String ORDER_CREATE = "ops-order-create"; /** * 保洁工单到岗事件 */ - String ORDER_ARRIVE = "ops.order.arrive"; + String ORDER_ARRIVE = "ops-order-arrive"; /** * 保洁工单完成事件 */ - String ORDER_COMPLETE = "ops.order.complete"; + String ORDER_COMPLETE = "ops-order-complete"; /** * 保洁工单审计事件 */ - String ORDER_AUDIT = "ops.order.audit"; + String ORDER_AUDIT = "ops-order-audit"; /** * 保洁工单确认事件（按键确认） */ - String ORDER_CONFIRM = "ops.order.confirm"; + String ORDER_CONFIRM = "ops-order-confirm"; } diff --git a/viewsh-module-iot/viewsh-module-iot-core/src/main/java/com/viewsh/module/iot/core/integration/constants/IntegrationTopics.java b/viewsh-module-iot/viewsh-module-iot-core/src/main/java/com/viewsh/module/iot/core/integration/constants/IntegrationTopics.java index a6e0b60..c26b20d 100644 --- a/viewsh-module-iot/viewsh-module-iot-core/src/main/java/com/viewsh/module/iot/core/integration/constants/IntegrationTopics.java +++ b/viewsh-module-iot/viewsh-module-iot-core/src/main/java/com/viewsh/module/iot/core/integration/constants/IntegrationTopics.java @@ -14,21 +14,21 @@ public class IntegrationTopics { *

* 用于发布设备上线/离线状态变更事件 */ - public static final String DEVICE_STATUS = "integration.device.status"; + public static final String DEVICE_STATUS = "integration-device-status"; /** * 设备属性变更 Topic *

* 用于发布设备属性变更事件 */ - public static final String DEVICE_PROPERTY = "integration.device.property"; + public static final String DEVICE_PROPERTY = "integration-device-property"; /** * 设备事件上报 Topic *

* 用于发布设备事件（SOS、按键等） */ - public static final String DEVICE_EVENT = "integration.device.event"; + public static final String DEVICE_EVENT = "integration-device-event"; private IntegrationTopics() { } diff --git a/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/integration/consumer/CleanOrderArriveEventHandler.java b/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/integration/consumer/CleanOrderArriveEventHandler.java index 123e6cc..dbdc49c 100644 --- a/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/integration/consumer/CleanOrderArriveEventHandler.java +++ b/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/integration/consumer/CleanOrderArriveEventHandler.java @@ -26,7 +26,7 @@ import java.util.concurrent.TimeUnit; * 订阅 IoT 模块发布的保洁工单到岗事件 *

* RocketMQ 配置： - * - Topic: ops.order.arrive + * - Topic: ops-order-arrive * - ConsumerGroup: ops-clean-order-arrive-group * * @author AI @@ -34,7 +34,7 @@ import java.util.concurrent.TimeUnit; @Slf4j @Component @RocketMQMessageListener( - topic = "ops.order.arrive", + topic = "ops-order-arrive", consumerGroup = "ops-clean-order-arrive-group", consumeMode = ConsumeMode.CONCURRENTLY, selectorExpression = "*" diff --git a/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/integration/consumer/CleanOrderAuditEventHandler.java b/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/integration/consumer/CleanOrderAuditEventHandler.java index 5cfae23..9ba3937 100644 --- a/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/integration/consumer/CleanOrderAuditEventHandler.java +++ b/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/integration/consumer/CleanOrderAuditEventHandler.java @@ -29,7 +29,7 @@ import java.util.concurrent.TimeUnit; * 用于记录非状态变更的业务审计日志（如警告发送、抑制操作等） *

* RocketMQ 配置： - * - Topic: ops.order.audit + * - Topic: ops-order-audit * - ConsumerGroup: ops-clean-order-audit-group * * @author AI @@ -37,7 +37,7 @@ import java.util.concurrent.TimeUnit; @Slf4j @Component @RocketMQMessageListener( - topic = "ops.order.audit", + topic = "ops-order-audit", consumerGroup = "ops-clean-order-audit-group", consumeMode = ConsumeMode.CONCURRENTLY, selectorExpression = "*" diff --git a/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/integration/consumer/CleanOrderCompleteEventHandler.java b/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/integration/consumer/CleanOrderCompleteEventHandler.java index 0d5308f..16fc7ca 100644 --- a/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/integration/consumer/CleanOrderCompleteEventHandler.java +++ b/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/integration/consumer/CleanOrderCompleteEventHandler.java @@ -27,7 +27,7 @@ import java.util.concurrent.TimeUnit; * 订阅 IoT 模块发布的保洁工单完成事件 *

* RocketMQ 配置： - * - Topic: ops.order.complete + * - Topic: ops-order-complete * - ConsumerGroup: ops-clean-order-complete-group * * @author AI @@ -35,7 +35,7 @@ import java.util.concurrent.TimeUnit; @Slf4j @Component @RocketMQMessageListener( - topic = "ops.order.complete", + topic = "ops-order-complete", consumerGroup = "ops-clean-order-complete-group", consumeMode = ConsumeMode.CONCURRENTLY, selectorExpression = "*" diff --git a/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/integration/consumer/CleanOrderConfirmEventHandler.java b/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/integration/consumer/CleanOrderConfirmEventHandler.java index f75c475..108747d 100644 --- a/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/integration/consumer/CleanOrderConfirmEventHandler.java +++ b/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/integration/consumer/CleanOrderConfirmEventHandler.java @@ -31,7 +31,7 @@ import java.util.concurrent.TimeUnit; @Slf4j @Component @RocketMQMessageListener( - topic = "ops.order.confirm", + topic = "ops-order-confirm", consumerGroup = "ops-clean-order-confirm-group", consumeMode = ConsumeMode.CONCURRENTLY ) diff --git a/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/integration/consumer/CleanOrderCreateEventHandler.java b/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/integration/consumer/CleanOrderCreateEventHandler.java index f9c51f3..5ffcdf6 100644 --- a/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/integration/consumer/CleanOrderCreateEventHandler.java +++ b/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/integration/consumer/CleanOrderCreateEventHandler.java @@ -23,7 +23,7 @@ import java.util.concurrent.TimeUnit; * 订阅 IoT 模块发布的保洁工单创建事件 *

* RocketMQ 配置： - * - Topic: ops.order.create + * - Topic: ops-order-create * - ConsumerGroup: ops-clean-order-create-group * * @author AI @@ -31,7 +31,7 @@ import java.util.concurrent.TimeUnit; @Slf4j @Component @RocketMQMessageListener( - topic = "ops.order.create", + topic = "ops-order-create", consumerGroup = "ops-clean-order-create-group", consumeMode = ConsumeMode.CONCURRENTLY, selectorExpression = "*"