feature: 数据同步

1.同步教务班学员时同步到客房系统

ruoyi-api/ruoyi-api-hotel/src/main/java/org/dromara/hotel/api/domain/bo/RemoteGuestBo.java

@@ -0,0 +1,59 @@
+package org.dromara.hotel.api.domain.bo;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 客人管理业务对象 t_kf_guest
+ *
+ * @author LionLi
+ * @date 2024-11-11
+ */
+@Data
+@Accessors(chain = true)
+public class RemoteGuestBo implements Serializable {
+    @Serial
+    private static final long serialVersionUID = 2230251427296943754L;
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 团客Id
+     */
+    private Long teamId;
+
+    /**
+     * 原始数据ID
+     */
+    private String otherId;
+}

ruoyi-api/ruoyi-api-hotel/src/main/java/org/dromara/hotel/api/domain/vo/RemoteGuestVo.java

@@ -0,0 +1,66 @@
+package org.dromara.hotel.api.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 客人管理视图对象 t_kf_guest
+ *
+ * @author LionLi
+ * @date 2024-11-11
+ */
+@Data
+public class RemoteGuestVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 原始数据ID
+     */
+    private String otherId;
+    /**
+     * 创建人
+     */
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+}

ruoyi-api/ruoyi-api-hotel/src/main/java/org/dromara/hotel/api/service/RemoteGuestService.java

@@ -0,0 +1,39 @@
+package org.dromara.hotel.api.service;
+
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.domain.model.ErrorInfo;
+import org.dromara.hotel.api.domain.bo.RemoteGuestBo;
+import org.dromara.hotel.api.domain.vo.RemoteGuestVo;
+
+/**
+ * @ClassName RemoteGuestService
+ * @Description 酒店系统客人远程服务接口
+ * @Author luoyibo
+ * @Date 2024-11-12 12:40
+ * @Version 1.0
+ * @since jdk17
+ */
+public interface RemoteGuestService {
+
+    /**
+     * 增加客人信息
+     * @param remoteBo 客人业务对象
+     * @return 修改结果
+     */
+    R<ErrorInfo> insertGuestByBo(RemoteGuestBo remoteBo);
+
+    /**
+     * 修改客人信息
+     * @param remoteBo 客人业务对象
+     * @return 修改结果
+     */
+    R<ErrorInfo> updateGuestByBo(RemoteGuestBo remoteBo);
+
+    /**
+     * 查询客人信息
+     *
+     * @param otherId 唯一标识
+     * @return 客人信息
+     */
+    R<RemoteGuestVo> selectGuestByOtherId(String otherId);
+}

ruoyi-api/ruoyi-api-hotel/src/main/java/org/dromara/hotel/api/service/RemoteTeamService.java

@@ -6,7 +6,7 @@ import org.dromara.hotel.api.domain.bo.RemoteTeamBo;
 import org.dromara.hotel.api.domain.vo.RemoteTeamVo;
 
 /**
- * @ClassName RemoteConsumeService
+ * @ClassName RemoteTeamService
  * @Description 酒店系统团客远程服务接口
  * @Author luoyibo
  * @Date 2024-11-12 12:40

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/controller/KfGuestTeamRController.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.KfGuestTeamRVo;
+import org.dromara.hotel.domain.bo.KfGuestTeamRBo;
+import org.dromara.hotel.service.IKfGuestTeamRService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 客人客团关系
+ * 前端访问路由地址为:/basics/kfGuestTeam
+ *
+ * @author LionLi
+ * @date 2024-11-17
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/basics/kfGuestTeam")
+public class KfGuestTeamRController extends BaseController {
+
+    private final IKfGuestTeamRService kfGuestTeamRService;
+
+    /**
+     * 查询客人客团关系列表
+     */
+    @SaCheckPermission("basics:kfGuestTeam:list")
+    @GetMapping("/list")
+    public TableDataInfo<KfGuestTeamRVo> list(KfGuestTeamRBo bo, PageQuery pageQuery) {
+        return kfGuestTeamRService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出客人客团关系列表
+     */
+    @SaCheckPermission("basics:kfGuestTeam:export")
+    @Log(title = "客人客团关系", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(KfGuestTeamRBo bo, HttpServletResponse response) {
+        List<KfGuestTeamRVo> list = kfGuestTeamRService.queryList(bo);
+        ExcelUtil.exportExcel(list, "客人客团关系", KfGuestTeamRVo.class, response);
+    }
+
+    /**
+     * 获取客人客团关系详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("basics:kfGuestTeam:query")
+    @GetMapping("/{id}")
+    public R<KfGuestTeamRVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(kfGuestTeamRService.queryById(id));
+    }
+
+    /**
+     * 新增客人客团关系
+     */
+    @SaCheckPermission("basics:kfGuestTeam:add")
+    @Log(title = "客人客团关系", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody KfGuestTeamRBo bo) {
+        return toAjax(kfGuestTeamRService.insertByBo(bo));
+    }
+
+    /**
+     * 修改客人客团关系
+     */
+    @SaCheckPermission("basics:kfGuestTeam:edit")
+    @Log(title = "客人客团关系", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody KfGuestTeamRBo bo) {
+        return toAjax(kfGuestTeamRService.updateByBo(bo));
+    }
+
+    /**
+     * 删除客人客团关系
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("basics:kfGuestTeam:remove")
+    @Log(title = "客人客团关系", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(kfGuestTeamRService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

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

@@ -0,0 +1,52 @@
+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.io.Serial;
+
+/**
+ * 客人客团关系对象 t_kf_guest_team_r
+ *
+ * @author LionLi
+ * @date 2024-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("t_kf_guest_team_r")
+public class KfGuestTeamR extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 客人ID
+     */
+    private Long guestId;
+
+    /**
+     * 客团ID
+     */
+    private Long teamId;
+
+    /**
+     * 是否报到
+     */
+    private String checkInStatus;
+
+    /**
+     * 删除标志
+     */
+    @TableLogic
+    private String delFlag;
+
+
+}

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

@@ -1,13 +1,11 @@
 package org.dromara.hotel.domain.bo;
 
-import org.dromara.hotel.domain.KfGuest;
-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 lombok.experimental.Accessors;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.hotel.domain.KfGuest;
 
 /**
  * 客人管理业务对象 t_kf_guest
@@ -16,6 +14,7 @@ import jakarta.validation.constraints.*;
  * @date 2024-11-11
  */
 @Data
+@Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = KfGuest.class, reverseConvertGenerate = false)
 public class KfGuestBo extends BaseEntity {
@@ -28,19 +27,16 @@ public class KfGuestBo extends BaseEntity {
     /**
      * 姓名
      */
-    @NotBlank(message = "姓名不能为空", groups = { AddGroup.class, EditGroup.class })
     private String name;
 
     /**
      * 性别
      */
-    @NotBlank(message = "性别不能为空", groups = { AddGroup.class, EditGroup.class })
     private String sex;
 
     /**
      * 身份证号
      */
-    @NotBlank(message = "身份证号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String idCard;
 
     /**
@@ -53,5 +49,13 @@ public class KfGuestBo extends BaseEntity {
      */
     private String remark;
 
+    /**
+     * 团客Id
+     */
+    private Long teamId;
+    /**
+     * 统一标识
+     */
+    private String otherId;
 
 }

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

@@ -0,0 +1,48 @@
+package org.dromara.hotel.domain.bo;
+
+import org.dromara.hotel.domain.KfGuestTeamR;
+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.*;
+
+/**
+ * 客人客团关系业务对象 t_kf_guest_team_r
+ *
+ * @author LionLi
+ * @date 2024-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = KfGuestTeamR.class, reverseConvertGenerate = false)
+public class KfGuestTeamRBo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    @NotNull(message = "主键不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 客人ID
+     */
+    @NotNull(message = "客人ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long guestId;
+
+    /**
+     * 客团ID
+     */
+    @NotNull(message = "客团ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long teamId;
+
+    /**
+     * 是否报到
+     */
+    @NotBlank(message = "是否报到不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String checkInStatus;
+
+
+}

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

@@ -0,0 +1,17 @@
+package org.dromara.hotel.domain.convert;
+
+import io.github.linpeilie.BaseMapper;
+import org.dromara.hotel.api.domain.vo.RemoteGuestVo;
+import org.dromara.hotel.domain.vo.KfGuestVo;
+import org.mapstruct.Mapper;
+import org.mapstruct.MappingConstants;
+import org.mapstruct.ReportingPolicy;
+
+/**
+ * 租户转换器
+ * @author zhujie
+ */
+@Mapper(componentModel = MappingConstants.ComponentModel.SPRING, unmappedTargetPolicy = ReportingPolicy.IGNORE)
+public interface KfGuestVoConvert extends BaseMapper<KfGuestVo, RemoteGuestVo> {
+
+}

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

@@ -0,0 +1,17 @@
+package org.dromara.hotel.domain.convert;
+
+import io.github.linpeilie.BaseMapper;
+import org.dromara.hotel.api.domain.bo.RemoteGuestBo;
+import org.dromara.hotel.domain.bo.KfGuestBo;
+import org.mapstruct.Mapper;
+import org.mapstruct.MappingConstants;
+import org.mapstruct.ReportingPolicy;
+
+/**
+ * 客房客人信息转换器
+ * @author zhujie
+ */
+@Mapper(componentModel = MappingConstants.ComponentModel.SPRING, unmappedTargetPolicy = ReportingPolicy.IGNORE)
+public interface RemoteGuestBoConvert extends BaseMapper<RemoteGuestBo, KfGuestBo> {
+
+}

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

@@ -8,7 +8,7 @@ import org.mapstruct.MappingConstants;
 import org.mapstruct.ReportingPolicy;
 
 /**
- * 租户转换器
+ * 客房团客信息转换器
  * @author zhujie
  */
 @Mapper(componentModel = MappingConstants.ComponentModel.SPRING, unmappedTargetPolicy = ReportingPolicy.IGNORE)

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

@@ -0,0 +1,56 @@
+package org.dromara.hotel.domain.vo;
+
+import org.dromara.hotel.domain.KfGuestTeamR;
+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_guest_team_r
+ *
+ * @author LionLi
+ * @date 2024-11-17
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = KfGuestTeamR.class)
+public class KfGuestTeamRVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ExcelProperty(value = "主键")
+    private Long id;
+
+    /**
+     * 客人ID
+     */
+    @ExcelProperty(value = "客人ID")
+    private Long guestId;
+
+    /**
+     * 客团ID
+     */
+    @ExcelProperty(value = "客团ID")
+    private Long teamId;
+
+    /**
+     * 是否报到
+     */
+    @ExcelProperty(value = "是否报到")
+    private String checkInStatus;
+
+
+}

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/dubbo/RemoteGuestServiceImpl.java

@@ -0,0 +1,95 @@
+package org.dromara.hotel.dubbo;
+
+import cn.hutool.core.util.ObjectUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.dubbo.config.annotation.DubboService;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.domain.model.ErrorInfo;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.hotel.api.domain.bo.RemoteGuestBo;
+import org.dromara.hotel.api.domain.vo.RemoteGuestVo;
+import org.dromara.hotel.api.service.RemoteGuestService;
+import org.dromara.hotel.domain.bo.KfGuestBo;
+import org.dromara.hotel.domain.vo.KfGuestVo;
+import org.dromara.hotel.service.IKfGuestService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @ClassName RemoteGuestServiceImpl
+ * @Description 酒店客人远程服务实现
+ * @Author luoyibo
+ * @Date 2024-11-14 20:31
+ * @Version 1.0
+ * @since jdk17
+ */
+
+@Slf4j
+@Service
+@DubboService
+@RequiredArgsConstructor
+public class RemoteGuestServiceImpl implements RemoteGuestService {
+    private final IKfGuestService kfGuestService;
+
+    /**
+     * 增加团客信息
+     * @param remoteBo 团客业务对象
+     * @return 增加结果
+     */
+    @Override
+    public R<ErrorInfo> insertGuestByBo(RemoteGuestBo remoteBo) {
+        try{
+            KfGuestBo bo = MapstructUtils.convert(remoteBo, KfGuestBo.class);
+            boolean flag = kfGuestService.insertByBo(bo);
+            if(flag){
+                return R.ok("增加客人信息成功");
+            }
+            return R.fail("增加客人信息失败");
+        }catch (Exception e){
+            log.error("增加客人信息失败-{}-{}", JsonUtils.toJsonString(remoteBo),e.getMessage());
+            return R.fail("增加客人信息失败");
+        }
+    }
+
+    /**
+     * 修改客人信息
+     * @param remoteBo 客人业务对象
+     * @return 修改结果
+     */
+    @Override
+    public R<ErrorInfo> updateGuestByBo(RemoteGuestBo remoteBo) {
+        try{
+            KfGuestBo bo = MapstructUtils.convert(remoteBo, KfGuestBo.class);
+            boolean flag = kfGuestService.updateByBo(bo);
+            if(flag){
+                return R.ok("修改客人信息成功");
+            }
+            return R.fail("修改客人信息失败");
+        }catch (Exception e){
+            log.error("修改客人信息失败-{}-{}", JsonUtils.toJsonString(remoteBo),e.getMessage());
+            return R.fail("修改客人信息失败");
+        }
+    }
+
+    /**
+     * 查询已有客人信息
+     *
+     * @param otherId 客人业务对象
+     * @return 客人信息
+     */
+    @Override
+    public R<RemoteGuestVo> selectGuestByOtherId(String otherId) {
+        try {
+            KfGuestBo bo = new KfGuestBo().setOtherId(otherId);
+            KfGuestVo vo = kfGuestService.selectGuestByBo(bo);
+            if (ObjectUtil.isNotEmpty(vo)) {
+                return R.ok(MapstructUtils.convert(vo, RemoteGuestVo.class));
+            }
+            return R.fail("无此客人信息");
+        } catch (Exception e){
+            log.error("获取指定客人信息失败-{}", JsonUtils.toJsonString(otherId));
+            return R.fail("获取客人信息失败");
+        }
+    }
+}

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/dubbo/RemoteTeamServiceImpl.java

@@ -47,7 +47,7 @@ public class RemoteTeamServiceImpl implements RemoteTeamService {
             }
             return R.fail("增加团客信息失败");
         }catch (Exception e){
-            log.error("增加团客信息失败-{}", JsonUtils.toJsonString(remoteBo));
+            log.error("增加团客信息失败-{}-{}", JsonUtils.toJsonString(remoteBo),e.getMessage());
             return R.fail("增加团客信息失败");
         }
     }
@@ -67,7 +67,7 @@ public class RemoteTeamServiceImpl implements RemoteTeamService {
             }
             return R.fail("修改团客信息失败");
         }catch (Exception e){
-            log.error("修改团客信息失败-{}", JsonUtils.toJsonString(remoteBo));
+            log.error("修改团客信息失败-{}-{}", JsonUtils.toJsonString(remoteBo),e.getMessage());
             return R.fail("修改团客信息失败");
         }
     }

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

@@ -0,0 +1,15 @@
+package org.dromara.hotel.mapper;
+
+import org.dromara.hotel.domain.KfGuestTeamR;
+import org.dromara.hotel.domain.vo.KfGuestTeamRVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 客人客团关系Mapper接口
+ *
+ * @author LionLi
+ * @date 2024-11-17
+ */
+public interface KfGuestTeamRMapper extends BaseMapperPlus<KfGuestTeamR, KfGuestTeamRVo> {
+
+}

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

@@ -1,10 +1,9 @@
 package org.dromara.hotel.service;
 
-import org.dromara.hotel.domain.KfGuest;
-import org.dromara.hotel.domain.vo.KfGuestVo;
-import org.dromara.hotel.domain.bo.KfGuestBo;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.hotel.domain.bo.KfGuestBo;
+import org.dromara.hotel.domain.vo.KfGuestVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -66,4 +65,6 @@ public interface IKfGuestService {
      * @return 是否删除成功
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    KfGuestVo selectGuestByBo(KfGuestBo bo);
 }

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

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

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

@@ -1,25 +1,28 @@
 package org.dromara.hotel.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.exception.ServiceException;
 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.common.mybatis.core.page.TableDataInfo;
+import org.dromara.hotel.domain.KfGuest;
 import org.dromara.hotel.domain.bo.KfGuestBo;
+import org.dromara.hotel.domain.bo.KfGuestTeamRBo;
 import org.dromara.hotel.domain.vo.KfGuestVo;
-import org.dromara.hotel.domain.KfGuest;
 import org.dromara.hotel.mapper.KfGuestMapper;
 import org.dromara.hotel.service.IKfGuestService;
+import org.dromara.hotel.service.IKfGuestTeamRService;
+import org.springframework.stereotype.Service;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Collection;
 
 /**
  * 客人管理Service业务层处理
@@ -32,6 +35,7 @@ import java.util.Collection;
 public class KfGuestServiceImpl implements IKfGuestService {
 
     private final KfGuestMapper baseMapper;
+    private final IKfGuestTeamRService guestTeamRService;
 
     /**
      * 查询客人管理
@@ -76,6 +80,7 @@ public class KfGuestServiceImpl implements IKfGuestService {
         lqw.like(StringUtils.isNotBlank(bo.getName()), KfGuest::getName, bo.getName());
         lqw.eq(StringUtils.isNotBlank(bo.getIdCard()), KfGuest::getIdCard, bo.getIdCard());
         lqw.eq(StringUtils.isNotBlank(bo.getPhone()), KfGuest::getPhone, bo.getPhone());
+        lqw.eq(StringUtils.isNotBlank(bo.getOtherId()), KfGuest::getOtherId, bo.getOtherId());
         return lqw;
     }
 
@@ -105,6 +110,7 @@ public class KfGuestServiceImpl implements IKfGuestService {
         if (flag) {
             bo.setId(add.getId());
         }
+        insertGuestTeam(bo);
         return flag;
     }
 
@@ -117,7 +123,10 @@ public class KfGuestServiceImpl implements IKfGuestService {
     @Override
     public Boolean updateByBo(KfGuestBo bo) {
         KfGuest update = MapstructUtils.convert(bo, KfGuest.class);
-        validEntityBeforeSave(update);
+        if (update != null) {
+            validEntityBeforeSave(update);
+        }
+        insertGuestTeam(bo);
         return baseMapper.updateById(update) > 0;
     }
 
@@ -150,4 +159,20 @@ public class KfGuestServiceImpl implements IKfGuestService {
         }
         return baseMapper.deleteByIds(ids) > 0;
     }
+
+    @Override
+    public KfGuestVo selectGuestByBo(KfGuestBo bo) {
+        LambdaQueryWrapper<KfGuest> lqw = this.buildQueryWrapper(bo);
+        return baseMapper.selectVoOne(lqw,KfGuestVo.class);
+    }
+
+    private void insertGuestTeam( KfGuestBo bo) {
+        if (ObjectUtil.isNotEmpty(bo.getTeamId()) && bo.getTeamId() > 0) {
+            KfGuestTeamRBo kfGuestTeamR = new KfGuestTeamRBo();
+            kfGuestTeamR.setTeamId(bo.getTeamId());
+            kfGuestTeamR.setGuestId(bo.getId());
+
+            guestTeamRService.setGuestTeam(kfGuestTeamR);
+        }
+    }
 }

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

@@ -0,0 +1,161 @@
+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.KfGuestTeamRBo;
+import org.dromara.hotel.domain.vo.KfGuestTeamRVo;
+import org.dromara.hotel.domain.KfGuestTeamR;
+import org.dromara.hotel.mapper.KfGuestTeamRMapper;
+import org.dromara.hotel.service.IKfGuestTeamRService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 客人客团关系Service业务层处理
+ *
+ * @author LionLi
+ * @date 2024-11-17
+ */
+@RequiredArgsConstructor
+@Service
+public class KfGuestTeamRServiceImpl implements IKfGuestTeamRService {
+
+    private final KfGuestTeamRMapper baseMapper;
+
+    /**
+     * 查询客人客团关系
+     *
+     * @param id 主键
+     * @return 客人客团关系
+     */
+    @Override
+    public KfGuestTeamRVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询客人客团关系列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 客人客团关系分页列表
+     */
+    @Override
+    public TableDataInfo<KfGuestTeamRVo> queryPageList(KfGuestTeamRBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<KfGuestTeamR> lqw = buildQueryWrapper(bo);
+        Page<KfGuestTeamRVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的客人客团关系列表
+     *
+     * @param bo 查询条件
+     * @return 客人客团关系列表
+     */
+    @Override
+    public List<KfGuestTeamRVo> queryList(KfGuestTeamRBo bo) {
+        LambdaQueryWrapper<KfGuestTeamR> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<KfGuestTeamR> buildQueryWrapper(KfGuestTeamRBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<KfGuestTeamR> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getGuestId() != null, KfGuestTeamR::getGuestId, bo.getGuestId());
+        lqw.eq(bo.getTeamId() != null, KfGuestTeamR::getTeamId, bo.getTeamId());
+        lqw.eq(StringUtils.isNotBlank(bo.getCheckInStatus()), KfGuestTeamR::getCheckInStatus, bo.getCheckInStatus());
+        return lqw;
+    }
+
+    private QueryWrapper<KfGuestTeamR> buildQueryWrapper(KfGuestTeamRBo bo, String tableAlias) {
+        QueryWrapper<KfGuestTeamR> lqw = new QueryWrapper<>();
+        String columnPrefix = "";
+        if (StringUtils.isNotBlank(tableAlias)) {
+            columnPrefix = tableAlias + ".";
+        }
+        lqw.eq(bo.getGuestId() != null, columnPrefix + "guest_id", bo.getGuestId());
+        lqw.eq(bo.getTeamId() != null, columnPrefix + "team_id", bo.getTeamId());
+        lqw.eq(StringUtils.isNotBlank(bo.getCheckInStatus()), columnPrefix + "check_in_status", bo.getCheckInStatus());
+        return lqw;
+    }
+
+    /**
+     * 新增客人客团关系
+     *
+     * @param bo 客人客团关系
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(KfGuestTeamRBo bo) {
+        KfGuestTeamR add = MapstructUtils.convert(bo, KfGuestTeamR.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改客人客团关系
+     *
+     * @param bo 客人客团关系
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(KfGuestTeamRBo bo) {
+        KfGuestTeamR update = MapstructUtils.convert(bo, KfGuestTeamR.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(KfGuestTeamR entity) {
+        // TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除客人客团关系信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+
+    @Override
+    public boolean setGuestTeam(KfGuestTeamRBo bo) {
+        KfGuestTeamR entity = MapstructUtils.convert(bo, KfGuestTeamR.class);
+        LambdaQueryWrapper<KfGuestTeamR> lqw = new LambdaQueryWrapper<KfGuestTeamR>()
+                                                   .eq(KfGuestTeamR::getTeamId, bo.getTeamId())
+                                                   .eq(KfGuestTeamR::getGuestId, bo.getGuestId());
+        KfGuestTeamRVo vo = baseMapper.selectVoOne(lqw);
+        if (vo != null) {
+            if (entity != null) {
+                entity.setId(vo.getId());
+            }
+            return baseMapper.updateById(entity) > 0;
+        } else {
+            return baseMapper.insert(entity)>0;
+        }
+    }
+}

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

@@ -0,0 +1,20 @@
+<?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.KfGuestTeamRMapper">
+
+    <resultMap type="org.dromara.hotel.domain.KfGuestTeamR" id="KfGuestTeamRResult">
+            <result property="id"    column="id"    />
+            <result property="guestId"    column="guest_id"    />
+            <result property="teamId"    column="team_id"    />
+            <result property="checkInStatus"    column="check_in_status"    />
+            <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-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/UserDeptServiceImpl.java

@@ -163,7 +163,6 @@ public class UserDeptServiceImpl implements IUserDeptService {
 
     @Override
     public Boolean setUserDeptPost(UserDeptBo bo) {
-        //this.updateMainDeptByUserId(bo.getUserId());
         UserDept entity = MapstructUtils.convert(bo, UserDept.class);
         LambdaQueryWrapper<UserDept> lqw = new LambdaQueryWrapper<UserDept>()
             .eq(UserDept::getUserId,bo.getUserId())
@@ -179,17 +178,6 @@ public class UserDeptServiceImpl implements IUserDeptService {
             }
             return baseMapper.updateById(entity) > 0;
         }
-        //if (entity != null) {
-        //    entity.setMainDept("Y");
-        //}
-        //if(vo==null){
-        //    return baseMapper.insert(entity) > 0;
-        //} else {
-        //    if (entity != null) {
-        //        entity.setUserDeptId(vo.getUserDeptId());
-        //    }
-        //    return baseMapper.updateById(entity) > 0;
-        //}
     }
 
     @Override

ruoyi-server/ruoyi-server-base/src/main/java/org/dromara/server/base/service/user/SyncRemoteUserService.java

@@ -2,6 +2,7 @@ package org.dromara.server.base.service.user;
 
 import cn.dev33.satoken.secure.BCrypt;
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -9,7 +10,14 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.dromara.common.core.domain.R;
+import org.dromara.common.core.domain.model.ErrorInfo;
 import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.hotel.api.domain.bo.RemoteGuestBo;
+import org.dromara.hotel.api.domain.bo.RemoteTeamBo;
+import org.dromara.hotel.api.domain.vo.RemoteGuestVo;
+import org.dromara.hotel.api.domain.vo.RemoteTeamVo;
+import org.dromara.hotel.api.service.RemoteGuestService;
+import org.dromara.hotel.api.service.RemoteTeamService;
 import org.dromara.server.base.util.EncryptorUtil;
 import org.dromara.server.common.constant.DefaultConstants;
 import org.dromara.server.common.domain.bo.ResourcePerson;
@@ -49,6 +57,10 @@ public class SyncRemoteUserService {
     private final RemoteDeptService remoteDeptService;
     @DubboReference
     private final RemotePostService remotePostService;
+    @DubboReference
+    private final RemoteGuestService remoteGuestService;
+    @DubboReference
+    private final RemoteTeamService remoteTeamService;
 
     /**
      * 单个人员同步处理
@@ -59,16 +71,16 @@ public class SyncRemoteUserService {
     public R<RemoteUserVo> syncPeron(ResourcePerson person) {
         try {
             String otherId = person.getUserId();
-            //获取人员在一卡通系统中的数据
+            // 获取人员在一卡通系统中的数据
             RemoteUserVo remoteUserVo = remoteUserService.selectUserVoByOtherId(otherId);
-            //组装入库的人员业务对象
+            // 组装入库的人员业务对象
             R<RemoteUserBo> result = setUserInfo(person, remoteUserVo);
             if (result.getCode() == R.SUCCESS) {
                 if (ObjectUtil.isEmpty(remoteUserVo)) {
-                    //不存在此人员，增加
+                    // 不存在此人员，增加
                     return remoteUserService.insertUser(result.getData());
                 } else {
-                    //存在此人员，修改
+                    // 存在此人员，修改
                     return remoteUserService.updateUser(result.getData());
                 }
             }
@@ -108,7 +120,7 @@ public class SyncRemoteUserService {
             tenantId = DefaultConstants.TENANT_ID;
             person.setTenantId(tenantId);
         }
-        //获取人员对应的部门信息
+        // 获取人员对应的部门信息
         RemoteDeptVo remoteDeptVo = remoteDeptService.selectDeptByOtherId(person.getDeptId(), tenantId);
         if (remoteDeptVo == null) {
             return R.fail("没有找到对应的部门信息");
@@ -139,7 +151,7 @@ public class SyncRemoteUserService {
         remoteUserBo.setCardType(getUserCardType(person));
         remoteUserBo.setLifespan(getUserLifespan(person, remoteDeptVo));
         remoteUserBo.setTenantId(tenantId);
-        //身份证
+        // 身份证
         String idNumber = person.getIdNumber();
         if (StrUtil.isNotEmpty(idNumber)) {
             remoteUserBo.setIdNumber(getUserIdNumber(idNumber));
@@ -166,7 +178,7 @@ public class SyncRemoteUserService {
         if (StrUtil.isNotEmpty(person.getCardType())) {
             return Long.valueOf(person.getCardType());
         }
-        //默认卡类
+        // 默认卡类
         String cardType = "1";
         String category = person.getCategory();
         String userState = person.getUserState();
@@ -225,7 +237,7 @@ public class SyncRemoteUserService {
     private Long getUserPostId(String postCode, String tenantId) {
         List<RemotePostVo> postVos = selectPostVoByTenantId(tenantId);
         List<Long> postIds = postVos.stream().filter(post -> postCode.equals(post.getPostCode()))
-            .map(RemotePostVo::getPostId).toList();
+                                 .map(RemotePostVo::getPostId).toList();
         if (postIds.isEmpty()) {
             return DefaultConstants.POST_ID;
         }
@@ -240,16 +252,16 @@ public class SyncRemoteUserService {
      */
     private String getUserName(ResourcePerson person) {
         String userName = person.getUserName();
-        //如果同步的有登录账号，返回同步的登录账号
+        // 如果同步的有登录账号，返回同步的登录账号
         if (StrUtil.isNotEmpty(userName)) {
             return userName;
         }
         String phone = person.getPhone();
-        //如果同步没有登录账号，但同步有手机号，则将手机号作为登录账号
+        // 如果同步没有登录账号，但同步有手机号，则将手机号作为登录账号
         if (StrUtil.isNotEmpty(phone)) {
             return phone;
         }
-        //如果都没有，则要自动生成一个
+        // 如果都没有，则要自动生成一个
         String temp = DateUtil.format(new Date(), "yyyyMMdd");
         String cacheKey = person.getTenantId() + "_day_number:";
         Integer count = RedisUtils.getCacheObject(cacheKey);
@@ -272,15 +284,15 @@ public class SyncRemoteUserService {
         String category = person.getCategory();
         Long[] roleIds = new Long[1];
         switch (category) {
-            //教职工
+            // 教职工
             case "1":
                 roleIds[0] = DefaultConstants.TEACHER_ROLE_ID;
                 break;
-            //学员
+            // 学员
             case "2":
                 roleIds[0] = DefaultConstants.TRAIN_ROLE_ID;
                 break;
-            //研究生
+            // 研究生
             case "3":
                 roleIds[0] = DefaultConstants.GRADUATE_ROLE_ID;
                 break;
@@ -297,7 +309,7 @@ public class SyncRemoteUserService {
      */
     private List<RemoteUserDeptBo> getUserDept(ResourcePerson person) {
         List<ResourcePersonDept> resourcePersonDeptList = person.getUserDeptList();
-        if (ObjectUtil.isEmpty(resourcePersonDeptList)) {
+        if (CollectionUtil.isEmpty(resourcePersonDeptList)) {
             return null;
         }
         List<RemoteUserDeptBo> remoteUserDeptBos = new ArrayList<>();
@@ -316,4 +328,57 @@ public class SyncRemoteUserService {
 
         return remoteUserDeptBos;
     }
+
+    public R<ErrorInfo> syncGuest(ResourcePerson person) {
+        String otherId = person.getUserId();
+        try {
+            R<RemoteGuestVo> result = remoteGuestService.selectGuestByOtherId(otherId);
+            R<RemoteGuestBo> getBo = setGuestInfo(person, result.getData());
+            if (R.isSuccess(getBo)) {
+                if (R.isSuccess(result)) {
+                    return remoteGuestService.updateGuestByBo(getBo.getData());
+                } else {
+                    return remoteGuestService.insertGuestByBo(getBo.getData());
+                }
+            }
+            return R.fail(getBo.getMsg());
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return R.fail(e.getMessage());
+        }
+    }
+
+    private R<RemoteGuestBo> setGuestInfo(ResourcePerson person, RemoteGuestVo remoteGuestVo) {
+        RemoteGuestBo remoteGuestBo;
+        if (ObjectUtil.isEmpty(remoteGuestVo)) {
+            remoteGuestBo = new RemoteGuestBo();
+        } else {
+            remoteGuestBo = BeanUtil.copyProperties(remoteGuestVo, RemoteGuestBo.class);
+        }
+        remoteGuestBo.setName(person.getRealName());
+        remoteGuestBo.setSex(person.getSex());
+        // remoteGuestBo.setIdCard(person.getIdNumber());
+        remoteGuestBo.setPhone(person.getPhone());
+        remoteGuestBo.setRemark(person.getRemark());
+        remoteGuestBo.setTeamId(getGuestTeamId(person));
+        remoteGuestBo.setOtherId(person.getUserId());
+        String idNumber = person.getIdNumber();
+        if (StrUtil.isNotEmpty(idNumber)) {
+            remoteGuestBo.setIdCard(getUserIdNumber(idNumber));
+        }
+        return R.ok(remoteGuestBo);
+    }
+
+    private Long getGuestTeamId(ResourcePerson person) {
+        if (CollectionUtil.isNotEmpty(person.getUserDeptList())) {
+            String deptId = person.getUserDeptList().get(0).getDeptId();
+            RemoteTeamBo remoteTeamBo = new RemoteTeamBo().setOtherId(deptId).setTenantId(person.getTenantId());
+            RemoteTeamVo remoteTeamVo = remoteTeamService.selectTeamByBo(remoteTeamBo).getData();
+            if (ObjectUtil.isNotEmpty(remoteTeamVo)) {
+                return remoteTeamVo.getId();
+            }
+        }
+
+        return 0L;
+    }
 }

ruoyi-server/ruoyi-server-base/src/main/java/org/dromara/server/base/service/user/strategy/impl/SyncTraineeStrategyImpl.java

@@ -3,6 +3,7 @@ package org.dromara.server.base.service.user.strategy.impl;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.domain.R;
+import org.dromara.common.core.domain.model.ErrorInfo;
 import org.dromara.common.json.utils.JsonUtils;
 import org.dromara.server.base.service.user.SyncRemoteUserService;
 import org.dromara.server.base.service.user.strategy.ISyncUserStrategy;
@@ -34,7 +35,7 @@ public class SyncTraineeStrategyImpl implements ISyncUserStrategy {
     @Override
     public boolean syncUser(List<ResourcePerson> persons) {
         List<String> syncMessage = new ArrayList<>();
-
+        List<String> syncGuestMessage = new ArrayList<>();
         persons.forEach(person -> {
             R<RemoteUserVo> result = syncUserService.syncPeron(person);
             if (result.getCode() == R.SUCCESS) {
@@ -42,8 +43,16 @@ public class SyncTraineeStrategyImpl implements ISyncUserStrategy {
             } else {
                 syncMessage.add(MessageFormat.format("[同步培训学员失败]-[{0}]-[{1}]", JsonUtils.toJsonString(person), result.getMsg()));
             }
+
+            R<ErrorInfo> resultGuest = syncUserService.syncGuest(person);
+            if(R.isSuccess(resultGuest)){
+                syncGuestMessage.add(MessageFormat.format("[同步团客人员成功]-[{0}]", JsonUtils.toJsonString(person)));
+            } else {
+                syncGuestMessage.add(MessageFormat.format("[同步团客人员员失败]-[{0}]-[{1}]", JsonUtils.toJsonString(person), result.getMsg()));
+            }
         });
         syncMessage.forEach(log::info);
+        syncGuestMessage.forEach(log::info);
         return true;
     }
 }

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/controller/SyncTest.java

@@ -0,0 +1,33 @@
+package org.dromara.server.sync.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.server.sync.service.SyncTrainService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @ClassName SyncTest
+ * @Description TODO
+ * @Author luoyibo
+ * @Date 2024-11-15 22:29
+ * @Version 1.0
+ * @since jdk17
+ */
+@Validated
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/test")
+public class SyncTest {
+    private final SyncTrainService syncTrainService;
+
+    @GetMapping("/sync/trainee")
+    public void syncTrainee() {
+        syncTrainService.syncTrainee();
+    }
+    @GetMapping("/sync/train/class")
+    public void syncTrainClass() {
+        syncTrainService.syncTrainClass();
+    }
+}

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

@@ -1,8 +1,6 @@
 package org.dromara.server.sync.service;
 
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.http.HttpRequest;
-import cn.hutool.json.JSONUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.server.base.service.dept.strategy.SyncDeptStrategyContent;
@@ -68,46 +66,55 @@ public class SyncTrainService {
         dept.setPayCheck("0");
         dept.setPlanCount(100);
         dept.setDept_num("9");
+        dept.setTenantId(DefaultConstants.TENANT_ID);
         // endregion
 
         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);
-        //
+        // SyncFullDataBo traineeDataBo = new SyncFullDataBo();
+        // HttpRequest req = CreateHttpRequest.createRequest();
+        // req.body(getQueryBodyForTrainee());
+        // // 获取到培训学员数据
+        // try(HttpResponse res = req.execute()) {
+        //     traineeDataBo = JSONUtil.toBean(res.body(), SyncFullDataBo.class);
+        //     resourcePersonList = getResourcePeople(traineeDataBo);
+        // } catch (Exception e){
+        //     log.error(e.getMessage());
+        // }
+        // // 获取到的学员与培训班对应关系
         // 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());
+        // try (HttpResponse res = req.execute()) {
+        //     SyncFullDataBo classTraineeDataBo = JSONUtil.toBean(res.body(), SyncFullDataBo.class);
+        //     resourcePersonDeptList = getResourcePersonDeptList(classTraineeDataBo);
+        // } catch (Exception e) {
+        //     log.error(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");
+        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");
@@ -117,7 +124,7 @@ public class SyncTrainService {
         // endregion
 
         getResourcePeople(resourcePersonDeptList, resourcePersonList);
-        log.info("[全量获取到的培训学员数据]-[{}]条-[{}]", resourcePersonList.size(), JSONUtil.toJsonStr(traineeDataBo));
+        // log.info("[全量获取到的培训学员数据]-[{}]条-[{}]", resourcePersonList.size(), JSONUtil.toJsonStr(traineeDataBo));
 
         syncUserStrategyContent.syncUser(resourcePersonList, SyncResourceConstants.TRAINEE);
     }