Преглед на файлове

fix: 基础平台服务
1.取消controller层向本地同步的注解

luoyb преди 10 месеца
родител
ревизия
a5344b4ead
променени са 20 файла, в които са добавени 3 реда и са изтрити 63 реда
  1. 3 3
      ruoyi-common/ruoyi-common-message/src/main/java/org/dromara/common/message/kafka/aop/aspect/SyncDataToLocalAspect.java
  2. 0 6
      ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/controller/PtAccountController.java
  3. 0 3
      ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/controller/PtAreaController.java
  4. 0 3
      ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/controller/PtMealtypeController.java
  5. 0 3
      ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/controller/PtParameterController.java
  6. 0 4
      ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/controller/PtRoomController.java
  7. 0 3
      ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/cardCenter/controller/CardApiController.java
  8. 0 2
      ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/cardCenter/controller/PtCardController.java
  9. 0 4
      ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/cardCenter/controller/PtSubsidyController.java
  10. 0 1
      ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/cardCenter/controller/PtSubsidyitemController.java
  11. 0 3
      ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/controller/XfDiscountController.java
  12. 0 2
      ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/controller/XfDiscounttermController.java
  13. 0 3
      ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/controller/XfLimitedController.java
  14. 0 2
      ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/controller/XfLimitedtermController.java
  15. 0 3
      ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/controller/XfQuotaController.java
  16. 0 2
      ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/controller/XfQuotatermController.java
  17. 0 4
      ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/controller/XfTermController.java
  18. 0 6
      ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/controller/PtBagController.java
  19. 0 5
      ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/controller/PtUserAccountController.java
  20. 0 1
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java

+ 3 - 3
ruoyi-common/ruoyi-common-message/src/main/java/org/dromara/common/message/kafka/aop/aspect/SyncDataToLocalAspect.java

@@ -31,9 +31,9 @@ import java.util.Map;
  */
 @RequiredArgsConstructor
 @Slf4j
-@Aspect
-@Component
-@ConditionalOnExpression("'cloud'.equals('${locationFlag}')") // 只在云端时装载bean
+//@Aspect
+//@Component
+//@ConditionalOnExpression("'cloud'.equals('${locationFlag}')")
 public class SyncDataToLocalAspect {
 
 //    private final KafkaNormalProducer kafkaProducer;

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

@@ -15,7 +15,6 @@ import org.dromara.common.excel.utils.ExcelUtil;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
-import org.dromara.common.message.kafka.aop.annotation.SyncDataToLocal;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
@@ -24,8 +23,6 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-import static org.dromara.common.message.kafka.constant.MessageEventTypeConstants.*;
-
 /**
  * 结算账户
  * 前端访问路由地址为:/backstage/merchant/ptAccount
@@ -79,7 +76,6 @@ 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));
@@ -91,7 +87,6 @@ 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));
@@ -104,7 +99,6 @@ 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) {

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

@@ -107,7 +107,6 @@ public class PtAreaController extends BaseController {
     @SaCheckPermission("room:ptArea:add")
     @Log(title = "建筑物区域", businessType = BusinessType.INSERT)
     @RepeatSubmit()
-    @SyncDataToLocal(eventType = ptArea_ADD, sender = AREA_SENDER)
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody PtAreaBo bo) {
         return toAjax(ptAreaService.insertByBo(bo));
@@ -119,7 +118,6 @@ public class PtAreaController extends BaseController {
     @SaCheckPermission("room:ptArea:edit")
     @Log(title = "建筑物区域", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
-    @SyncDataToLocal(eventType = ptArea_EDIT, sender = AREA_SENDER)
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody PtAreaBo bo) {
         return toAjax(ptAreaService.updateByBo(bo));
@@ -132,7 +130,6 @@ public class PtAreaController extends BaseController {
      */
     @SaCheckPermission("room:ptArea:remove")
     @Log(title = "建筑物区域", businessType = BusinessType.DELETE)
-    @SyncDataToLocal(eventType = ptArea_REMOVE,sender = AREA_SENDER)
     @DeleteMapping("/{areaIds}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] areaIds) {

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

@@ -85,7 +85,6 @@ public class PtMealtypeController extends BaseController {
     @SaCheckPermission("basicParameter:ptMealtype:add")
     @Log(title = "营业时段", businessType = BusinessType.INSERT)
     @RepeatSubmit()
-    @SyncDataToLocal(eventType = ptMealtype_ADD,sender = MEAL_TYPE_SENDER)
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody PtMealTypeBo bo) {
         return toAjax(ptMealtypeService.insertByBo(bo));
@@ -97,7 +96,6 @@ public class PtMealtypeController extends BaseController {
     @SaCheckPermission("basicParameter:ptMealtype:edit")
     @Log(title = "营业时段", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
-    @SyncDataToLocal(eventType = ptMealtype_EDIT, sender = MEAL_TYPE_SENDER)
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody PtMealTypeBo bo) {
         return toAjax(ptMealtypeService.updateByBo(bo));
@@ -111,7 +109,6 @@ public class PtMealtypeController extends BaseController {
     @SaCheckPermission("basicParameter:ptMealtype:remove")
     @Log(title = "营业时段", businessType = BusinessType.DELETE)
     @DeleteMapping("/{mealIds}")
-    @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));

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

@@ -79,7 +79,6 @@ public class PtParameterController extends BaseController {
     @SaCheckPermission("basicParameter:ptParameter:add")
     @Log(title = "系统参数", businessType = BusinessType.INSERT)
     @RepeatSubmit()
-    @SyncDataToLocal(eventType = ptParameter_ADD, sender = PARAMETER_SENDER)
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody PtParameterBo bo) {
         return toAjax(ptParameterService.insertByBo(bo));
@@ -93,7 +92,6 @@ public class PtParameterController extends BaseController {
     @SaCheckPermission("basicParameter:ptParameter:remove")
     @Log(title = "系统参数", businessType = BusinessType.DELETE)
     @DeleteMapping("/{paramIds}")
-    @SyncDataToLocal(eventType = ptParameter_REMOVE,sender = PARAMETER_SENDER)
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] paramIds) {
         return toAjax(ptParameterService.deleteWithValidByIds(List.of(paramIds), true));
@@ -105,7 +103,6 @@ public class PtParameterController extends BaseController {
     @SaCheckPermission("basicParameter:ptParameter:edit")
     @Log(title = "系统参数", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
-    @SyncDataToLocal(eventType = ptParameter_EDIT, sender = PARAMETER_SENDER)
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody PtParameterBo bo) {
         return toAjax(ptParameterService.updateByBo(bo));

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

@@ -132,7 +132,6 @@ public class PtRoomController extends BaseController {
      */
     @SaCheckPermission("room:ptRoom:add")
     @Log(title = "房间定义", businessType = BusinessType.INSERT)
-    @SyncDataToLocal(eventType = ptRoom_ADD, sender = ROOM_SENDER)
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody PtRoomBo bo) {
@@ -144,7 +143,6 @@ public class PtRoomController extends BaseController {
      */
     @SaCheckPermission("room:ptRoom:set")
     @Log(title = "批量设置房间类型", businessType = BusinessType.OTHER)
-    @SyncDataToLocal(eventType = ptRoom_SET,sender = ROOM_SENDER)
     @RepeatSubmit()
     @PostMapping("/batchSet")
     public R<Void> batchSet(@Validated @RequestBody PtRoomBatchSetBo bo) {
@@ -159,7 +157,6 @@ public class PtRoomController extends BaseController {
      */
     @SaCheckPermission("room:ptRoom:edit")
     @Log(title = "房间定义", businessType = BusinessType.UPDATE)
-    @SyncDataToLocal(eventType = ptRoom_EDIT,sender = ROOM_SENDER)
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody PtRoomBo bo) {
@@ -173,7 +170,6 @@ public class PtRoomController extends BaseController {
      */
     @SaCheckPermission("room:ptRoom:remove")
     @Log(title = "房间定义", businessType = BusinessType.DELETE)
-    @SyncDataToLocal(eventType = ptRoom_REMOVE, sender = ROOM_SENDER)
     @DeleteMapping("/{roomIds}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] roomIds) {

+ 0 - 3
ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/cardCenter/controller/CardApiController.java

@@ -95,7 +95,6 @@ public class CardApiController extends BaseController {
     }
 
     @PostMapping("/api/v1/write/success")
-    @SyncDataToLocal(eventType = CARD_OPERATION, sender = CARD_CENTER_SENDER)
     public ReturnResult writeNewCardOk(@RequestBody Map<String, Object> initParam) throws InterruptedException {
         PtCardBo bo = getInitInfo(initParam);
         R<PtCardVo> vo = cardBusiness.writeCardSuccess(bo);
@@ -115,7 +114,6 @@ public class CardApiController extends BaseController {
      * @return 返回结果
      */
     @PostMapping("/api/v1/lock")
-    @SyncDataToLocal(eventType = CARD_LOCK, sender = CARD_CENTER_SENDER)
     public ReturnResult lockCard(@RequestBody Map<String, String> mapParams){
         String defaultTenantId = defaultConfig.getTenantId();
         Long cardNo = Long.parseLong(mapParams.get("cardNo"));
@@ -137,7 +135,6 @@ public class CardApiController extends BaseController {
      * @return 回收结果
      */
     @PostMapping("/api/v1/recycle")
-    @SyncDataToLocal(eventType = CARD_RECOVERY, sender = CARD_CENTER_SENDER)
     public ReturnResult recycleCard(@RequestBody Map<String, String> mapParams){
         String defaultTenantId = defaultConfig.getTenantId();
         Long cardNo = Long.parseLong(mapParams.get("cardNo"));

+ 0 - 2
ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/cardCenter/controller/PtCardController.java

@@ -116,7 +116,6 @@ public class PtCardController extends BaseController {
     @SaCheckPermission("cardOperation:ptCard:edit")
     @Log(title = "账户卡片", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
-    @SyncDataToLocal(eventType = ptCard_CARD_LOCK, sender = CARD_CENTER_SENDER)
     @PutMapping("/lockCard/{cardId}")
     public R<Void> lockPtCard(@PathVariable Long cardId) {
         return toAjax(ptCardService.lockCard(cardId));
@@ -128,7 +127,6 @@ public class PtCardController extends BaseController {
     @SaCheckPermission("cardOperation:ptCard:edit")
     @Log(title = "账户卡片", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
-    @SyncDataToLocal(eventType = ptCard_CARD_UNLOCK, sender = CARD_CENTER_SENDER)
     @PutMapping("/unlockCard/{cardId}")
     public R<Void> unlockPtCard(@PathVariable Long cardId) {
         return toAjax(ptCardService.unlockCard(cardId));

+ 0 - 4
ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/cardCenter/controller/PtSubsidyController.java

@@ -81,7 +81,6 @@ public class PtSubsidyController extends BaseController {
     @SaCheckPermission("subsidy:ptSubsidy:add")
     @Log(title = "补助设置", businessType = BusinessType.INSERT)
     @RepeatSubmit()
-    @SyncDataToLocal(eventType = SUBSIDY_ADD, sender = SUBSIDY_SENDER)
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody PtSubsidyBo bo) {
         return toAjax(ptSubsidyService.insertByBo(bo));
@@ -93,7 +92,6 @@ public class PtSubsidyController extends BaseController {
     @SaCheckPermission("subsidy:ptSubsidy:edit")
     @Log(title = "补助设置", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
-    @SyncDataToLocal(eventType = SUBSIDY_EDIT, sender = SUBSIDY_SENDER)
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody PtSubsidyBo bo) {
         return toAjax(ptSubsidyService.updateByBo(bo));
@@ -105,7 +103,6 @@ public class PtSubsidyController extends BaseController {
     @SaCheckPermission("subsidy:ptSubsidy:audit")
     @Log(title = "补助设置审核", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
-    @SyncDataToLocal(eventType = SUBSIDY_EDIT, sender = SUBSIDY_SENDER)
     @PutMapping("/audit")
     public R<Void> audit(@Validated(EditGroup.class) @RequestBody PtSubsidyBo bo) {
         return toAjax(ptSubsidyService.updateByBo(bo));
@@ -119,7 +116,6 @@ public class PtSubsidyController extends BaseController {
      */
     @SaCheckPermission("subsidy:ptSubsidy:remove")
     @Log(title = "补助设置", businessType = BusinessType.DELETE)
-    @SyncDataToLocal(eventType = SUBSIDY_REMOVE, sender = SUBSIDY_SENDER)
     @DeleteMapping("/{mainIds}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] mainIds) {

+ 0 - 1
ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/cardCenter/controller/PtSubsidyitemController.java

@@ -120,7 +120,6 @@ public class PtSubsidyitemController extends BaseController {
      */
     @SaCheckPermission("subsidy:ptSubsidyitem:remove")
     @Log(title = "补助明细", businessType = BusinessType.DELETE)
-    @SyncDataToLocal(eventType = SUBSIDY_ITEM_REMOVE, sender = SUBSIDY_SENDER)
     @DeleteMapping("/{itemIds}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] itemIds) {

+ 0 - 3
ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/controller/XfDiscountController.java

@@ -79,7 +79,6 @@ public class XfDiscountController extends BaseController {
     @SaCheckPermission("consumption:xfDiscount:add")
     @Log(title = "折扣管理", businessType = BusinessType.INSERT)
     @RepeatSubmit()
-    @SyncDataToLocal(eventType = xfDiscount_ADD, sender = XF_DISCOUNT_SENDER)
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody XfDiscountBo bo) {
         return toAjax(xfDiscountService.insertByBo(bo));
@@ -91,7 +90,6 @@ public class XfDiscountController extends BaseController {
     @SaCheckPermission("consumption:xfDiscount:edit")
     @Log(title = "折扣管理", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
-    @SyncDataToLocal(eventType = xfDiscount_EDIT, sender = XF_DISCOUNT_SENDER)
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody XfDiscountBo bo) {
         return toAjax(xfDiscountService.updateByBo(bo));
@@ -104,7 +102,6 @@ public class XfDiscountController extends BaseController {
      */
     @SaCheckPermission("consumption:xfDiscount:remove")
     @Log(title = "折扣管理", businessType = BusinessType.DELETE)
-    @SyncDataToLocal(eventType = xfDiscount_REMOVE, sender = XF_DISCOUNT_SENDER)
     @DeleteMapping("/{discountIds}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] discountIds) {

+ 0 - 2
ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/controller/XfDiscounttermController.java

@@ -91,7 +91,6 @@ public class XfDiscounttermController extends BaseController {
     @SaCheckPermission("consumption:xfDiscountterm:add")
     @Log(title = "批量添加折扣设备", businessType = BusinessType.INSERT)
     @RepeatSubmit()
-    @SyncDataToLocal(eventType = DISCOUNT_TERM_ADD, sender = XF_DISCOUNT_SENDER)
     @PostMapping("/batchAdd")
     public R<Void> batchAdd(@RequestBody List<Long> ids) {
         return toAjax(xfDiscounttermService.insertByTermIds(ids));
@@ -115,7 +114,6 @@ public class XfDiscounttermController extends BaseController {
      */
     @SaCheckPermission("consumption:xfDiscountterm:remove")
     @Log(title = "折扣设备", businessType = BusinessType.DELETE)
-    @SyncDataToLocal(eventType = DISCOUNT_TERM_REMOVE, sender = XF_DISCOUNT_SENDER)
     @DeleteMapping("/{discountTermIds}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] discountTermIds) {

+ 0 - 3
ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/controller/XfLimitedController.java

@@ -79,7 +79,6 @@ public class XfLimitedController extends BaseController {
     @SaCheckPermission("consumption:xfLimited:add")
     @Log(title = "限次管理", businessType = BusinessType.INSERT)
     @RepeatSubmit()
-    @SyncDataToLocal(eventType = xfLimited_ADD, sender = XF_LIMITED_SENDER)
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody XfLimitedBo bo) {
         return toAjax(xfLimitedService.insertByBo(bo));
@@ -91,7 +90,6 @@ public class XfLimitedController extends BaseController {
     @SaCheckPermission("consumption:xfLimited:edit")
     @Log(title = "限次管理", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
-    @SyncDataToLocal(eventType = xfLimited_EDIT, sender = XF_LIMITED_SENDER)
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody XfLimitedBo bo) {
         return toAjax(xfLimitedService.updateByBo(bo));
@@ -104,7 +102,6 @@ public class XfLimitedController extends BaseController {
      */
     @SaCheckPermission("consumption:xfLimited:remove")
     @Log(title = "限次管理", businessType = BusinessType.DELETE)
-    @SyncDataToLocal(eventType = xfLimited_REMOVE, sender = XF_LIMITED_SENDER)
     @DeleteMapping("/{limitedIds}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] limitedIds) {

+ 0 - 2
ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/controller/XfLimitedtermController.java

@@ -91,7 +91,6 @@ public class XfLimitedtermController extends BaseController {
     @SaCheckPermission("consumption:xfDiscountterm:add")
     @Log(title = "批量添加限次设备", businessType = BusinessType.INSERT)
     @RepeatSubmit()
-    @SyncDataToLocal(eventType = LIMITED_TERM_ADD, sender = XF_LIMITED_SENDER)
     @PostMapping("/batchAdd")
     public R<Void> batchAdd(@RequestBody List<Long> ids) {
         return toAjax(xfLimitedtermService.insertByTermIds(ids));
@@ -115,7 +114,6 @@ public class XfLimitedtermController extends BaseController {
      */
     @SaCheckPermission("consumption:xfLimitedterm:remove")
     @Log(title = "限次设备绑定", businessType = BusinessType.DELETE)
-    @SyncDataToLocal(eventType = LIMITED_TERM_REMOVE, sender = XF_LIMITED_SENDER)
     @DeleteMapping("/{limitedTermIds}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] limitedTermIds) {

+ 0 - 3
ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/controller/XfQuotaController.java

@@ -79,7 +79,6 @@ public class XfQuotaController extends BaseController {
     @SaCheckPermission("consumption:xfQuota:add")
     @Log(title = "限额管理", businessType = BusinessType.INSERT)
     @RepeatSubmit()
-    @SyncDataToLocal(eventType = xfQuota_ADD, sender = XF_QUOTA_SENDER)
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody XfQuotaBo bo) {
         return toAjax(xfQuotaService.insertByBo(bo));
@@ -91,7 +90,6 @@ public class XfQuotaController extends BaseController {
     @SaCheckPermission("consumption:xfQuota:edit")
     @Log(title = "限额管理", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
-    @SyncDataToLocal(eventType = xfQuota_EDIT, sender = XF_QUOTA_SENDER)
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody XfQuotaBo bo) {
         return toAjax(xfQuotaService.updateByBo(bo));
@@ -104,7 +102,6 @@ public class XfQuotaController extends BaseController {
      */
     @SaCheckPermission("consumption:xfQuota:remove")
     @Log(title = "限额管理", businessType = BusinessType.DELETE)
-    @SyncDataToLocal(eventType = xfQuota_REMOVE, sender = XF_QUOTA_SENDER)
     @DeleteMapping("/{quotaIds}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] quotaIds) {

+ 0 - 2
ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/controller/XfQuotatermController.java

@@ -91,7 +91,6 @@ public class XfQuotatermController extends BaseController {
     @SaCheckPermission("consumption:xfDiscountterm:add")
     @Log(title = "批量添加限额设备", businessType = BusinessType.INSERT)
     @RepeatSubmit()
-    @SyncDataToLocal(eventType = QUOTA_TERM_ADD, sender = XF_QUOTA_SENDER)
     @PostMapping("/batchAdd")
     public R<Void> batchAdd(@RequestBody List<Long> ids) {
         return toAjax(xfQuotatermService.insertByTermIds(ids));
@@ -115,7 +114,6 @@ public class XfQuotatermController extends BaseController {
      */
     @SaCheckPermission("consumption:xfQuotaterm:remove")
     @Log(title = "限额设备绑定", businessType = BusinessType.DELETE)
-    @SyncDataToLocal(eventType = QUOTA_TERM_REMOVE, sender = XF_QUOTA_SENDER)
     @DeleteMapping("/{quotaTermIds}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] quotaTermIds) {

+ 0 - 4
ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/controller/XfTermController.java

@@ -119,7 +119,6 @@ public class XfTermController extends BaseController {
     @SaCheckPermission("consumption:xfTerm:add")
     @Log(title = "消费设备", businessType = BusinessType.INSERT)
     @RepeatSubmit()
-    @SyncDataToLocal(eventType = xfTerm_ADD, sender = XF_TERM_SENDER)
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody XfTermBo bo) {
         return toAjax(xfTermService.insertByBo(bo));
@@ -131,7 +130,6 @@ public class XfTermController extends BaseController {
     @SaCheckPermission("consumption:xfTerm:edit")
     @Log(title = "消费设备", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
-    @SyncDataToLocal(eventType = xfTerm_EDIT, sender = XF_TERM_SENDER)
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody XfTermBo bo) {
         return toAjax(xfTermService.updateByBo(bo));
@@ -143,7 +141,6 @@ public class XfTermController extends BaseController {
     @SaCheckPermission("consumption:xfTerm:edit")
     @Log(title = "消费设备参数编辑", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
-    @SyncDataToLocal(eventType = xfTerm_param_EDIT, sender = XF_TERM_SENDER)
     @PostMapping("/updateParam")
     public R<Void> editParam(@Validated @RequestBody XfTermParamBo bo) {
         return toAjax(xfTermService.updateParamByBo(bo));
@@ -156,7 +153,6 @@ public class XfTermController extends BaseController {
      */
     @SaCheckPermission("consumption:xfTerm:remove")
     @Log(title = "消费设备", businessType = BusinessType.DELETE)
-    @SyncDataToLocal(eventType = xfTerm_REMOVE, sender = XF_TERM_SENDER)
     @DeleteMapping("/{termIds}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] termIds) {

+ 0 - 6
ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/controller/PtBagController.java

@@ -137,7 +137,6 @@ public class PtBagController extends BaseController {
     @SaCheckPermission("payment:ptBag:edit")
     @Log(title = "账户钱包", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
-    @SyncDataToLocal(eventType = ptCard_CHARGE_EDIT, sender = CARD_CENTER_SENDER)
     @PostMapping("/recharge")
     public R<PurseInOutBo> recharge(@Validated(EditGroup.class) @RequestBody PurseInOutBo bo) {
         return payOrderBusiness.recharge(bo);
@@ -149,7 +148,6 @@ public class PtBagController extends BaseController {
     @SaCheckPermission("payment:ptBag:edit")
     @Log(title = "账户钱包", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
-    @SyncDataToLocal(eventType = ptCard_refund_EDIT, sender = CARD_CENTER_SENDER)
     @PostMapping("/refund")
     public R<PurseInOutBo> refund(@Validated(EditGroup.class) @RequestBody PurseInOutBo bo) {
         return payOrderBusiness.refund(bo);
@@ -161,7 +159,6 @@ public class PtBagController extends BaseController {
     @SaCheckPermission("cardOperation:ptCard:edit")
     @Log(title = "批量账户充值", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
-    @SyncDataToLocal(eventType = ptCard_multicharge_EDIT, sender = CARD_CENTER_SENDER)
     @PostMapping("/recharge/{userIds}")
     public R<java.lang.String> batchRecharge(@Validated(EditGroup.class) @RequestBody PurseInOutBo bo, @PathVariable Long[] userIds) {
         // TODO 2024-10-30 09:49:36 luoyibo 这里最好是提前处理下工作站信息
@@ -196,7 +193,6 @@ public class PtBagController extends BaseController {
     @SaCheckPermission("cardOperation:ptCard:edit")
     @Log(title = "账户批量退款", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
-    @SyncDataToLocal(eventType = ptCard_multirefund_EDIT, sender = CARD_CENTER_SENDER)
     @PostMapping("/refund/{userIds}")
     public R<Void> batchRefund(@Validated(EditGroup.class) @RequestBody PurseInOutBo bo, @PathVariable Long[] userIds) {
         List<java.lang.String> resultList = new ArrayList<>();
@@ -230,7 +226,6 @@ public class PtBagController extends BaseController {
     @SaCheckPermission("cardOperation:ptCard:edit")
     @Log(title = "账户批量设置余额", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
-    @SyncDataToLocal(eventType = ptCard_multiSet_EDIT, sender = CARD_CENTER_SENDER)
     @PostMapping("/recover/{userIds}")
     public R<Void> batchRecover(@Validated(EditGroup.class) @RequestBody PtBagBo bo, @PathVariable Long[] userIds) {
         bo.setUseType(SystemUseTypeEnum.CONSUME.code().toString());
@@ -249,7 +244,6 @@ public class PtBagController extends BaseController {
     @SaCheckPermission("payment:ptBag:edit")
     @Log(title = "账户钱包", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
-    @SyncDataToLocal(eventType = ptCard_supply_EDIT, sender = CARD_CENTER_SENDER)
     @PostMapping("/err-fill")
     public R<PtBagVo> errFill(@Validated(EditGroup.class) @RequestBody ConsumptionBo bo) {
         bo.setUseType(SystemUseTypeEnum.CONSUME.code().toString());

+ 0 - 5
ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/controller/PtUserAccountController.java

@@ -272,7 +272,6 @@ public class PtUserAccountController extends BaseController {
      */
     @SaCheckPermission("payment:ptUserAccount:edit")
     @Log(title = "支付账户管理", businessType = BusinessType.UPDATE)
-    @SyncDataToLocal(eventType = ptUserAccount_FREEZE_EDIT, sender = USER_ACCOUNT_SENDER)
     @PutMapping("/{freezeStatus}/{userIds}")
     public R<Void> batchChangeFreezeStatus(@PathVariable String freezeStatus, @PathVariable Long[] userIds) {
         return toAjax(ptUserAccountService.updateFreezeStatus(userIds, freezeStatus));
@@ -286,7 +285,6 @@ public class PtUserAccountController extends BaseController {
      */
     @SaCheckPermission("payment:ptUserAccount:edit")
     @Log(title = "支付账户管理", businessType = BusinessType.UPDATE)
-    @SyncDataToLocal(eventType = ptUserAccount_RESETTIME_EDIT, sender = USER_ACCOUNT_SENDER)
     @PutMapping("/resetLifespan/{lifespan}/{userIds}")
     public R<Void> batchResetLifespan(@PathVariable String lifespan, @PathVariable Long[] userIds) {
         return toAjax(ptUserAccountService.resetLifespan(userIds, lifespan));
@@ -300,7 +298,6 @@ public class PtUserAccountController extends BaseController {
      */
     @SaCheckPermission("payment:ptUserAccount:edit")
     @Log(title = "支付账户管理", businessType = BusinessType.UPDATE)
-    @SyncDataToLocal(eventType = ptUserAccount_RESETTYPE_EDIT, sender = USER_ACCOUNT_SENDER)
     @PutMapping("/resetCardType/{cardType}/{userIds}")
     public R<Void> batchResetCardType(@PathVariable String cardType, @PathVariable Long[] userIds) {
         return toAjax(ptUserAccountService.resetCardType(userIds, cardType));
@@ -326,7 +323,6 @@ public class PtUserAccountController extends BaseController {
      */
     @SaCheckPermission("payment:ptUserAccount:edit")
     @Log(title = "支付账户管理", businessType = BusinessType.UPDATE)
-    @SyncDataToLocal(eventType = ptUserAccount_OPEN_EDIT, sender = USER_ACCOUNT_SENDER)
     @PutMapping("/open/{userIds}")
     public R<Void> batchOpenAccount(@PathVariable Long[] userIds) {
         return toAjax(ptUserAccountService.openAccount(userIds));
@@ -339,7 +335,6 @@ public class PtUserAccountController extends BaseController {
      */
     @SaCheckPermission("payment:ptUserAccount:edit")
     @Log(title = "支付账户管理", businessType = BusinessType.UPDATE)
-    @SyncDataToLocal(eventType = ptUserAccount_CLOSE_EDIT, sender = USER_ACCOUNT_SENDER)
     @PutMapping("/close/{userIds}")
     public R<Void> batchCloseAccount(@PathVariable Long[] userIds) {
         if (ptUserAccountService.closeAccount(userIds)) {

+ 0 - 1
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java

@@ -153,7 +153,6 @@ public class SysUserController extends BaseController {
      */
     @SaCheckPermission("system:user:add")
     @Log(title = "用户管理", businessType = BusinessType.INSERT)
-    @SyncDataToLocal(eventType = MessageEventTypeConstants.user_ADD,sender = MessageEventTypeConstants.USER_ACCOUNT_SENDER)
     @PostMapping
     public R<Void> add(@Validated @RequestBody SysUserBo user) {
         deptService.checkDeptDataScope(user.getDeptId());