Bläddra i källkod

feature: 同步服务
1.恢复生产环境同步

luoyb 1 år sedan
förälder
incheckning
c4b112413e

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

@@ -91,67 +91,67 @@ public class SyncTrainService {
      * @return Boolean
      */
     public Boolean syncTrainee() {
-        //HttpRequest req = CreateHttpRequest.createRequest();
-        //req.body(getQueryBodyForTrainee());
-        //// 获取到培训学员数据
-        //try (HttpResponse res = req.execute()) {
-        //    SyncFullDataBo traineeDataBo = JSONUtil.toBean(res.body(), SyncFullDataBo.class);
-        //    List<ResourcePerson> resourcePersonList = getResourcePeople(traineeDataBo);
-        //
-        //    // 获取到的学员与培训班对应关系
-        //    req.body(getQueryBodyForClassTrainee());
-        //    try (HttpResponse resTraineeClass = req.execute()) {
-        //        SyncFullDataBo classTraineeDataBo = JSONUtil.toBean(resTraineeClass.body(), SyncFullDataBo.class);
-        //        List<ResourcePersonDept> resourcePersonDeptList = getResourcePersonDeptList(classTraineeDataBo);
-        //
-        //        getResourcePeople(resourcePersonDeptList, resourcePersonList);
-        //        log.info("[全量获取到的培训学员数据]-[{}]条-[{}]", resourcePersonList.size(), JSONUtil.toJsonStr(traineeDataBo));
-        //
-        //        syncUserStrategyContent.syncUser(resourcePersonList, SyncResourceConstants.TRAINEE);
-        //        return true;
-        //    } catch (Exception e) {
-        //        log.error(e.getMessage());
-        //        throw new ServiceException(e.getMessage());
-        //    }
-        //} catch (Exception e) {
-        //    log.error(e.getMessage());
-        //    throw new ServiceException(e.getMessage());
-        //}
-
-        // region 模拟测试数据
-         List<ResourcePerson> resourcePersonList = new ArrayList<>();
-         ResourcePerson person = new ResourcePerson();
-         person.setTenantId(DefaultConstants.TENANT_ID);
-         person.setUserId("1799827959791554562");
-         person.setDeptId("1828720861385904129");
-         person.setPostCode(DefaultConstants.TRAINEE_CODE);
-         person.setRealName("赵开羽");
-         person.setSex("1");
-         person.setPhone("18974390367");
-         person.setIdNumber("XP4aO5yhQyNPUctSqDOU9Syh9KUo/DN8");
-         person.setCategory("2");
-         person.setOperatorId(DefaultConstants.FULL_SYNC_ADMIN);
-         resourcePersonList.add(person);
+        HttpRequest req = CreateHttpRequest.createRequest();
+        req.body(getQueryBodyForTrainee());
+        // 获取到培训学员数据
+        try (HttpResponse res = req.execute()) {
+            SyncFullDataBo traineeDataBo = JSONUtil.toBean(res.body(), SyncFullDataBo.class);
+            List<ResourcePerson> resourcePersonList = getResourcePeople(traineeDataBo);
 
-         List<ResourcePersonDept> resourcePersonDeptList = new ArrayList<>();
-         ResourcePersonDept personDept = new ResourcePersonDept();
-         personDept.setUserId("1799827959791554562");
-         personDept.setDeptId("1828720861385904129");
-         personDept.setPostCode(DefaultConstants.TRAINEE_CODE);
-         personDept.setDelFlag("0");
-         resourcePersonDeptList.add(personDept);
+            // 获取到的学员与培训班对应关系
+            req.body(getQueryBodyForClassTrainee());
+            try (HttpResponse resTraineeClass = req.execute()) {
+                SyncFullDataBo classTraineeDataBo = JSONUtil.toBean(resTraineeClass.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);
-         getResourcePeople(resourcePersonDeptList, resourcePersonList);
+                getResourcePeople(resourcePersonDeptList, resourcePersonList);
+                log.info("[全量获取到的培训学员数据]-[{}]条-[{}]", resourcePersonList.size(), JSONUtil.toJsonStr(traineeDataBo));
 
-         syncUserStrategyContent.syncUser(resourcePersonList, SyncResourceConstants.TRAINEE);
+                syncUserStrategyContent.syncUser(resourcePersonList, SyncResourceConstants.TRAINEE);
+                return true;
+            } catch (Exception e) {
+                log.error(e.getMessage());
+                throw new ServiceException(e.getMessage());
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage());
+            throw new ServiceException(e.getMessage());
+        }
 
-         return true;
+        // region 模拟测试数据
+        // List<ResourcePerson> resourcePersonList = new ArrayList<>();
+        // ResourcePerson person = new ResourcePerson();
+        // person.setTenantId(DefaultConstants.TENANT_ID);
+        // person.setUserId("1799827959791554562");
+        // person.setDeptId("1828720861385904129");
+        // person.setPostCode(DefaultConstants.TRAINEE_CODE);
+        // person.setRealName("赵开羽");
+        // person.setSex("1");
+        // person.setPhone("18974390367");
+        // person.setIdNumber("XP4aO5yhQyNPUctSqDOU9Syh9KUo/DN8");
+        // person.setCategory("2");
+        // person.setOperatorId(DefaultConstants.FULL_SYNC_ADMIN);
+        // resourcePersonList.add(person);
+        //
+        // List<ResourcePersonDept> resourcePersonDeptList = new ArrayList<>();
+        // ResourcePersonDept personDept = new ResourcePersonDept();
+        // personDept.setUserId("1799827959791554562");
+        // personDept.setDeptId("1828720861385904129");
+        // 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);
+        // getResourcePeople(resourcePersonDeptList, resourcePersonList);
+        //
+        // syncUserStrategyContent.syncUser(resourcePersonList, SyncResourceConstants.TRAINEE);
+        //
+        // return true;
         // endregion
     }