增加消息的公共common

pom.xml

@@ -424,6 +424,7 @@
         <module>ruoyi-common</module>
         <module>ruoyi-example</module>
         <module>ruoyi-server</module>
+        <module>ruoyi-common/ruoyi-common-message</module>
     </modules>
     <packaging>pom</packaging>
 

ruoyi-common/ruoyi-common-message/pom.xml

@@ -0,0 +1,28 @@
+<?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>ruoyi-cloud-plus</artifactId>
+        <groupId>org.dromara</groupId>
+        <version>2.2.0</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-common-message</artifactId>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

ruoyi-common/ruoyi-common-message/src/main/java/org/dromara/message/kafka/constant/MessageEventTypeEnum.java

@@ -0,0 +1,82 @@
+package org.dromara.message.kafka.constant;
+
+/**
+ * 消息 的event type
+ */
+public enum MessageEventTypeEnum {
+    ptParameter_ADD("YKT_101_ADD","系统参数新增","业务参数-系统参数"),
+    ptParameter_EDIT("YKT_101_EDIT","系统参数修改","业务参数-系统参数"),
+    ptParameter_REMOVE("YKT_101_REMOVE","系统参数删除","业务参数-系统参数"),
+    ptMealtype_ADD("YKT_103_ADD","营业时段新增","业务参数-营业时段"),
+    ptMealtype_EDIT("YKT_103_EDIT","营业时段修改","业务参数-营业时段"),
+    ptMealtype_REMOVE("YKT_103_REMOVE","营业时段删除","业务参数-营业时段"),
+    ptRoom_ADD("YKT_105_ADD","房间新增","房间信息"),
+    ptRoom_EDIT("YKT_105_EDIT","房间修改","房间信息"),
+    ptRoom_REMOVE("YKT_105_REMOVE","房间删除","房间信息"),
+    ptArea_ADD("YKT_106_ADD","区域新增","房间信息"),
+    ptArea_EDIT("YKT_106_EDIT","区域修改","房间信息"),
+    ptArea_REMOVE("YKT_106_REMOVE","区域删除","房间信息"),
+    ptAccount_ADD("YKT_120_ADD","结算账户新增","商户信息-结算账户"),
+    ptAccount_EDIT("YKT_120_EDIT","结算账户修改","商户信息-结算账户"),
+    ptAccount_REMOVE("YKT_120_REMOVE","结算账户删除","商户信息-结算账户"),
+    ptUserAccount_OPEN_EDIT("YKT_107_EDIT","开户","支付管理-账户管理"),
+    ptUserAccount_CLOSE_EDIT("YKT_107_EDIT","销户","支付管理-账户管理"),
+    ptUserAccount_FREEZE_EDIT("YKT_107_EDIT","冻结","支付管理-账户管理"),
+    ptUserAccount_UNFREEZE_EDIT("YKT_107_EDIT","解冻","支付管理-账户管理"),
+    ptUserAccount_RESETTIME_EDIT("YKT_108_EDIT","重置有效期","支付管理-账户管理"),
+    ptUserAccount_RESETTYPE_EDIT("YKT_107_EDIT","重置卡类别","支付管理-账户管理"),
+    user_ADD("YKT_107_ADD","用户新增","系统权限-用户管理"),
+    ptCard_CHARGE_EDIT("YKT_109_EDIT","充值","卡务中心-卡务操作"),
+    ptCard_refund_EDIT("YKT_110_EDIT","退款","卡务中心-卡务操作"),
+    ptCard_supply_EDIT("YKT_111_EDIT","错扣补款","卡务中心-卡务操作"),
+    ptCard_multicharge_EDIT("YKT_109_EDIT","批量充值","卡务中心-卡务操作"),
+    ptCard_multirefund_EDIT("YKT_110_EDIT","批量退款","卡务中心-卡务操作"),
+    ptCard_multiSet_EDIT("YKT_111_EDIT","批量设置余额","卡务中心-卡务操作"),
+    ptCard_card_EDIT("YKT_108_EDIT","卡片挂失/解挂","卡务中心-卡务操作"),
+    subsidy_EDIT("YKT_109_EDIT","补助定时任务","补助管理"),
+    xfTerm_ADD("YKT_112_ADD","设备新增","消费系统-消费设备"),
+    xfTerm_EDIT("YKT_112_EDIT","设备修改","消费系统-消费设备"),
+    xfTerm_REMOVE("YKT_112_REMOVE","设备删除","消费系统-消费设备"),
+    xfTerm_param_EDIT("YKT_113_EDIT","设备参数设置","消费系统-消费设备"),
+    xfDiscount_ADD("YKT_114_ADD","折扣新增","消费设备-折扣管理"),
+    xfDiscount_EDIT("YKT_114_EDIT","折扣修改","消费设备-折扣管理"),
+    xfDiscount_REMOVE("YKT_114_REMOVE","折扣删除","消费设备-折扣管理"),
+    xfDiscountterm_EDIT("YKT_115_EDIT","设备绑定","消费设备-折扣管理"),
+    xfQuota_ADD("YKT_116_ADD","限额新增","消费设备-限额管理"),
+    xfQuota_EDIT("YKT_116_EDIT","限额修改","消费设备-限额管理"),
+    xfQuota_REMOVE("YKT_116_REMOVE","限额删除","消费设备-限额管理"),
+    xfQuotaterm_EDIT("YKT_117_EDIT","设备绑定","消费设备-限额管理"),
+    xfLimited_ADD("YKT_118_ADD","限次新增","消费设备-限次管理"),
+    xfLimited_EDIT("YKT_118_EDIT","限次修改","消费设备-限次管理"),
+    xfLimited_REMOVE("YKT_118_REMOVE","限次删除","消费设备-限次管理"),
+    xfLimitedterm_EDIT("YKT_119_EDIT","设备绑定","消费设备-限次管理"),
+    CLIENT_consumer_ADD("CLIENT_101_ADD","消费扣费","刷卡消费");
+
+
+
+    private final String type;
+    private final String name;
+
+    private final String belong;
+
+    MessageEventTypeEnum(String code, String name, String belong) {
+        this.type = code;
+        this.name = name;
+        this.belong = belong;
+    }
+
+    public String type() {
+        return this.type;
+    }
+
+    public String message() {
+        return this.name;
+    }
+
+
+    @Override
+    public String toString() {
+        return this.name();
+    }
+
+}

ruoyi-server/ruoyi-server-common/src/main/java/org/dromara/server/common/domain/bo/KafkaHeader.java → ruoyi-common/ruoyi-common-message/src/main/java/org/dromara/message/kafka/domain/KafkaHeader.java

@@ -1,4 +1,4 @@
-package org.dromara.server.common.domain.bo;
+package org.dromara.message.kafka.domain;
 
 import lombok.Data;
 
@@ -30,4 +30,8 @@ public class KafkaHeader {
      * 事件Id
      */
     private String eventId;
+    /**
+     * 租户编号
+     */
+    private String tenantId;
 }

ruoyi-server/ruoyi-server-common/src/main/java/org/dromara/server/common/domain/bo/KafkaMessage.java → ruoyi-common/ruoyi-common-message/src/main/java/org/dromara/message/kafka/domain/KafkaMessage.java

@@ -1,4 +1,4 @@
-package org.dromara.server.common.domain.bo;
+package org.dromara.message.kafka.domain;
 
 import lombok.Data;
 /**

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/mq/domain/bo/KafkaHeader.java

@@ -30,4 +30,9 @@ public class KafkaHeader {
      * 事件Id
      */
     private String eventId;
+
+    /**
+     * 租户编号
+     */
+    private String tenantId;
 }

ruoyi-server/ruoyi-server-common/pom.xml

@@ -19,8 +19,9 @@
     <dependencies>
 
         <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-message</artifactId>
+            <version>${revision}</version>
         </dependency>
     </dependencies>
 </project>

ruoyi-server/ruoyi-server-mqdata/src/main/java/org/dromara/server/mq/consumer/KafkaConsumer.java

@@ -5,7 +5,7 @@ import cn.hutool.json.JSONUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.dromara.server.common.domain.bo.KafkaMessage;
+import org.dromara.message.kafka.domain.KafkaMessage;
 import org.dromara.server.mq.event.kafka.EventStrategyContext;
 import org.springframework.kafka.annotation.KafkaListener;
 
@@ -35,6 +35,7 @@ public class KafkaConsumer {
             eventStrategyContext.doMsgHandle(eventType, eventMsg);
         } catch (Exception e) {
             log.error("[kafka消息处理失败]-[消息:{}-[错误:{}]", receiveMsg, e.getMessage());
+
         }
     }
 }