```

feat(mqtt-core): 新增字符集类型枚举并重构发送事件类型新增 CharsetType 枚举用于处理不同字符集的字节转换，重命名 SendSuccessEventType 为 SendEventType 并添加 of 方法，移除不再使用的 SendFailEventType 枚举 feat(mqtt-integration): 增强消息发送器验证和日志记录功能在 MqttMessageSender 中添加参数校验逻辑，包括消息结构体、主题、内容、QOS 编码、保留标志、字符集和发送事件类型的非空检查，修改消息发送时使用字符集进行字节转换，优化日志输出格式 refactor(mqtt-integration): 移除接收模型中的事件字段从 ReceiveModel 中移除 successActionEvent 和 failActionEvent 字段，更新 MqttMessageReceiver 中的消息处理逻辑 feat(mqtt-core): 添加订阅模型和主题服务接口方法新增 SubscribeModel 数据模型，扩展 MqttTopicService 接口以支持通过订阅模型进行主题订阅 feat(mqtt-integration): 实现基于订阅模型的主题订阅功能在 MqttTopicManager 中实现基于 SubscribeModel 的主题订阅方法 ```

```
feat(mqtt-core): 新增字符集类型枚举并重构发送事件类型新增 CharsetType 枚举用于处理不同字符集的字节转换，重命名 SendSuccessEventType 为 SendEventType 并添加 of 方法，移除不再使用的 SendFailEventType 枚举 feat(mqtt-integration): 增强消息发送器验证和日志记录功能在 MqttMessageSender 中添加参数校验逻辑，包括消息结构体、主题、内容、QOS 编码、保留标志、字符集和发送事件类型的非空检查，修改消息发送时使用字符集进行字节转换，优化日志输出格式 refactor(mqtt-integration): 移除接收模型中的事件字段从 ReceiveModel 中移除 successActionEvent 和 failActionEvent 字段，更新 MqttMessageReceiver 中的消息处理逻辑 feat(mqtt-core): 添加订阅模型和主题服务接口方法新增 SubscribeModel 数据模型，扩展 MqttTopicService 接口以支持通过订阅模型进行主题订阅 feat(mqtt-integration): 实现基于订阅模型的主题订阅功能在 MqttTopicManager 中实现基于 SubscribeModel 的主题订阅方法 ```
zhangmeiyang
1 parent 49ba958f
Showing 9 changed files with 92 additions and 34 deletions
mqtt-core/src/main/java/com/diligrp/mqtt/core/model/ReceiveModel.java
mqtt-core/src/main/java/com/diligrp/mqtt/core/model/SendModel.java
mqtt-core/src/main/java/com/diligrp/mqtt/core/service/MqttTopicService.java
mqtt-core/src/main/java/com/diligrp/mqtt/core/type/CharsetType.java
mqtt-core/src/main/java/com/diligrp/mqtt/core/type/SendFailEventType.java → mqtt-core/src/main/java/com/diligrp/mqtt/core/type/SendEventType.java
mqtt-core/src/main/java/com/diligrp/mqtt/core/type/SendSuccessEventType.java
mqtt-integration/src/main/java/com/diligrp/mqtt/integration/handler/MqttMessageReceiver.java
mqtt-integration/src/main/java/com/diligrp/mqtt/integration/handler/MqttMessageSender.java
mqtt-integration/src/main/java/com/diligrp/mqtt/integration/manager/MqttTopicManager.java
@@ -43,13 +43,4 @@ public class ReceiveModel {
      * 时间戳
      */
     private Long timestamp;
-    /**
-     * 成功行动活动
-     */
-    private String successActionEvent;
-
-    /**
-     * 失败动作事件
-     */
-    private String failActionEvent;
 }
@@ -28,13 +28,13 @@ public class SendModel {
      */
     private Map<String, Object> payload;
     /**
-     * 成功行动活动
+     * 发送成功事件类型
      */
-    private String successActionEvent;
+    private String sendEventType;
     /**
-     * 失败动作事件
+     * 字符集类型
      */
-    private String failActionEvent;
+    private String charsetType;
     public static SendModel withDefault() {
         var model = new SendModel();
 package com.diligrp.mqtt.core.service;
+import com.diligrp.mqtt.core.model.SubscribeModel;
+
 import java.util.HashSet;
 public interface MqttTopicService {
@@ -13,6 +15,13 @@ public interface MqttTopicService {
     void subscribeTopic(String topic, int qos);
     /**
+     * 订阅主题
+     *
+     * @param subscribeModel 订阅模式
+     */
+    void subscribeTopic(SubscribeModel subscribeModel);
+
+    /**
      * 取消订阅主题
      *
      * @param topic 主题
+package com.diligrp.mqtt.core.type;
+
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * @Author: zhangmeiyang
+ * @CreateTime: 2026-01-14 17:34
+ * @Version: todo
+ */
+public enum CharsetType {
+
+    UTF_8("UTF-8") {
+        @Override
+        public byte[] getBytes(String str) {
+            return str.getBytes(StandardCharsets.UTF_8);
+        }
+    },
+    GBK("GBK") {
+        @Override
+        public byte[] getBytes(String str) {
+            return str.getBytes(Charset.forName("GBK"));
+        }
+    };
+    public final String code;
+
+    CharsetType(String code) {
+        this.code = code;
+    }
+
+    public abstract byte[] getBytes(String str);
+
+    public static CharsetType of(String charset) {
+        for (CharsetType value : values()) {
+            if (value.name().equals(charset)) {
+                return value;
+            }
+        }
+        throw new IllegalArgumentException("不支持的字符集类型：" + charset);
+    }
+}
 package com.diligrp.mqtt.core.type;
-public enum SendFailEventType {
+public enum SendEventType {
     PRINTER("printer");
     public final String value;
-    SendFailEventType(String value) {
+    SendEventType(String value) {
         this.value = value;
     }
+
+    public static SendEventType of(String value) {
+        for (SendEventType type : values()) {
+            if (type.value.equals(value)) {
+                return type;
+            }
+        }
+        throw new IllegalArgumentException("No matching constant for [" + value + "]");
+    }
 }
-package com.diligrp.mqtt.core.type;
-
-public enum SendSuccessEventType {
-
-    PRINTER("printer");
-    public final String value;
-
-    SendSuccessEventType(String value) {
-        this.value = value;
-    }
-}
@@ -3,6 +3,7 @@ package com.diligrp.mqtt.integration.handler;
 import com.diligrp.mqtt.core.event.RecFailEvent;
 import com.diligrp.mqtt.core.event.RecSuccessEvent;
 import com.diligrp.mqtt.core.model.ReceiveModel;
+import com.diligrp.mqtt.core.util.JsonUtils;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.ApplicationEventPublisher;
@@ -37,6 +38,7 @@ public class MqttMessageReceiver {
      */
     @ServiceActivator(inputChannel = "mqttInboundChannel")
     public void handleMqttMessage(Message<?> message) {
+        log.info("收到MQTT消息 - :{}", JsonUtils.toJsonString(message));
         try {
             String topic = message.getHeaders().get(TOPIC_HEADER, String.class);
             Integer qos = message.getHeaders().get(QOS_HEADER, Integer.class);
@@ -45,8 +47,6 @@ public class MqttMessageReceiver {
             Long timestamp = message.getHeaders().get(TIMESTAMP_HEADER, Long.class);
             Integer mqttId = message.getHeaders().get(MQTT_ID_HEADER, Integer.class);
             Boolean duplicate = message.getHeaders().get(MQTT_DUPLICATE_HEADER, Boolean.class);
-            String successEvent = message.getHeaders().get(SUCCESS_EVENT_HEADER, String.class);
-            String failEvent = message.getHeaders().get(FAIL_EVENT_HEADER, String.class);
             String payload = message.getPayload().toString();
             var receiveModel = new ReceiveModel();
             receiveModel.setId(id);
@@ -57,9 +57,6 @@ public class MqttMessageReceiver {
             receiveModel.setDuplicate(duplicate);
             receiveModel.setPayload(payload);
             receiveModel.setTimestamp(timestamp);
-            receiveModel.setSuccessActionEvent(successEvent);
-            receiveModel.setFailActionEvent(failEvent);
-            log.info("收到MQTT消息 - :{}", receiveModel);
             applicationEventPublisher.publishEvent(new RecSuccessEvent(this, receiveModel));
         } catch (Exception e) {
             log.error("处理MQTT消息失败", e);
@@ -2,8 +2,10 @@ package com.diligrp.mqtt.integration.handler;
 import com.diligrp.mqtt.core.event.SendFailEvent;
 import com.diligrp.mqtt.core.event.SendSuccessEvent;
+import com.diligrp.mqtt.core.exception.MqttServiceException;
 import com.diligrp.mqtt.core.model.SendModel;
 import com.diligrp.mqtt.core.service.MqttMessageService;
+import com.diligrp.mqtt.core.type.CharsetType;
 import com.diligrp.mqtt.core.util.JsonUtils;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
@@ -34,9 +36,17 @@ public class MqttMessageSender implements MqttMessageService {
     @Override
     public void sendMessage(SendModel sendModel) {
+        Optional.ofNullable(sendModel).orElseThrow(()->new MqttServiceException("消息结构体不能为空"));
+        Optional.ofNullable(sendModel.getTopic()).filter(e -> !e.isEmpty()).orElseThrow(()->new MqttServiceException("【消息主题】不能为空"));
+        Optional.ofNullable(sendModel.getPayload()).orElseThrow(()->new MqttServiceException("【消息内容】不能为空"));
+        Optional.ofNullable(sendModel.getQos()).filter(e -> e >= 0 && e <= 2).orElseThrow(()->new MqttServiceException("【QOS编码】错误"));
+        Optional.ofNullable(sendModel.getRetained()).orElseThrow(()->new MqttServiceException("【消息是否保留】不能为空"));
+        Optional.ofNullable(sendModel.getCharsetType()).orElseThrow(()->new MqttServiceException("【发送消息字符集】不能为空"));
+        Optional.ofNullable(sendModel.getSendEventType()).orElseThrow(()->new MqttServiceException("【发送事件标识】不能为空"));
         try {
             String payload = JsonUtils.toJsonString(sendModel.getPayload());
-            var message = MessageBuilder.withPayload(payload)
+            byte[] bytes = CharsetType.of(sendModel.getCharsetType()).getBytes(payload);
+            var message = MessageBuilder.withPayload(bytes)
                     .setHeader(MessageHeaders.CONTENT_TYPE, MimeTypeUtils.TEXT_PLAIN)
                     .setHeader(MQTT_TOPIC, sendModel.getTopic())
                     .setHeader(MQTT_QOS, sendModel.getQos())
@@ -44,10 +54,10 @@ public class MqttMessageSender implements MqttMessageService {
                     .build();
             boolean result = mqttOutboundChannel.send(message);
             Optional.of(result).filter(e -> e).ifPresentOrElse(send -> {
-                log.info("消息发送成功 - :{}", message);
+                log.info("消息发送成功 - :{}", JsonUtils.toJsonString(message));
                 applicationEventPublisher.publishEvent(new SendSuccessEvent(this, sendModel));
             }, () -> {
-                log.error("消息发送失败 - :{}", message);
+                log.error("消息发送失败 - :{}", JsonUtils.toJsonString(message));
                 applicationEventPublisher.publishEvent(new SendFailEvent(this, sendModel));
             });
         } catch (Exception e) {
 package com.diligrp.mqtt.integration.manager;
+import com.diligrp.mqtt.core.model.SubscribeModel;
 import com.diligrp.mqtt.core.service.MqttTopicService;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
@@ -21,6 +22,17 @@ public class MqttTopicManager implements MqttTopicService {
     @Resource
     private MqttPahoMessageDrivenChannelAdapter mqttMessageDrivenChannelAdapter;
+
+    /**
+     * 订阅主题
+     *
+     * @param subscribeModel 订阅模式
+     */
+    @Override
+    public void subscribeTopic(SubscribeModel subscribeModel) {
+        subscribeTopic(subscribeModel.getTopic(), subscribeModel.getQos());
+    }
+
     /**
      * 动态订阅Topic
      *