fix: 消费服务

1.同步完成后向云平台发送消费请求

ruoyi-server/ruoyi-server-sync/src/main/java/org/dromara/server/sync/service/impl/DeptServiceImpl.java

@@ -8,15 +8,11 @@ import org.dromara.common.core.constant.DefaultConstants;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.message.kafka.constant.EventTypeConstants;
-import org.dromara.common.message.kafka.constant.KafkaTopicConstants;
-import org.dromara.common.message.kafka.enums.EventSenderEnum;
 import org.dromara.common.tenant.helper.TenantHelper;
 import org.dromara.server.sync.domain.SysDept;
 import org.dromara.server.sync.domain.bo.SysDeptBo;
 import org.dromara.server.sync.domain.vo.SysDeptVo;
 import org.dromara.server.sync.mapper.SysDeptMapper;
-import org.dromara.server.sync.mq.PushKafkaData;
 import org.dromara.server.sync.service.IDeptService;
 import org.springframework.stereotype.Service;
 
@@ -34,7 +30,7 @@ import java.util.Objects;
 @RequiredArgsConstructor
 public class DeptServiceImpl implements IDeptService {
     private final SysDeptMapper deptMapper;
-    private final PushKafkaData kafkaNormalProducer;
+    //private final PushKafkaData kafkaNormalProducer;
 
     @Override
     public SysDeptVo selectByOtherId(String otherId, String tenantId) {
@@ -66,12 +62,12 @@ public class DeptServiceImpl implements IDeptService {
         Objects.requireNonNull(entity).setAncestors(getAncestors(bo.getParentId()));
         int iCount = TenantHelper.ignore(
             () -> deptMapper.insert(entity));
-        if (iCount > 0) {
-            bo.setDeptId(entity.getDeptId());
-            SysDeptVo vo = TenantHelper.ignore(
-                () -> deptMapper.selectVoById(bo.getDeptId()));
-            //kafkaNormalProducer.sendKafkaMessage(KafkaTopicConstants.SYNC_DATA_TOPIC, EventTypeConstants.DEPT, EventSenderEnum.SYSTEM.code(), vo);
-        }
+        //if (iCount > 0) {
+        //    bo.setDeptId(entity.getDeptId());
+        //    SysDeptVo vo = TenantHelper.ignore(
+        //        () -> deptMapper.selectVoById(bo.getDeptId()));
+        //    //kafkaNormalProducer.sendKafkaMessage(KafkaTopicConstants.SYNC_DATA_TOPIC, EventTypeConstants.DEPT, EventSenderEnum.SYSTEM.code(), vo);
+        //}
         return iCount > 0;
     }
 
@@ -86,11 +82,11 @@ public class DeptServiceImpl implements IDeptService {
         }
         int iCount = TenantHelper.ignore(
             () -> deptMapper.updateById(entity));
-        if (iCount > 0) {
-            SysDeptVo vo = TenantHelper.ignore(
-                () -> deptMapper.selectVoById(bo.getDeptId()));
-            //kafkaNormalProducer.sendKafkaMessage(KafkaTopicConstants.SYNC_DATA_TOPIC, EventTypeConstants.DEPT, EventSenderEnum.SYSTEM.code(), vo);
-        }
+        //if (iCount > 0) {
+        //    SysDeptVo vo = TenantHelper.ignore(
+        //        () -> deptMapper.selectVoById(bo.getDeptId()));
+        //    //kafkaNormalProducer.sendKafkaMessage(KafkaTopicConstants.SYNC_DATA_TOPIC, EventTypeConstants.DEPT, EventSenderEnum.SYSTEM.code(), vo);
+        //}
         return iCount > 0;
     }
 
@@ -121,14 +117,14 @@ public class DeptServiceImpl implements IDeptService {
             () -> deptMapper.selectVoOne(new LambdaQueryWrapper<SysDept>().eq(SysDept::getOtherId, otherId).eq(SysDept::getTenantId, tenantId)));
         int iCount = TenantHelper.ignore(
             () -> deptMapper.delete(new LambdaQueryWrapper<SysDept>().eq(SysDept::getOtherId, otherId).eq(SysDept::getTenantId, tenantId)));
-        if (iCount > 0) {
-            vo.setDelFlag(DefaultConstants.DELETED);
+        //if (iCount > 0) {
+        //    vo.setDelFlag(DefaultConstants.DELETED);
             //vo.setUpdateBy();
             //SysDeptVo vo = TenantHelper.ignore(
             //    () -> deptMapper.selectVoOne(new LambdaQueryWrapper<SysDept>().eq(SysDept::getOtherId, otherId).eq(SysDept::getTenantId, tenantId)));
 
             //kafkaNormalProducer.sendKafkaMessage(KafkaTopicConstants.SYNC_DATA_TOPIC, EventTypeConstants.DEPT, EventSenderEnum.SYSTEM.code(), vo);
-        }
+        //}
         return iCount > 0;
     }
 

ruoyi-server/ruoyi-server-sync/src/main/java/org/dromara/server/sync/service/impl/UserAccountServiceImpl.java

@@ -9,9 +9,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.constant.DefaultConstants;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.utils.MapstructUtils;
-import org.dromara.common.message.kafka.constant.EventTypeConstants;
-import org.dromara.common.message.kafka.constant.KafkaTopicConstants;
-import org.dromara.common.message.kafka.enums.EventSenderEnum;
 import org.dromara.common.tenant.helper.TenantHelper;
 import org.dromara.server.sync.business.card.CardBusiness;
 import org.dromara.server.sync.domain.UserAccount;
@@ -19,7 +16,6 @@ import org.dromara.server.sync.domain.bo.UserAccountBo;
 import org.dromara.server.sync.domain.bo.UserCardBo;
 import org.dromara.server.sync.domain.vo.UserAccountVo;
 import org.dromara.server.sync.mapper.UserAccountMapper;
-import org.dromara.server.sync.mq.PushKafkaData;
 import org.dromara.server.sync.service.IUserAccountService;
 import org.dromara.server.sync.service.IUserBagService;
 import org.springframework.stereotype.Service;
@@ -34,7 +30,6 @@ import org.springframework.stereotype.Service;
 @Service
 @Slf4j
 public class UserAccountServiceImpl implements IUserAccountService {
-    private final PushKafkaData kafkaNormalProducer;
     private final UserAccountMapper baseMapper;
     private final IUserBagService bagService;
     private final CardBusiness cardBusiness;
@@ -88,7 +83,7 @@ public class UserAccountServiceImpl implements IUserAccountService {
                 // 如果卡类或有效期变了，需要同步更新主卡的卡类与有效期
             }
         }
-        vo = TenantHelper.ignore(() -> baseMapper.selectVoById(bo.getUserId()));
+        //vo = TenantHelper.ignore(() -> baseMapper.selectVoById(bo.getUserId()));
         //kafkaNormalProducer.sendKafkaMessage(KafkaTopicConstants.SYNC_DATA_TOPIC, EventTypeConstants.ACCOUNT, EventSenderEnum.BACKSTAGE.code(), vo);
         return true;
     }

ruoyi-server/ruoyi-server-sync/src/main/java/org/dromara/server/sync/service/impl/UserCardServiceImpl.java

@@ -6,14 +6,10 @@ import cn.hutool.core.util.ObjUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.utils.MapstructUtils;
-import org.dromara.common.message.kafka.constant.EventTypeConstants;
-import org.dromara.common.message.kafka.constant.KafkaTopicConstants;
-import org.dromara.common.message.kafka.enums.EventSenderEnum;
 import org.dromara.server.sync.domain.UserCard;
 import org.dromara.server.sync.domain.bo.UserCardBo;
 import org.dromara.server.sync.domain.vo.UserCardVo;
 import org.dromara.server.sync.mapper.UserCardMapper;
-import org.dromara.server.sync.mq.PushKafkaData;
 import org.dromara.server.sync.service.IUserCardService;
 import org.springframework.stereotype.Service;
 
@@ -29,7 +25,7 @@ import java.util.List;
 @Service
 public class UserCardServiceImpl implements IUserCardService {
     private final UserCardMapper baseMapper;
-    private final PushKafkaData kafkaNormalProducer;
+    //private final PushKafkaData kafkaNormalProducer;
 
     /**
      * 查询用户的卡片持有情况
@@ -67,7 +63,7 @@ public class UserCardServiceImpl implements IUserCardService {
                 bo.setCardId(add.getCardId());
             }
         }
-        UserCardVo vo = baseMapper.selectVoById(bo.getCardId());
+        //UserCardVo vo = baseMapper.selectVoById(bo.getCardId());
         //kafkaNormalProducer.sendKafkaMessage(KafkaTopicConstants.SYNC_DATA_TOPIC, EventTypeConstants.CARD, EventSenderEnum.BACKSTAGE.code(), vo);
         return flag;
     }

ruoyi-server/ruoyi-server-sync/src/main/java/org/dromara/server/sync/service/impl/UserServiceImpl.java

@@ -45,7 +45,7 @@ public class UserServiceImpl implements IUserService {
     private final SysUserMapper baseMapper;
     private final IUserDeptService userDeptService;
     private final IUserAccountService userAccountService;
-    private final PushKafkaData kafkaNormalProducer;
+    //private final PushKafkaData kafkaNormalProducer;
 
     @Override
     public SysUserVo selectByOtherId(String otherId, String tenantId) {
@@ -67,7 +67,7 @@ public class UserServiceImpl implements IUserService {
             userAccountBo.setAccountStatus(UserAccountStatusEnum.IS_OPEN.code().toString());
             Boolean result = userAccountService.doUserAccount(userAccountBo);
         }
-        SysUserVo vo = TenantHelper.ignore(()->baseMapper.selectVoById(bo.getUserId()));
+        //SysUserVo vo = TenantHelper.ignore(()->baseMapper.selectVoById(bo.getUserId()));
         //kafkaNormalProducer.sendKafkaMessage(KafkaTopicConstants.SYNC_DATA_TOPIC, EventTypeConstants.USER, EventSenderEnum.SYSTEM.code(), vo);
         return rows > 0;
     }
@@ -85,7 +85,7 @@ public class UserServiceImpl implements IUserService {
             userAccountBo.setAccountStatus(UserAccountStatusEnum.IS_OPEN.code().toString());
             Boolean result = userAccountService.doUserAccount(userAccountBo);
         }
-        SysUserVo vo = TenantHelper.ignore(()->baseMapper.selectVoById(bo.getUserId()));
+        //SysUserVo vo = TenantHelper.ignore(()->baseMapper.selectVoById(bo.getUserId()));
         //kafkaNormalProducer.sendKafkaMessage(KafkaTopicConstants.SYNC_DATA_TOPIC, EventTypeConstants.USER, EventSenderEnum.SYSTEM.code(), vo);
         return rows > 0;
     }