reactor：【IoT 物联网】合并 messagebus 和 common 包，统一到 core 包

yudao-module-iot/yudao-module-iot-core/pom.xml

@@ -7,19 +7,61 @@
         <groupId>cn.iocoder.boot</groupId>
         <version>${revision}</version>
     </parent>
-    <modules>
-        <module>yudao-module-iot-common</module>
-        <module>yudao-module-iot-message-bus</module>
-    </modules>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>yudao-module-iot-core</artifactId>
-    <packaging>pom</packaging>
+    <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>
     <description>
-        iot 模块下，提供 iot-biz 和 iot-gateway 模块的核心功能。
-        例如说：消息总线、消息协议（编解码）等。
+        iot 模块下，提供 iot-biz 和 iot-gateway 模块的核心功能。例如说：
+        1. 消息总线：跨 iot-biz 和 iot-gateway 的设备消息。可选择使用 spring event、redis stream、rocketmq、kafka、rabbitmq 等。
+        2. 查询设备信息的通用 API
     </description>
 
+    <dependencies>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-common</artifactId>
+        </dependency>
+
+        <!-- Spring 核心 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+
+        <!-- 消息中间件相关（可选依赖） -->
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-redis</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.rocketmq</groupId>
+            <artifactId>rocketmq-spring-boot-starter</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.amqp</groupId>
+            <artifactId>spring-rabbit</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.kafka</groupId>
+            <artifactId>spring-kafka</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- 测试依赖 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
 </project>

yudao-module-iot/yudao-module-iot-core/yudao-module-iot-common/src/main/java/cn/iocoder/yudao/module/iot/common/biz/IotDeviceCommonApi.java → yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/biz/IotDeviceCommonApi.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.iot.common.biz;
+package cn.iocoder.yudao.module.iot.core.biz;
 
 // TODO @芋艿：待实现
 public interface IotDeviceCommonApi {

yudao-module-iot/yudao-module-iot-core/yudao-module-iot-common/src/main/java/cn/iocoder/yudao/module/iot/common/enums/IotDeviceMessageIdentifierEnum.java → yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/enums/IotDeviceMessageIdentifierEnum.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.iot.common.enums;
+package cn.iocoder.yudao.module.iot.core.enums;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

yudao-module-iot/yudao-module-iot-core/yudao-module-iot-common/src/main/java/cn/iocoder/yudao/module/iot/common/enums/IotDeviceMessageTypeEnum.java → yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/enums/IotDeviceMessageTypeEnum.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.iot.common.enums;
+package cn.iocoder.yudao.module.iot.core.enums;
 
 import cn.iocoder.yudao.framework.common.core.ArrayValuable;
 import lombok.Getter;

yudao-module-iot/yudao-module-iot-core/yudao-module-iot-message-bus/src/main/java/cn/iocoder/yudao/module/iot/messagebus/config/IotMessageBusAutoConfiguration.java → yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/messagebus/config/IotMessageBusAutoConfiguration.java

@@ -1,8 +1,9 @@
-package cn.iocoder.yudao.module.iot.messagebus.config;
+package cn.iocoder.yudao.module.iot.core.messagebus.config;
 
-import cn.iocoder.yudao.module.iot.messagebus.core.IotMessageBus;
-import cn.iocoder.yudao.module.iot.messagebus.core.local.LocalIotMessageBus;
-import cn.iocoder.yudao.module.iot.messagebus.core.rocketmq.RocketMQIotMessageBus;
+import cn.iocoder.yudao.module.iot.core.messagebus.core.IotMessageBus;
+import cn.iocoder.yudao.module.iot.core.messagebus.core.local.LocalIotMessageBus;
+import cn.iocoder.yudao.module.iot.core.messagebus.core.rocketmq.RocketMQIotMessageBus;
+import cn.iocoder.yudao.module.iot.core.mq.producer.IotDeviceMessageProducer;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.rocketmq.spring.autoconfigure.RocketMQProperties;
 import org.apache.rocketmq.spring.core.RocketMQTemplate;
@@ -24,6 +25,11 @@ import org.springframework.context.annotation.Configuration;
 @Slf4j
 public class IotMessageBusAutoConfiguration {
 
+    @Bean
+    public IotDeviceMessageProducer deviceMessageProducer(IotMessageBus messageBus) {
+        return new IotDeviceMessageProducer(messageBus);
+    }
+
     // ==================== Local 实现 ====================
 
     @Configuration
@@ -46,6 +52,7 @@ public class IotMessageBusAutoConfiguration {
     public static class RocketMQIotMessageBusConfiguration {
 
         @Bean
+        @SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")
         public IotMessageBus rocketMQIotMessageBus(RocketMQProperties rocketMQProperties, RocketMQTemplate rocketMQTemplate) {
             log.info("[rocketMQIotMessageBus][创建 RocketMQ IoT 消息总线]");
             return new RocketMQIotMessageBus(rocketMQProperties, rocketMQTemplate);

yudao-module-iot/yudao-module-iot-core/yudao-module-iot-message-bus/src/main/java/cn/iocoder/yudao/module/iot/messagebus/config/IotMessageBusProperties.java → yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/messagebus/config/IotMessageBusProperties.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.iot.messagebus.config;
+package cn.iocoder.yudao.module.iot.core.messagebus.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

yudao-module-iot/yudao-module-iot-core/yudao-module-iot-message-bus/src/main/java/cn/iocoder/yudao/module/iot/messagebus/core/IotMessageBus.java → yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/messagebus/core/IotMessageBus.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.iot.messagebus.core;
+package cn.iocoder.yudao.module.iot.core.messagebus.core;
 
 /**
  * IoT 消息总线接口

yudao-module-iot/yudao-module-iot-core/yudao-module-iot-message-bus/src/main/java/cn/iocoder/yudao/module/iot/messagebus/core/IotMessageBusSubscriber.java → yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/messagebus/core/IotMessageBusSubscriber.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.iot.messagebus.core;
+package cn.iocoder.yudao.module.iot.core.messagebus.core;
 
 /**
  * IoT 消息总线订阅者接口

yudao-module-iot/yudao-module-iot-core/yudao-module-iot-message-bus/src/main/java/cn/iocoder/yudao/module/iot/messagebus/core/local/LocalIotMessage.java → yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/messagebus/core/local/LocalIotMessage.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.iot.messagebus.core.local;
+package cn.iocoder.yudao.module.iot.core.messagebus.core.local;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

yudao-module-iot/yudao-module-iot-core/yudao-module-iot-message-bus/src/main/java/cn/iocoder/yudao/module/iot/messagebus/core/local/LocalIotMessageBus.java → yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/messagebus/core/local/LocalIotMessageBus.java

@@ -1,8 +1,8 @@
-package cn.iocoder.yudao.module.iot.messagebus.core.local;
+package cn.iocoder.yudao.module.iot.core.messagebus.core.local;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.iocoder.yudao.module.iot.messagebus.core.IotMessageBus;
-import cn.iocoder.yudao.module.iot.messagebus.core.IotMessageBusSubscriber;
+import cn.iocoder.yudao.module.iot.core.messagebus.core.IotMessageBus;
+import cn.iocoder.yudao.module.iot.core.messagebus.core.IotMessageBusSubscriber;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.ApplicationContext;
@@ -12,8 +12,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
  * 本地的 {@link IotMessageBus} 实现类

yudao-module-iot/yudao-module-iot-core/yudao-module-iot-message-bus/src/main/java/cn/iocoder/yudao/module/iot/messagebus/core/rocketmq/RocketMQIotMessageBus.java → yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/messagebus/core/rocketmq/RocketMQIotMessageBus.java

@@ -1,9 +1,9 @@
-package cn.iocoder.yudao.module.iot.messagebus.core.rocketmq;
+package cn.iocoder.yudao.module.iot.core.messagebus.core.rocketmq;
 
 import cn.hutool.core.util.TypeUtil;
 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
-import cn.iocoder.yudao.module.iot.messagebus.core.IotMessageBus;
-import cn.iocoder.yudao.module.iot.messagebus.core.IotMessageBusSubscriber;
+import cn.iocoder.yudao.module.iot.core.messagebus.core.IotMessageBus;
+import cn.iocoder.yudao.module.iot.core.messagebus.core.IotMessageBusSubscriber;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

yudao-module-iot/yudao-module-iot-core/yudao-module-iot-common/src/main/java/cn/iocoder/yudao/module/iot/common/message/IotDeviceMessage.java → yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/mq/message/IotDeviceMessage.java

@@ -1,7 +1,7 @@
-package cn.iocoder.yudao.module.iot.common.message;
+package cn.iocoder.yudao.module.iot.core.mq.message;
 
-import cn.iocoder.yudao.module.iot.common.enums.IotDeviceMessageIdentifierEnum;
-import cn.iocoder.yudao.module.iot.common.enums.IotDeviceMessageTypeEnum;
+import cn.iocoder.yudao.module.iot.core.enums.IotDeviceMessageIdentifierEnum;
+import cn.iocoder.yudao.module.iot.core.enums.IotDeviceMessageTypeEnum;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/mq/producer/IotDeviceMessageProducer.java

@@ -0,0 +1,48 @@
+package cn.iocoder.yudao.module.iot.core.mq.producer;
+
+import cn.iocoder.yudao.module.iot.core.messagebus.core.IotMessageBus;
+import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * IoT 设备消息生产者
+ *
+ * @author 芋道源码
+ */
+@RequiredArgsConstructor
+public class IotDeviceMessageProducer {
+
+    /**
+     * 【消息总线】应用的设备消息 Topic，由 iot-gateway 发给 iot-biz 进行消费
+     */
+    private static final String MESSAGE_BUS_DEVICE_MESSAGE_TOPIC = "iot_device_message";
+
+    /**
+     * 【消息总线】设备消息 Topic，由 iot-biz 发送给 iot-gateway 的某个 “server”(protocol) 进行消费
+     *
+     * 其中，%s 就是该“server”(protocol) 的标识
+     */
+    private static final String MESSAGE_BUS_GATEWAY_DEVICE_MESSAGE_TOPIC = MESSAGE_BUS_DEVICE_MESSAGE_TOPIC + "/%s";
+
+    private final IotMessageBus messageBus;
+
+    /**
+     * 发送设备消息
+     *
+     * @param message 设备消息
+     */
+    public void sendDeviceMessage(IotDeviceMessage message) {
+        messageBus.post(MESSAGE_BUS_DEVICE_MESSAGE_TOPIC, message);
+    }
+
+    /**
+     * 发送网关设备消息
+     *
+     * @param server 网关的 server 标识
+     * @param message 设备消息
+     */
+    public void sendGatewayDeviceMessage(String server, Object message) {
+        messageBus.post(String.format(MESSAGE_BUS_GATEWAY_DEVICE_MESSAGE_TOPIC, server), message);
+    }
+
+}

yudao-module-iot/yudao-module-iot-core/src/main/resources/META-INF/spring.factories

@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+cn.iocoder.yudao.module.iot.core.messagebus.config.IotMessageBusAutoConfiguration 

yudao-module-iot/yudao-module-iot-core/yudao-module-iot-message-bus/src/test/java/cn/iocoder/yudao/module/iot/messagebus/core/TestMessage.java → yudao-module-iot/yudao-module-iot-core/src/test/java/cn/iocoder/yudao/module/iot/core/messagebus/core/TestMessage.java

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.iot.messagebus.core;
+package cn.iocoder.yudao.module.iot.core.messagebus.core;
 
 import lombok.Data;
 

yudao-module-iot/yudao-module-iot-core/yudao-module-iot-message-bus/src/test/java/cn/iocoder/yudao/module/iot/messagebus/core/local/LocalIotMessageBusIntegrationTest.java → yudao-module-iot/yudao-module-iot-core/src/test/java/cn/iocoder/yudao/module/iot/core/messagebus/core/local/LocalIotMessageBusIntegrationTest.java

@@ -1,8 +1,8 @@
-package cn.iocoder.yudao.module.iot.messagebus.core.local;
+package cn.iocoder.yudao.module.iot.core.messagebus.core.local;
 
-import cn.iocoder.yudao.module.iot.messagebus.config.IotMessageBusAutoConfiguration;
-import cn.iocoder.yudao.module.iot.messagebus.core.IotMessageBus;
-import cn.iocoder.yudao.module.iot.messagebus.core.IotMessageBusSubscriber;
+import cn.iocoder.yudao.module.iot.core.messagebus.config.IotMessageBusAutoConfiguration;
+import cn.iocoder.yudao.module.iot.core.messagebus.core.IotMessageBus;
+import cn.iocoder.yudao.module.iot.core.messagebus.core.IotMessageBusSubscriber;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Test;

yudao-module-iot/yudao-module-iot-core/yudao-module-iot-message-bus/src/test/java/cn/iocoder/yudao/module/iot/messagebus/core/rocketmq/RocketMQIotMessageBusTest.java → yudao-module-iot/yudao-module-iot-core/src/test/java/cn/iocoder/yudao/module/iot/core/messagebus/core/rocketmq/RocketMQIotMessageBusTest.java

@@ -1,17 +1,14 @@
-package cn.iocoder.yudao.module.iot.messagebus.core.rocketmq;
+package cn.iocoder.yudao.module.iot.core.messagebus.core.rocketmq;
 
 import cn.hutool.core.util.IdUtil;
-import cn.iocoder.yudao.module.iot.messagebus.config.IotMessageBusAutoConfiguration;
-import cn.iocoder.yudao.module.iot.messagebus.core.IotMessageBus;
-import cn.iocoder.yudao.module.iot.messagebus.core.IotMessageBusSubscriber;
-import cn.iocoder.yudao.module.iot.messagebus.core.TestMessage;
+import cn.iocoder.yudao.module.iot.core.messagebus.config.IotMessageBusAutoConfiguration;
+import cn.iocoder.yudao.module.iot.core.messagebus.core.IotMessageBus;
+import cn.iocoder.yudao.module.iot.core.messagebus.core.IotMessageBusSubscriber;
+import cn.iocoder.yudao.module.iot.core.messagebus.core.TestMessage;
 import jakarta.annotation.Resource;
-import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.rocketmq.spring.autoconfigure.RocketMQAutoConfiguration;
-import org.apache.rocketmq.spring.core.RocketMQTemplate;
 import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.Import;
 import org.springframework.test.context.TestPropertySource;

yudao-module-iot/yudao-module-iot-core/yudao-module-iot-common/pom.xml

@@ -1,26 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>yudao-module-iot-core</artifactId>
-        <groupId>cn.iocoder.boot</groupId>
-        <version>${revision}</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>yudao-module-iot-common</artifactId>
-    <packaging>jar</packaging>
-
-    <name>${project.artifactId}</name>
-    <description>
-        iot 模块下，提供通用的功能。
-        1. 跨 iot-biz 和 iot-gateway 的设备消息
-        2. 查询设备信息的通用 API
-    </description>
-
-    <dependencies>
-        <dependency>
-            <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-common</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>

yudao-module-iot/yudao-module-iot-core/yudao-module-iot-common/src/main/java/cn/iocoder/yudao/module/iot/common/enums/IotCommonConstants.java

@@ -1,22 +0,0 @@
-package cn.iocoder.yudao.module.iot.common.enums;
-
-/**
- * IoT 通用的枚举
- *
- * @author 芋道源码
- */
-public interface IotCommonConstants {
-
-    /**
-     * 【消息总线】应用的设备消息 Topic，由 iot-gateway 发给 iot-biz 进行消费
-     */
-    String MESSAGE_BUS_DEVICE_MESSAGE_TOPIC = "iot_device_message";
-
-    /**
-     * 【消息总线】设备消息 Topic，由 iot-biz 发送给 iot-gateway 的某个 “server”(protocol) 进行消费
-     *
-     * 其中，%s 就是该“server”(protocol) 的标识
-     */
-    String MESSAGE_BUS_GATEWAY_DEVICE_MESSAGE_TOPIC = MESSAGE_BUS_DEVICE_MESSAGE_TOPIC + "/%s";
-
-}

yudao-module-iot/yudao-module-iot-core/yudao-module-iot-message-bus/pom.xml

@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>yudao-module-iot-core</artifactId>
-        <groupId>cn.iocoder.boot</groupId>
-        <version>${revision}</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>yudao-module-iot-message-bus</artifactId>
-    <packaging>jar</packaging>
-
-    <name>${project.artifactId}</name>
-    <description>
-        iot 模块下，提供消息总线的功能。
-        可选择使用 spring event、redis stream、rocketmq、kafka、rabbitmq 等。
-    </description>
-
-    <dependencies>
-        <dependency>
-            <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-common</artifactId>
-        </dependency>
-
-        <!-- Spring 核心 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-        </dependency>
-
-        <!-- 消息中间件相关（可选依赖） -->
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-redis</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.rocketmq</groupId>
-            <artifactId>rocketmq-spring-boot-starter</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.amqp</groupId>
-            <artifactId>spring-rabbit</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.kafka</groupId>
-            <artifactId>spring-kafka</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <!-- 测试依赖 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>

yudao-module-iot/yudao-module-iot-core/yudao-module-iot-message-bus/src/main/resources/META-INF/spring.factories

@@ -1,2 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-cn.iocoder.yudao.module.iot.messagebus.config.IotMessageBusAutoConfiguration