数据同步消息发送:账户管理

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

@@ -99,7 +99,7 @@ public class MessageEventTypeConstants {
     public static final String	ptUserAccount_OPEN_EDIT = "YKT_107_OPEN";
     public static final String	ptUserAccount_CLOSE_EDIT = "YKT_107_CLOSE";
     public static final String	ptUserAccount_FREEZE_EDIT = "YKT_107_FREEZE";
-    public static final String	ptUserAccount_UNFREEZE_EDIT = "YKT_107_FREEZE";
+    public static final String	ptUserAccount_UNFREEZE_EDIT = "YKT_107_UNFREEZE";
     public static final String	ptUserAccount_RESETTIME_EDIT = "YKT_108_RESET_TIME";
     public static final String	ptUserAccount_RESETTYPE_EDIT = "YKT_107_RESET_TYPE";
     public static final String	user_ADD = "YKT_107_ADD";

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/aop/annotation/SyncDataToLocal.java

@@ -17,4 +17,9 @@ public @interface SyncDataToLocal {
      */
     String eventType() default "";
 
+    /**
+     * 功能标识: 消息的发送方
+     */
+    String sender() default "";
+
 }

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/aop/aspect/SyncDataToLocalAspect.java

@@ -44,7 +44,6 @@ public class SyncDataToLocalAspect {
      */
     @AfterReturning(pointcut = "@annotation(syncDataToLocal)", returning = "jsonResult")
     public void doAfterReturning(JoinPoint joinPoint, SyncDataToLocal syncDataToLocal, Object jsonResult) {
-//        System.err.println("进入呢么？");
         if (jsonResult instanceof R<?> r) {
             if (r.getCode() == R.SUCCESS) {
                 sendSyncMessage(joinPoint, syncDataToLocal);
@@ -64,6 +63,7 @@ public class SyncDataToLocalAspect {
             header.setTimestamp(System.currentTimeMillis());
             header.setEventId(UUID.randomUUID().toString());
             header.setEventType(controllerSyncData2Local.eventType());
+            header.setSender(controllerSyncData2Local.sender());
             String sender = header.getSender();
             String eventType = header.getEventType();
             if(StringUtils.isBlank(sender) && StringUtils.isNotBlank(eventType)){

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/controller/PtAccountController.java

@@ -6,6 +6,7 @@ import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.backstage.aop.annotation.SyncDataToLocal;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -22,6 +23,8 @@ import org.dromara.backstage.basics.domain.bo.PtAccountBo;
 import org.dromara.backstage.basics.service.IPtAccountService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
+import static org.dromara.common.message.kafka.constant.MessageEventTypeConstants.*;
+
 /**
  * 结算账户
  * 前端访问路由地址为:/backstage/merchant/ptAccount
@@ -75,6 +78,7 @@ public class PtAccountController extends BaseController {
     @SaCheckPermission("merchant:ptAccount:add")
     @Log(title = "结算账户", businessType = BusinessType.INSERT)
     @RepeatSubmit()
+    @SyncDataToLocal(eventType = ptAccount_ADD, sender = ACCOUNT_SENDER)
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody PtAccountBo bo) {
         return toAjax(ptAccountService.insertByBo(bo));
@@ -86,6 +90,7 @@ public class PtAccountController extends BaseController {
     @SaCheckPermission("merchant:ptAccount:edit")
     @Log(title = "结算账户", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
+    @SyncDataToLocal(eventType = ptAccount_EDIT, sender = ACCOUNT_SENDER)
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody PtAccountBo bo) {
         return toAjax(ptAccountService.updateByBo(bo));
@@ -98,6 +103,7 @@ public class PtAccountController extends BaseController {
      */
     @SaCheckPermission("merchant:ptAccount:remove")
     @Log(title = "结算账户", businessType = BusinessType.DELETE)
+    @SyncDataToLocal(eventType = ptAccount_REMOVE, sender = ACCOUNT_SENDER)
     @DeleteMapping("/{accountIds}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] accountIds) {

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/controller/PtAreaController.java

@@ -7,13 +7,11 @@ import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import org.dromara.backstage.aop.annotation.SyncDataToLocal;
-import org.dromara.common.message.kafka.constant.MessageEventTypeConstants;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
@@ -23,6 +21,8 @@ import org.dromara.backstage.basics.domain.vo.PtAreaVo;
 import org.dromara.backstage.basics.domain.bo.PtAreaBo;
 import org.dromara.backstage.basics.service.IPtAreaService;
 
+import static org.dromara.common.message.kafka.constant.MessageEventTypeConstants.*;
+
 /**
  * 建筑物区域
  * 前端访问路由地址为:/room/ptArea
@@ -77,7 +77,7 @@ public class PtAreaController extends BaseController {
     @SaCheckPermission("room:ptArea:add")
     @Log(title = "建筑物区域", businessType = BusinessType.INSERT)
     @RepeatSubmit()
-    @SyncDataToLocal(eventType = MessageEventTypeConstants.ptArea_ADD)
+    @SyncDataToLocal(eventType = ptArea_ADD, sender = AREA_SENDER)
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody PtAreaBo bo) {
         return toAjax(ptAreaService.insertByBo(bo));
@@ -89,7 +89,7 @@ public class PtAreaController extends BaseController {
     @SaCheckPermission("room:ptArea:edit")
     @Log(title = "建筑物区域", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
-    @SyncDataToLocal(eventType = MessageEventTypeConstants.ptArea_EDIT)
+    @SyncDataToLocal(eventType = ptArea_EDIT, sender = AREA_SENDER)
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody PtAreaBo bo) {
         return toAjax(ptAreaService.updateByBo(bo));
@@ -102,7 +102,7 @@ public class PtAreaController extends BaseController {
      */
     @SaCheckPermission("room:ptArea:remove")
     @Log(title = "建筑物区域", businessType = BusinessType.DELETE)
-    @SyncDataToLocal(eventType = MessageEventTypeConstants.ptArea_REMOVE)
+    @SyncDataToLocal(eventType = ptArea_REMOVE,sender = AREA_SENDER)
     @DeleteMapping("/{areaIds}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] areaIds) {

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/controller/PtMealtypeController.java

@@ -24,6 +24,8 @@ import org.dromara.backstage.basics.domain.bo.PtMealTypeBo;
 import org.dromara.backstage.basics.service.IPtMealtypeService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
+import static org.dromara.common.message.kafka.constant.MessageEventTypeConstants.*;
+
 /**
  * 营业时段
  * 前端访问路由地址为:/basicParameter/ptMealtype
@@ -83,7 +85,7 @@ public class PtMealtypeController extends BaseController {
     @SaCheckPermission("basicParameter:ptMealtype:add")
     @Log(title = "营业时段", businessType = BusinessType.INSERT)
     @RepeatSubmit()
-    @SyncDataToLocal(eventType = MessageEventTypeConstants.ptMealtype_ADD)
+    @SyncDataToLocal(eventType = ptMealtype_ADD,sender = MEAL_TYPE_SENDER)
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody PtMealTypeBo bo) {
         return toAjax(ptMealtypeService.insertByBo(bo));
@@ -95,7 +97,7 @@ public class PtMealtypeController extends BaseController {
     @SaCheckPermission("basicParameter:ptMealtype:edit")
     @Log(title = "营业时段", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
-    @SyncDataToLocal(eventType = MessageEventTypeConstants.ptMealtype_EDIT)
+    @SyncDataToLocal(eventType = ptMealtype_EDIT, sender = MEAL_TYPE_SENDER)
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody PtMealTypeBo bo) {
         return toAjax(ptMealtypeService.updateByBo(bo));
@@ -109,7 +111,7 @@ public class PtMealtypeController extends BaseController {
     @SaCheckPermission("basicParameter:ptMealtype:remove")
     @Log(title = "营业时段", businessType = BusinessType.DELETE)
     @DeleteMapping("/{mealIds}")
-    @SyncDataToLocal(eventType = MessageEventTypeConstants.ptMealtype_REMOVE)
+    @SyncDataToLocal(eventType = ptMealtype_REMOVE,sender = MEAL_TYPE_SENDER)
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] mealIds) {
         return toAjax(ptMealtypeService.deleteWithValidByIds(List.of(mealIds), true));

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/controller/PtParameterController.java

@@ -7,7 +7,6 @@ import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import org.dromara.backstage.aop.annotation.SyncDataToLocal;
-import org.dromara.common.message.kafka.constant.MessageEventTypeConstants;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -24,6 +23,8 @@ import org.dromara.backstage.basics.domain.bo.PtParameterBo;
 import org.dromara.backstage.basics.service.IPtParameterService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
+import static org.dromara.common.message.kafka.constant.MessageEventTypeConstants.*;
+
 /**
  * 系统参数
  * 前端访问路由地址为:/basicParameter/ptParameter
@@ -77,7 +78,7 @@ public class PtParameterController extends BaseController {
     @SaCheckPermission("basicParameter:ptParameter:add")
     @Log(title = "系统参数", businessType = BusinessType.INSERT)
     @RepeatSubmit()
-    @SyncDataToLocal(eventType = MessageEventTypeConstants.ptParameter_ADD)
+    @SyncDataToLocal(eventType = ptParameter_ADD, sender = PARAMETER_SENDER)
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody PtParameterBo bo) {
         return toAjax(ptParameterService.insertByBo(bo));
@@ -91,7 +92,7 @@ public class PtParameterController extends BaseController {
     @SaCheckPermission("basicParameter:ptParameter:remove")
     @Log(title = "系统参数", businessType = BusinessType.DELETE)
     @DeleteMapping("/{paramIds}")
-    @SyncDataToLocal(eventType = MessageEventTypeConstants.ptParameter_REMOVE)
+    @SyncDataToLocal(eventType = ptParameter_REMOVE,sender = PARAMETER_SENDER)
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] paramIds) {
         return toAjax(ptParameterService.deleteWithValidByIds(List.of(paramIds), true));
@@ -103,7 +104,7 @@ public class PtParameterController extends BaseController {
     @SaCheckPermission("basicParameter:ptParameter:edit")
     @Log(title = "系统参数", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
-    @SyncDataToLocal(eventType = MessageEventTypeConstants.ptParameter_EDIT)
+    @SyncDataToLocal(eventType = ptParameter_EDIT, sender = PARAMETER_SENDER)
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody PtParameterBo bo) {
         return toAjax(ptParameterService.updateByBo(bo));

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/controller/PtRoomController.java

@@ -36,6 +36,8 @@ import org.dromara.backstage.basics.service.IPtRoomService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.springframework.web.multipart.MultipartFile;
 
+import static org.dromara.common.message.kafka.constant.MessageEventTypeConstants.*;
+
 /**
  * 房间定义
  * 前端访问路由地址为:/room/ptRoom
@@ -117,7 +119,7 @@ public class PtRoomController extends BaseController {
      */
     @SaCheckPermission("room:ptRoom:add")
     @Log(title = "房间定义", businessType = BusinessType.INSERT)
-    @SyncDataToLocal(eventType = MessageEventTypeConstants.ptRoom_ADD)
+    @SyncDataToLocal(eventType = ptRoom_ADD, sender = ROOM_SENDER)
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody PtRoomBo bo) {
@@ -129,7 +131,7 @@ public class PtRoomController extends BaseController {
      */
     @SaCheckPermission("room:ptRoom:set")
     @Log(title = "批量设置房间类型", businessType = BusinessType.OTHER)
-    @SyncDataToLocal(eventType = MessageEventTypeConstants.ptRoom_SET)
+    @SyncDataToLocal(eventType = ptRoom_SET,sender = ROOM_SENDER)
     @RepeatSubmit()
     @PostMapping("/batchSet")
     public R<Void> batchSet(@Validated @RequestBody PtRoomBatchSetBo bo) {
@@ -144,7 +146,7 @@ public class PtRoomController extends BaseController {
      */
     @SaCheckPermission("room:ptRoom:edit")
     @Log(title = "房间定义", businessType = BusinessType.UPDATE)
-    @SyncDataToLocal(eventType = MessageEventTypeConstants.ptRoom_EDIT)
+    @SyncDataToLocal(eventType = ptRoom_EDIT,sender = ROOM_SENDER)
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody PtRoomBo bo) {
@@ -158,7 +160,7 @@ public class PtRoomController extends BaseController {
      */
     @SaCheckPermission("room:ptRoom:remove")
     @Log(title = "房间定义", businessType = BusinessType.DELETE)
-    @SyncDataToLocal(eventType = MessageEventTypeConstants.ptRoom_REMOVE)
+    @SyncDataToLocal(eventType = ptRoom_REMOVE, sender = ROOM_SENDER)
     @DeleteMapping("/{roomIds}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] roomIds) {