feature: 客房系统

1.增加团客管理的相关代码

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/controller/KfTeamController.java

@@ -0,0 +1,106 @@
+package org.dromara.hotel.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.hotel.domain.vo.KfTeamVo;
+import org.dromara.hotel.domain.bo.KfTeamBo;
+import org.dromara.hotel.service.IKfTeamService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 客团信息
+ * 前端访问路由地址为:/basics/kfTeam
+ *
+ * @author LionLi
+ * @date 2024-11-15
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/basics/kfTeam")
+public class KfTeamController extends BaseController {
+
+    private final IKfTeamService kfTeamService;
+
+    /**
+     * 查询客团信息列表
+     */
+    @SaCheckPermission("basics:kfTeam:list")
+    @GetMapping("/list")
+    public TableDataInfo<KfTeamVo> list(KfTeamBo bo, PageQuery pageQuery) {
+        return kfTeamService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出客团信息列表
+     */
+    @SaCheckPermission("basics:kfTeam:export")
+    @Log(title = "客团信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(KfTeamBo bo, HttpServletResponse response) {
+        List<KfTeamVo> list = kfTeamService.queryList(bo);
+        ExcelUtil.exportExcel(list, "客团信息", KfTeamVo.class, response);
+    }
+
+    /**
+     * 获取客团信息详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("basics:kfTeam:query")
+    @GetMapping("/{id}")
+    public R<KfTeamVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(kfTeamService.queryById(id));
+    }
+
+    /**
+     * 新增客团信息
+     */
+    @SaCheckPermission("basics:kfTeam:add")
+    @Log(title = "客团信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody KfTeamBo bo) {
+        return toAjax(kfTeamService.insertByBo(bo));
+    }
+
+    /**
+     * 修改客团信息
+     */
+    @SaCheckPermission("basics:kfTeam:edit")
+    @Log(title = "客团信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody KfTeamBo bo) {
+        return toAjax(kfTeamService.updateByBo(bo));
+    }
+
+    /**
+     * 删除客团信息
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("basics:kfTeam:remove")
+    @Log(title = "客团信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(kfTeamService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/domain/KfTeam.java

@@ -0,0 +1,69 @@
+package org.dromara.hotel.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serial;
+
+/**
+ * 客团信息对象 t_kf_team
+ *
+ * @author LionLi
+ * @date 2024-11-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("t_kf_team")
+public class KfTeam extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 客团名称
+     */
+    private String name;
+
+    /**
+     * 入住时间
+     */
+    private Date startTime;
+
+    /**
+     * 退住时间
+     */
+    private Date endTime;
+
+    /**
+     * 预计人数
+     */
+    private Long planQuantity;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 原始数据ID
+     */
+    private String otherId;
+
+    /**
+     * 删除标志
+     */
+    @TableLogic
+    private String delFlag;
+
+
+}

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/domain/bo/KfTeamBo.java

@@ -0,0 +1,68 @@
+package org.dromara.hotel.domain.bo;
+
+import org.dromara.hotel.domain.KfTeam;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 客团信息业务对象 t_kf_team
+ *
+ * @author LionLi
+ * @date 2024-11-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = KfTeam.class, reverseConvertGenerate = false)
+public class KfTeamBo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    @NotNull(message = "主键不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 客团名称
+     */
+    @NotBlank(message = "客团名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String name;
+
+    /**
+     * 入住时间
+     */
+    @NotNull(message = "入住时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date startTime;
+
+    /**
+     * 退住时间
+     */
+    @NotNull(message = "退住时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date endTime;
+
+    /**
+     * 预计人数
+     */
+    @NotNull(message = "预计人数不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long planQuantity;
+
+    /**
+     * 备注
+     */
+    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+    /**
+     * 原始数据ID
+     */
+    @NotBlank(message = "原始数据ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String otherId;
+
+
+}

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/domain/vo/KfTeamVo.java

@@ -0,0 +1,76 @@
+package org.dromara.hotel.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.hotel.domain.KfTeam;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 客团信息视图对象 t_kf_team
+ *
+ * @author LionLi
+ * @date 2024-11-15
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = KfTeam.class)
+public class KfTeamVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ExcelProperty(value = "主键")
+    private Long id;
+
+    /**
+     * 客团名称
+     */
+    @ExcelProperty(value = "客团名称")
+    private String name;
+
+    /**
+     * 入住时间
+     */
+    @ExcelProperty(value = "入住时间")
+    private Date startTime;
+
+    /**
+     * 退住时间
+     */
+    @ExcelProperty(value = "退住时间")
+    private Date endTime;
+
+    /**
+     * 预计人数
+     */
+    @ExcelProperty(value = "预计人数")
+    private Long planQuantity;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 原始数据ID
+     */
+    @ExcelProperty(value = "原始数据ID")
+    private String otherId;
+
+
+}

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/mapper/KfTeamMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.hotel.mapper;
+
+import org.dromara.hotel.domain.KfTeam;
+import org.dromara.hotel.domain.vo.KfTeamVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 客团信息Mapper接口
+ *
+ * @author LionLi
+ * @date 2024-11-15
+ */
+public interface KfTeamMapper extends BaseMapperPlus<KfTeam, KfTeamVo> {
+
+}

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/service/IKfTeamService.java

@@ -0,0 +1,69 @@
+package org.dromara.hotel.service;
+
+import org.dromara.hotel.domain.KfTeam;
+import org.dromara.hotel.domain.vo.KfTeamVo;
+import org.dromara.hotel.domain.bo.KfTeamBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 客团信息Service接口
+ *
+ * @author LionLi
+ * @date 2024-11-15
+ */
+public interface IKfTeamService {
+
+    /**
+     * 查询客团信息
+     *
+     * @param id 主键
+     * @return 客团信息
+     */
+    KfTeamVo queryById(Long id);
+
+    /**
+     * 分页查询客团信息列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 客团信息分页列表
+     */
+    TableDataInfo<KfTeamVo> queryPageList(KfTeamBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的客团信息列表
+     *
+     * @param bo 查询条件
+     * @return 客团信息列表
+     */
+    List<KfTeamVo> queryList(KfTeamBo bo);
+
+    /**
+     * 新增客团信息
+     *
+     * @param bo 客团信息
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(KfTeamBo bo);
+
+    /**
+     * 修改客团信息
+     *
+     * @param bo 客团信息
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(KfTeamBo bo);
+
+    /**
+     * 校验并批量删除客团信息信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/service/impl/KfTeamServiceImpl.java

@@ -0,0 +1,148 @@
+package org.dromara.hotel.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.dromara.hotel.domain.bo.KfTeamBo;
+import org.dromara.hotel.domain.vo.KfTeamVo;
+import org.dromara.hotel.domain.KfTeam;
+import org.dromara.hotel.mapper.KfTeamMapper;
+import org.dromara.hotel.service.IKfTeamService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 客团信息Service业务层处理
+ *
+ * @author LionLi
+ * @date 2024-11-15
+ */
+@RequiredArgsConstructor
+@Service
+public class KfTeamServiceImpl implements IKfTeamService {
+
+    private final KfTeamMapper baseMapper;
+
+    /**
+     * 查询客团信息
+     *
+     * @param id 主键
+     * @return 客团信息
+     */
+    @Override
+    public KfTeamVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询客团信息列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 客团信息分页列表
+     */
+    @Override
+    public TableDataInfo<KfTeamVo> queryPageList(KfTeamBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<KfTeam> lqw = buildQueryWrapper(bo);
+        Page<KfTeamVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的客团信息列表
+     *
+     * @param bo 查询条件
+     * @return 客团信息列表
+     */
+    @Override
+    public List<KfTeamVo> queryList(KfTeamBo bo) {
+        LambdaQueryWrapper<KfTeam> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<KfTeam> buildQueryWrapper(KfTeamBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<KfTeam> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getName()), KfTeam::getName, bo.getName());
+        lqw.eq(bo.getStartTime() != null, KfTeam::getStartTime, bo.getStartTime());
+        lqw.eq(bo.getEndTime() != null, KfTeam::getEndTime, bo.getEndTime());
+        lqw.eq(bo.getPlanQuantity() != null, KfTeam::getPlanQuantity, bo.getPlanQuantity());
+        lqw.eq(StringUtils.isNotBlank(bo.getOtherId()), KfTeam::getOtherId, bo.getOtherId());
+        return lqw;
+    }
+
+    private QueryWrapper<KfTeam> buildQueryWrapper(KfTeamBo bo,String tableAlias) {
+        QueryWrapper<KfTeam> lqw = new QueryWrapper<>();
+        String columnPrefix = "";
+        if(StringUtils.isNotBlank(tableAlias)){
+            columnPrefix = tableAlias + ".";
+        }
+        lqw.like(StringUtils.isNotBlank(bo.getName()), columnPrefix+"name", bo.getName());
+        lqw.eq(bo.getStartTime() != null, columnPrefix+"start_time", bo.getStartTime());
+        lqw.eq(bo.getEndTime() != null, columnPrefix+"end_time", bo.getEndTime());
+        lqw.eq(bo.getPlanQuantity() != null, columnPrefix+"plan_quantity", bo.getPlanQuantity());
+        lqw.eq(StringUtils.isNotBlank(bo.getOtherId()), columnPrefix+"other_id", bo.getOtherId());
+        return lqw;
+    }
+
+    /**
+     * 新增客团信息
+     *
+     * @param bo 客团信息
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(KfTeamBo bo) {
+        KfTeam add = MapstructUtils.convert(bo, KfTeam.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改客团信息
+     *
+     * @param bo 客团信息
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(KfTeamBo bo) {
+        KfTeam update = MapstructUtils.convert(bo, KfTeam.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(KfTeam entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除客团信息信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-hotel/src/main/resources/mapper/hotel/basics/KfTeamMapper.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.hotel.mapper.KfTeamMapper">
+
+    <resultMap type="org.dromara.hotel.domain.KfTeam" id="KfTeamResult">
+            <result property="id"    column="id"    />
+            <result property="name"    column="name"    />
+            <result property="startTime"    column="start_time"    />
+            <result property="endTime"    column="end_time"    />
+            <result property="planQuantity"    column="plan_quantity"    />
+            <result property="remark"    column="remark"    />
+            <result property="otherId"    column="other_id"    />
+            <result property="createBy"    column="create_by"    />
+            <result property="createTime"    column="create_time"    />
+            <result property="updateBy"    column="update_by"    />
+            <result property="updateTime"    column="update_time"    />
+            <result property="createDept"    column="create_dept"    />
+            <result property="tenantId"    column="tenant_id"    />
+            <result property="delFlag"    column="del_flag"    />
+    </resultMap>
+</mapper>

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

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

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

@@ -1,6 +1,4 @@
 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;
@@ -39,62 +37,84 @@ public class SyncTrainService {
     private final SyncUserStrategyContent syncUserStrategyContent;
 
     public void syncTrainClass() {
-        HttpRequest req = CreateHttpRequest.createRequest();
-        req.body(getQueryBodyForClass());
+        // HttpRequest req = CreateHttpRequest.createRequest();
+        // req.body(getQueryBodyForClass());
+        //
+        // SyncFullDataBo dataBo = JSONUtil.toBean(req.execute().body(), SyncFullDataBo.class);
+        //
+        // List<ResourceDept> resourceDeptlist = new ArrayList<>();
+        // for (List<String> list : dataBo.getResponseParam().getResourceInfos().get(0).getDataInfo()) {
+        //     ResourceDept dept = convertClassToDept(list);
+        //     resourceDeptlist.add(dept);
+        // }
+        // log.info("[全量获取到的培训班级数据]-[{}]条-[{}]", resourceDeptlist.size(), JSONUtil.toJsonStr(dataBo));
+        //
+        //region 模拟测试数据
+        List<ResourceDept> resourceDeptlist = new ArrayList<>();
+        ResourceDept dept = new ResourceDept();
+        resourceDeptlist.add(dept);
+        dept.setDept_id("1828720861385904129");
+        dept.setDept_name("2024年秋季学期乡镇长进修班");
+        dept.setYear(2004);
+        dept.setSemester("1");
 
-        SyncFullDataBo dataBo = JSONUtil.toBean(req.execute().body(), SyncFullDataBo.class);
+        dept.setPayBegin(DateUtil.parse("2024-08-28 00:00:00"));
+        dept.setCheckDate(DateUtil.parseDate("2024-08-28 00:00:00"));
+        dept.setBeginDate(DateUtil.parseDate("2024-08-31 00:00:00"));
+        dept.setEndDate(DateUtil.parse("2024-09-30 00:00:00", "yyyy-MM-dd HH:mm:ss"));
+        dept.setPayEnd(DateUtil.parse("2024-09-30 00:00:00", "yyyy-MM-dd HH:mm:ss"));
+        dept.setChooseRoom("0");
+        dept.setCanEat("1");
+        dept.setPayCheck("0");
+
+        dept.setDept_num("9");
+        //endregion
 
-        List<ResourceDept> resourceDeptlist = new ArrayList<>();
-        for (List<String> list : dataBo.getResponseParam().getResourceInfos().get(0).getDataInfo()) {
-            ResourceDept dept = convertClassToDept(list);
-            resourceDeptlist.add(dept);
-        }
-        log.info("[全量获取到的培训班级数据]-[{}]条-[{}]", resourceDeptlist.size(), JSONUtil.toJsonStr(dataBo));
         syncDeptStrategyContent.syncDept(resourceDeptlist, SyncResourceConstants.TRAIN_CLASS);
     }
 
     public void syncTrainee() {
         HttpRequest req = CreateHttpRequest.createRequest();
         req.body(getQueryBodyForTrainee());
-        //获取到培训学员数据
+        // 获取到培训学员数据
         SyncFullDataBo traineeDataBo = JSONUtil.toBean(req.execute().body(), SyncFullDataBo.class);
 
         List<ResourcePerson> resourcePersonList = getResourcePeople(traineeDataBo);
 
-        //获取到的学员与培训班对应关系
+        // 获取到的学员与培训班对应关系
         req.body(getQueryBodyForClassTrainee());
         SyncFullDataBo classTraineeDataBo = JSONUtil.toBean(req.execute().body(), SyncFullDataBo.class);
         List<ResourcePersonDept> resourcePersonDeptList = getResourcePersonDeptList(classTraineeDataBo);
 
-        //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);
+        // 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);
+        // 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
+        // personDept = new ResourcePersonDept();
+        // personDept.setUserId("1799827959791554562");
+        // personDept.setDeptId("ffe051b8cf2e45ddb899d596108699d7");
+        // personDept.setPostCode(DefaultConstants.TRAINEE_CODE);
+        // personDept.setDelFlag("0");
+        // resourcePersonDeptList.add(personDept);
+        // endregion
 
         getResourcePeople(resourcePersonDeptList, resourcePersonList);
         log.info("[全量获取到的培训学员数据]-[{}]条-[{}]", resourcePersonList.size(), JSONUtil.toJsonStr(traineeDataBo));
@@ -102,7 +122,7 @@ public class SyncTrainService {
         syncUserStrategyContent.syncUser(resourcePersonList, SyncResourceConstants.TRAINEE);
     }
 
-  /**
+    /**
      * 设置班级查询参数
      *
      * @return 查询参数
@@ -455,7 +475,7 @@ public class SyncTrainService {
      * @return 班级信息
      */
     private ResourceDept convertClassToDept(List<String> list) {
-         ResourceDept dept = new ResourceDept();
+        ResourceDept dept = new ResourceDept();
         dept.setDept_id(list.get(0));
         dept.setDept_name(list.get(1));
         dept.setYear(Integer.valueOf(list.get(4)));
@@ -487,13 +507,13 @@ public class SyncTrainService {
         List<ResourcePersonDept> resourcePersonDeptList = new ArrayList<>();
         for (List<String> personDeptSr : classTraineeDataBo.getResponseParam().getResourceInfos().get(0).getDataInfo()) {
             ResourcePersonDept personDept = new ResourcePersonDept();
-            //学员Id
+            // 学员Id
             personDept.setUserId(personDeptSr.get(1));
-            //班级Id
+            // 班级Id
             personDept.setDeptId(personDeptSr.get(0));
-            //岗位编码，默认为学员
+            // 岗位编码，默认为学员
             personDept.setPostCode(DefaultConstants.TRAINEE_CODE);
-            //和班级的绑定状态 0-正常 1-已报到一卡通不处理 2-退学 一卡通删除
+            // 和班级的绑定状态 0-正常 1-已报到一卡通不处理 2-退学 一卡通删除
             personDept.setDelFlag(personDeptSr.get(2).equals(isCheck) ? "0" : personDeptSr.get(2));
             resourcePersonDeptList.add(personDept);
         }
@@ -502,6 +522,7 @@ public class SyncTrainService {
 
     /**
      * 学员数据预处理
+     *
      * @param traineeDataBo 同步到的学员数据
      * @return 学员数据
      */
@@ -523,6 +544,7 @@ public class SyncTrainService {
         }
         return resourcePersonList;
     }
+
     /**
      * 学员数据预处理 根据学员及学员班级的绑定关系生成人员的部门岗位
      *
@@ -531,15 +553,15 @@ public class SyncTrainService {
      */
     private void getResourcePeople(List<ResourcePersonDept> resourcePersonDeptList, List<ResourcePerson> resourcePersonList) {
         resourcePersonList.forEach(resourcePerson -> {
-            //找出该学员绑定的所有班级
+            // 找出该学员绑定的所有班级
             List<ResourcePersonDept> personDeptList = resourcePersonDeptList.stream()
-                .filter(p -> p.getUserId().equals(resourcePerson.getUserId()))
-                .toList();
-            //将绑定班级中的学员当前班级设置成主部门
+                                                          .filter(p -> p.getUserId().equals(resourcePerson.getUserId()))
+                                                          .toList();
+            // 将绑定班级中的学员当前班级设置成主部门
             personDeptList.forEach(personDept -> {
                 if (personDept.getDeptId().equals(resourcePerson.getDeptId())) {
                     personDept.setMainDept("Y");
-                }else{
+                } else {
                     personDept.setMainDept("N");
                 }
             });