feature: 同步服务完善

1.全量教职双向同步

ruoyi-api/ruoyi-api-backstage/src/main/java/org/dromara/backstage/api/domain/bo/RemoteCardBo.java

@@ -126,4 +126,24 @@ public class RemoteCardBo implements Serializable {
      * 卡类名
      */
     private String cardTypeName;
+
+    /**
+     * 创建者
+     */
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
 }

ruoyi-api/ruoyi-api-backstage/src/main/java/org/dromara/backstage/api/domain/vo/RemoteCardVo.java

@@ -99,4 +99,24 @@ public class RemoteCardVo implements Serializable {
      * 卡类名
      */
     private String cardTypeName;
+
+    /**
+     * 创建者
+     */
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
 }

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/DefaultConstants.java

@@ -63,11 +63,11 @@ public interface DefaultConstants {
     /**
      * 研究生年份父部门Id(研究生部)
      */
-    Long GRADUATE_PARENT_DEPT_ID = 1850788795766460417L;
+    Long GRADUATE_PARENT_DEPT_ID = 105L;
     /**
      * 培训班年份父部门Id(培训班)
      */
-    Long TRAIN_PARENT_DEPT_ID = 1850788897130205186L;
+    Long TRAIN_PARENT_DEPT_ID = 104L;
     /**
      * 部门类型代码
      */

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/service/impl/PtParameterServiceImpl.java

@@ -135,7 +135,6 @@ public class PtParameterServiceImpl implements IPtParameterService {
      * @param paramCode 参数code
      * @return 参数键值
      */
-    @Cacheable(cacheNames = CacheNames.PT_PARAMETER, key = "#paramCode")
     @Override
     public String selectParamByCode(String paramCode) {
         PtParameter parameter = baseMapper.selectOne(new LambdaQueryWrapper<PtParameter>()
@@ -143,7 +142,6 @@ public class PtParameterServiceImpl implements IPtParameterService {
         if(ObjectUtil.isNotNull(parameter)){
             return parameter.getParamValue();
         }
-        //@Cacheable(cacheNames = CacheNames.SYS_DEPT, key = "#deptId")
         return StringUtils.EMPTY;
     }
     /**

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/business/accouunt/UserAccountBusiness.java

@@ -71,7 +71,7 @@ public class UserAccountBusiness {
             //--------- 设置 流水号和主键id set 到 cardBo
             bo.setCardId(cardBo.getCardId());
             bo.setCardNo(cardBo.getCardNo());
-            sendCloudConsume(ptUserAccountService.queryById(bo.getUserId()));
+            //sendCloudConsume(ptUserAccountService.queryById(bo.getUserId()));
             return rs;
         }
 
@@ -105,20 +105,20 @@ public class UserAccountBusiness {
         return R.ok(accountInfoVo);
     }
 
-    private void sendCloudConsume(PtUserAccountVo vo) {
-        String pushData = remotePtParameterService.getPtParameterByKey("PUSH_MQ_DATA");
-        if (ObjectUtil.isNotEmpty(pushData) && ObjectUtil.equals(pushData, "1")) {
-            KafkaMessage<PtUserAccountVo> message = new KafkaMessage<>();
-            KafkaHeader header = message.getHeader();
-            header.setTimestamp(System.currentTimeMillis());
-            header.setEventId(CloudMqEventConstants.ACCOUNT);
-            header.setEventType(CloudMqEventConstants.ACCOUNT);
-            header.setSender(CloudMqEventConstants.SENDER);
-
-            message.setHeader(header);
-            message.setBody(vo);
-
-            kafkaNormalProducer.sendKafkaMessage(CloudMqEventConstants.TOPIC, message);
-        }
-    }
+    //private void sendCloudConsume(PtUserAccountVo vo) {
+    //    String pushData = remotePtParameterService.getPtParameterByKey("PUSH_MQ_DATA");
+    //    if (ObjectUtil.isNotEmpty(pushData) && ObjectUtil.equals(pushData, "1")) {
+    //        KafkaMessage<PtUserAccountVo> message = new KafkaMessage<>();
+    //        KafkaHeader header = message.getHeader();
+    //        header.setTimestamp(System.currentTimeMillis());
+    //        header.setEventId(CloudMqEventConstants.ACCOUNT);
+    //        header.setEventType(CloudMqEventConstants.ACCOUNT);
+    //        header.setSender(CloudMqEventConstants.SENDER);
+    //
+    //        message.setHeader(header);
+    //        message.setBody(vo);
+    //
+    //        kafkaNormalProducer.sendKafkaMessage(CloudMqEventConstants.TOPIC, message);
+    //    }
+    //}
 }

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/domain/vo/card/PtCardVo.java

@@ -127,6 +127,27 @@ public class PtCardVo implements Serializable {
      * 租户Id
      */
     private String tenantId;
+
+    /**
+     * 创建者
+     */
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
     //region 根据卡片类型关联到的卡片押金、工本费等信息
     /**
      * 卡片类型名称

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/service/impl/PtUserAccountServiceImpl.java

@@ -227,6 +227,7 @@ public class PtUserAccountServiceImpl implements IPtUserAccountService {
             bo.setUserId(add.getUserId());
             bo.setUserNo(add.getUserNo());
         }
+        sendCloudConsume(baseMapper.selectVoById(bo.getUserId()));
         return flag;
     }
 
@@ -241,7 +242,7 @@ public class PtUserAccountServiceImpl implements IPtUserAccountService {
         PtUserAccount update = MapstructUtils.convert(bo, PtUserAccount.class);
         validEntityBeforeSave(update);
         int count = baseMapper.updateById(update);
-        // sendCloudConsume(baseMapper.selectVoById(bo.getUserId()));
+         sendCloudConsume(baseMapper.selectVoById(bo.getUserId()));
         return count > 0;
     }
 
@@ -559,14 +560,14 @@ public class PtUserAccountServiceImpl implements IPtUserAccountService {
             KafkaMessage<PtUserAccountVo> message = new KafkaMessage<>();
             KafkaHeader header = message.getHeader();
             header.setTimestamp(System.currentTimeMillis());
-            header.setEventId(CloudMqEventConstants.DEPT);
-            header.setEventType(CloudMqEventConstants.DEPT);
+            header.setEventId(CloudMqEventConstants.ACCOUNT);
+            header.setEventType(CloudMqEventConstants.ACCOUNT);
             header.setSender(CloudMqEventConstants.SENDER);
 
             message.setHeader(header);
             message.setBody(vo);
 
-            kafkaNormalProducer.sendKafkaMessage(CloudMqEventConstants.TOPIC, vo.getCreateBy(), message);
+            kafkaNormalProducer.sendKafkaMessage(CloudMqEventConstants.TOPIC, message);
         }
     }