feature: 全量与kafka同步

ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/consumer/KafkaNormalConsumer.java

@@ -1,25 +1,11 @@
 package org.dromara.stream.consumer;
 
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
-import lombok.AllArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.dubbo.config.annotation.DubboReference;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.dromara.backstage.api.RemoteConsumeService;
-import org.dromara.backstage.api.domain.bo.RemoteConsumptionBo;
-import org.dromara.common.core.domain.R;
-import org.dromara.common.core.enums.CreditTypeEnum;
-import org.dromara.stream.domain.bo.ConsumeRecordBo;
-import org.dromara.stream.domain.bo.ConsumptionBo;
-import org.dromara.stream.domain.bo.KafkaMessage;
 import org.springframework.kafka.annotation.KafkaListener;
 import org.springframework.stereotype.Component;
 
-import java.math.BigDecimal;
-import java.util.Date;
-
 /**
  * @author xbhog
  * @date 2024/05/19 18:04
@@ -28,27 +14,26 @@ import java.util.Date;
 @Component
 @RequiredArgsConstructor
 public class KafkaNormalConsumer {
-    @DubboReference
-    private final RemoteConsumeService remoteConsumeService;
+
     //默认获取最后一条消息
     @KafkaListener(topics = "eventBus", groupId = "test-group-id")
     public void timiKafka(ConsumerRecord<String, String> record) {
         Object key = record.key();
         Object value = record.value();
-        KafkaMessage<?> kmsg = JSONUtil.toBean(record.value(), KafkaMessage.class);
-        JSONObject data = JSONUtil.parseObj(kmsg.getBody());
-        RemoteConsumptionBo recordBo = new RemoteConsumptionBo();
-        recordBo.setConsumeMoney((BigDecimal) data.get("consumeValue"));
-        recordBo.setConsumeDate((Date) data.get("consumeDate"));
-        recordBo.setCardNo((Long) data.get("cardNo"));
-        recordBo.setFactoryId((Long) data.get("factoryFixId"));
-        recordBo.setTermNo((Long) data.get("termNo"));
-        recordBo.setTermRecordId((Long) data.get("termRecordID"));
-        recordBo.setRealName((String) data.get("xm"));
-        recordBo.setUserNumb((String) data.get("userNumb"));
-        recordBo.setRecordStatus((Long) data.get("posRecordState"));
-        recordBo.setCreditType(CreditTypeEnum.TERM_CONSUME);
-        R<Object> result = remoteConsumeService.receiveConsumeOriginalRecord(recordBo);
+        //KafkaMessage<?> kmsg = JSONUtil.toBean(record.value(), KafkaMessage.class);
+        //JSONObject data = JSONUtil.parseObj(kmsg.getBody());
+        //RemoteConsumptionBo recordBo = new RemoteConsumptionBo();
+        //recordBo.setConsumeMoney((BigDecimal) data.get("consumeValue"));
+        //recordBo.setConsumeDate((Date) data.get("consumeDate"));
+        //recordBo.setCardNo((Long) data.get("cardNo"));
+        //recordBo.setFactoryId((Long) data.get("factoryFixId"));
+        //recordBo.setTermNo((Long) data.get("termNo"));
+        //recordBo.setTermRecordId((Long) data.get("termRecordID"));
+        //recordBo.setRealName((String) data.get("xm"));
+        //recordBo.setUserNumb((String) data.get("userNumb"));
+        //recordBo.setRecordStatus((Long) data.get("posRecordState"));
+        //recordBo.setCreditType(CreditTypeEnum.TERM_CONSUME);
+        //R<Object> result = remoteConsumeService.receiveConsumeOriginalRecord(recordBo);
 
         log.info("【消费者】received the message key {}，value：{}", key, value);
     }

ruoyi-server/ruoyi-server-sync/src/main/java/org/dromara/server/sync/InitRunnerTest.java

@@ -32,6 +32,6 @@ public class InitRunnerTest implements CommandLineRunner {
         //syncGraduateClass.syncGraduate();
 
         //syncTrainService.syncTrainClass();
-        //syncTrainService.syncTrainee();
+        syncTrainService.syncTrainee();
     }
 }

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

@@ -57,40 +57,40 @@ public class SyncHrService {
      * 同步教职工数据
      */
     public void syncTeacher() {
-        //HttpRequest req = CreateHttpRequest.createRequest();
-        //req.body(getQueryBodyForTeacher());
-        //
-        //SyncFullDataBo dataBo = JSONUtil.toBean(req.execute().body(), SyncFullDataBo.class);
-        //List<ResourcePerson> resourcePersonList = new ArrayList<>();
-        //for (List<String> list : dataBo.getResponseParam().getResourceInfos().get(0).getDataInfo()) {
-        //    ResourcePerson person = new ResourcePerson();
-        //    person.setUserId(list.get(12));
-        //    person.setDeptId(list.get(14));
-        //    person.setPostCode(DefaultConstants.TEACHER_CODE);
-        //    person.setRealName(list.get(0));
-        //    person.setSex(list.get(1));
-        //    person.setPhone(list.get(3));
-        //    person.setIdNumber(list.get(5));
-        //    person.setCategory("1");
-        //    person.setRemark("");
-        //    person.setUserState(list.get(16));
-        //    resourcePersonList.add(person);
-        //}
-        //log.info("[全量获取到的教职工数据]-[共{}条]-[{}]", resourcePersonList.size(), JSONUtil.toJsonStr(dataBo));
+        HttpRequest req = CreateHttpRequest.createRequest();
+        req.body(getQueryBodyForTeacher());
 
-        //region 模拟测试数据
+        SyncFullDataBo dataBo = JSONUtil.toBean(req.execute().body(), SyncFullDataBo.class);
         List<ResourcePerson> resourcePersonList = new ArrayList<>();
-        ResourcePerson person = new ResourcePerson();
-        person.setUserId("00314200");
-        person.setDeptId("001001001000");
-        person.setPostCode(DefaultConstants.TEACHER_CODE);
-        person.setRealName("康重文");
-        person.setSex("1");
-        person.setPhone("13875850616");
-        person.setCategory("1");
-        person.setRemark("");
-        person.setUserState("on");
-        resourcePersonList.add(person);
+        for (List<String> list : dataBo.getResponseParam().getResourceInfos().get(0).getDataInfo()) {
+            ResourcePerson person = new ResourcePerson();
+            person.setUserId(list.get(12));
+            person.setDeptId(list.get(14));
+            person.setPostCode(DefaultConstants.TEACHER_CODE);
+            person.setRealName(list.get(0));
+            person.setSex(list.get(1));
+            person.setPhone(list.get(3));
+            person.setIdNumber(list.get(5));
+            person.setCategory("1");
+            person.setRemark("");
+            person.setUserState(list.get(16));
+            resourcePersonList.add(person);
+        }
+        log.info("[全量获取到的教职工数据]-[共{}条]-[{}]", resourcePersonList.size(), JSONUtil.toJsonStr(dataBo));
+
+        //region 模拟测试数据
+        //List<ResourcePerson> resourcePersonList = new ArrayList<>();
+        //ResourcePerson person = new ResourcePerson();
+        //person.setUserId("00314200");
+        //person.setDeptId("001001001000");
+        //person.setPostCode(DefaultConstants.TEACHER_CODE);
+        //person.setRealName("康重文");
+        //person.setSex("1");
+        //person.setPhone("13875850616");
+        //person.setCategory("1");
+        //person.setRemark("");
+        //person.setUserState("on");
+        //resourcePersonList.add(person);
         //endregion
 
 

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

@@ -1,4 +1,6 @@
 package org.dromara.server.sync.service;
+import com.google.common.collect.Lists;
+import java.util.Date;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.http.HttpRequest;
@@ -52,55 +54,54 @@ public class SyncTrainService {
     }
 
     public void syncTrainee() {
-        //HttpRequest req = CreateHttpRequest.createRequest();
-        //req.body(getQueryBodyForTrainee());
+        HttpRequest req = CreateHttpRequest.createRequest();
+        req.body(getQueryBodyForTrainee());
         //获取到培训学员数据
-        //SyncFullDataBo traineeDataBo = JSONUtil.toBean(req.execute().body(), SyncFullDataBo.class);
-        //List<ResourcePerson> resourcePersonList = new ArrayList<>();
-        //for (List<String> list : traineeDataBo.getResponseParam().getResourceInfos().get(0).getDataInfo()) {
-        //    ResourcePerson person = new ResourcePerson();
-        //    resourcePersonList.add(person);
-        //}
-        //获取到的学员与培训班对应关系
-        //req.body(getQueryBodyForClassTrainee());
-        //SyncFullDataBo classTraineeDataBo = JSONUtil.toBean(req.execute().body(), SyncFullDataBo.class);
-        //List<ResourcePersonDept> resourcePersonDeptList = getResourcePersonDeptList(classTraineeDataBo);
+        SyncFullDataBo traineeDataBo = JSONUtil.toBean(req.execute().body(), SyncFullDataBo.class);
 
-        //region 模拟测试
-        List<ResourcePerson> resourcePersonList = new ArrayList<>();
-        ResourcePerson person = new ResourcePerson();
-        person.setTenantId(DefaultConstants.TENANT_ID);
-        person.setUserId("1799827959791554562");
-        person.setDeptId("1799803773266235394");
-        person.setPostCode(DefaultConstants.TRAINEE_CODE);
-        person.setRealName("赵开羽");
-        person.setSex("1");
-        person.setPhone("18974390367");
-        person.setIdNumber("XP4aO5yhQyNPUctSqDOU9Syh9KUo/DN8");
-        person.setCategory("2");
-        resourcePersonList.add(person);
+        List<ResourcePerson> resourcePersonList = getResourcePeople(traineeDataBo);
 
-        List<ResourcePersonDept> resourcePersonDeptList = new ArrayList<>();
-        ResourcePersonDept personDept = new ResourcePersonDept();
-        personDept.setUserId("1799827959791554562");
-        personDept.setDeptId("1799803773266235394");
-        personDept.setPostCode(DefaultConstants.TRAINEE_CODE);
-        personDept.setDelFlag("0");
-        resourcePersonDeptList.add(personDept);
+        //获取到的学员与培训班对应关系
+        req.body(getQueryBodyForClassTrainee());
+        SyncFullDataBo classTraineeDataBo = JSONUtil.toBean(req.execute().body(), SyncFullDataBo.class);
+        List<ResourcePersonDept> resourcePersonDeptList = getResourcePersonDeptList(classTraineeDataBo);
 
-        personDept = new ResourcePersonDept();
-        personDept.setUserId("1799827959791554562");
-        personDept.setDeptId("ffe051b8cf2e45ddb899d596108699d7");
-        personDept.setPostCode(DefaultConstants.TRAINEE_CODE);
-        personDept.setDelFlag("0");
-        resourcePersonDeptList.add(personDept);
+        //region 模拟测试
+        //List<ResourcePerson> resourcePersonList = new ArrayList<>();
+        //ResourcePerson person = new ResourcePerson();
+        //person.setTenantId(DefaultConstants.TENANT_ID);
+        //person.setUserId("1799827959791554562");
+        //person.setDeptId("1799803773266235394");
+        //person.setPostCode(DefaultConstants.TRAINEE_CODE);
+        //person.setRealName("赵开羽");
+        //person.setSex("1");
+        //person.setPhone("18974390367");
+        //person.setIdNumber("XP4aO5yhQyNPUctSqDOU9Syh9KUo/DN8");
+        //person.setCategory("2");
+        //resourcePersonList.add(person);
+        //
+        //List<ResourcePersonDept> resourcePersonDeptList = new ArrayList<>();
+        //ResourcePersonDept personDept = new ResourcePersonDept();
+        //personDept.setUserId("1799827959791554562");
+        //personDept.setDeptId("1799803773266235394");
+        //personDept.setPostCode(DefaultConstants.TRAINEE_CODE);
+        //personDept.setDelFlag("0");
+        //resourcePersonDeptList.add(personDept);
+        //
+        //personDept = new ResourcePersonDept();
+        //personDept.setUserId("1799827959791554562");
+        //personDept.setDeptId("ffe051b8cf2e45ddb899d596108699d7");
+        //personDept.setPostCode(DefaultConstants.TRAINEE_CODE);
+        //personDept.setDelFlag("0");
+        //resourcePersonDeptList.add(personDept);
         //endregion
+
         getResourcePeople(resourcePersonDeptList, resourcePersonList);
 
         syncUserStrategyContent.syncUser(resourcePersonList, SyncResourceConstants.TRAINEE);
     }
 
-    /**
+  /**
      * 设置班级查询参数
      *
      * @return 查询参数
@@ -500,6 +501,29 @@ public class SyncTrainService {
 
     /**
      * 学员数据预处理
+     * @param traineeDataBo 同步到的学员数据
+     * @return 学员数据
+     */
+    @NotNull
+    private List<ResourcePerson> getResourcePeople(SyncFullDataBo traineeDataBo) {
+        List<ResourcePerson> resourcePersonList = new ArrayList<>();
+        for (List<String> list : traineeDataBo.getResponseParam().getResourceInfos().get(0).getDataInfo()) {
+            ResourcePerson person = new ResourcePerson();
+            person.setUserId(list.get(0));
+            person.setRealName(list.get(1));
+            person.setSex(list.get(2));
+            person.setPhone(list.get(7));
+            person.setDeptId(list.get(20));
+            person.setPostCode(DefaultConstants.TRAINEE_CODE);
+            person.setIdNumber(list.get(6));
+            person.setCategory("2");
+
+            resourcePersonList.add(person);
+        }
+        return resourcePersonList;
+    }
+    /**
+     * 学员数据预处理 根据学员及学员班级的绑定关系生成人员的部门岗位
      *
      * @param resourcePersonDeptList 学员与班级对应关系
      * @param resourcePersonList     学员