```

feat(mqtt): 添加接收事件类型枚举并重构消息处理逻辑 - 引入ReceiveEventType枚举替代原有的RecFailEventType和RecSuccessEventType - 在ReceiveModel中添加receiveEventType字段用于标识事件类型 - 实现matchEventType方法根据MQTT主题自动匹配事件类型 - 移除MqttMessageReceiver中的冗余常量定义 - 重命名RecFailEventType为ReceiveEventType并扩展支持多种服务类型 ```

```
feat(mqtt): 添加接收事件类型枚举并重构消息处理逻辑 - 引入ReceiveEventType枚举替代原有的RecFailEventType和RecSuccessEventType - 在ReceiveModel中添加receiveEventType字段用于标识事件类型 - 实现matchEventType方法根据MQTT主题自动匹配事件类型 - 移除MqttMessageReceiver中的冗余常量定义 - 重命名RecFailEventType为ReceiveEventType并扩展支持多种服务类型 ```
zhangmeiyang
1 parent 2e676e7c
Showing 5 changed files with 39 additions and 27 deletions
mqtt-core/src/main/java/com/diligrp/mqtt/core/model/ReceiveModel.java
mqtt-core/src/main/java/com/diligrp/mqtt/core/type/RecFailEventType.java
mqtt-core/src/main/java/com/diligrp/mqtt/core/type/RecSuccessEventType.java
mqtt-core/src/main/java/com/diligrp/mqtt/core/type/ReceiveEventType.java
mqtt-integration/src/main/java/com/diligrp/mqtt/integration/handler/MqttMessageReceiver.java
 package com.diligrp.mqtt.core.model;
+import com.diligrp.mqtt.core.type.ReceiveEventType;
 import lombok.Data;
 import java.util.UUID;
@@ -43,4 +44,8 @@ public class ReceiveModel {
      * 时间戳
      */
     private Long timestamp;
+    /**
+     * 接收事件类型
+     */
+    private ReceiveEventType receiveEventType;
 }
-package com.diligrp.mqtt.core.type;
-
-public enum RecFailEventType {
-    PRINTER("printer");
-    public final String value;
-
-    RecFailEventType(String value) {
-        this.value = value;
-    }
-}
-package com.diligrp.mqtt.core.type;
-
-/**
- * @Author: zhangmeiyang
- * @CreateTime: 2026-01-14 16:59
- * @Version: todo
- */
-public enum RecSuccessEventType {
-    PRINTER("printer");
-    public final String value;
-
-    RecSuccessEventType(String value) {
-        this.value = value;
-    }
-}
+package com.diligrp.mqtt.core.type;
+
+import java.util.Objects;
+
+public enum ReceiveEventType {
+    PRINTER_RECEIPT_SERVICE("/printSucc/"),
+    PRINTER_ONLINE_SERVICE("/priGoOnline/"),
+    UNKNOWN_SERVICE("unknownService");
+    public final String value;
+
+    ReceiveEventType(String value) {
+        this.value = value;
+    }
+
+    /**
+     * 根据MQTT主题匹配事件类型
+     *
+     * @param topic MQTT主题
+     * @return 匹配的事件类型，未匹配成功则返回null
+     */
+    public static ReceiveEventType matchEventType(String topic) {
+        if (Objects.isNull(topic)) {
+            return UNKNOWN_SERVICE;
+        }
+        for (ReceiveEventType eventType : ReceiveEventType.values()) {
+            if (topic.startsWith(eventType.value)) {
+                return eventType;
+            }
+        }
+        return UNKNOWN_SERVICE;
+    }
+}
@@ -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.type.ReceiveEventType;
 import com.diligrp.mqtt.core.util.JsonUtils;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
@@ -27,8 +28,6 @@ public class MqttMessageReceiver {
     private static final String TOPIC_HEADER = "mqtt_receivedTopic";
     private static final String QOS_HEADER = "mqtt_receivedQos";
     private static final String TIMESTAMP_HEADER = "timestamp";
-    private static final String SUCCESS_EVENT_HEADER = "mqtt_success_event";
-    private static final String FAIL_EVENT_HEADER = "mqtt_fail_event";
     @Resource
     private ApplicationEventPublisher applicationEventPublisher;
@@ -57,6 +56,7 @@ public class MqttMessageReceiver {
             receiveModel.setDuplicate(duplicate);
             receiveModel.setPayload(payload);
             receiveModel.setTimestamp(timestamp);
+            receiveModel.setReceiveEventType(ReceiveEventType.matchEventType(topic));
             applicationEventPublisher.publishEvent(new RecSuccessEvent(this, receiveModel));
         } catch (Exception e) {
             log.error("处理MQTT消息失败", e);