1、增加从旧平台同步数据逻辑

2、增加同步职位类型逻辑
3、增加同步企业、人员账号逻辑
4、增加同步发布职位逻辑

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/sync/SyncController.java

@@ -1,6 +1,7 @@
 package com.citu.module.menduner.system.controller.admin.sync;
 
 import com.citu.framework.common.pojo.CommonResult;
+import com.citu.module.menduner.system.old.MdeOldSyncService;
 import com.citu.module.menduner.system.service.sync.ESDataSyncService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -22,10 +23,20 @@ public class SyncController {
     @Resource
     private ESDataSyncService service;
 
+    @Resource
+    private MdeOldSyncService oldService;
+
     @PostMapping("/es")
     @Operation(summary = "同步ES相关数据")
     public CommonResult<Boolean> syncData() {
         service.syncData();
         return success(true);
     }
+
+    @PostMapping("/old/run")
+    @Operation(summary = "同步旧的门墩平台数据")
+    public CommonResult<Boolean> syncOld() {
+        oldService.run();
+        return success(true);
+    }
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/enterprise/EnterpriseDO.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
-import com.citu.framework.mybatis.core.dataobject.BaseDO;
 import com.citu.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;
 
@@ -44,6 +43,10 @@ public class EnterpriseDO extends TenantBaseDO {
      * 企业别称
      */
     private String anotherName;
+    /**
+     * 外文名
+     */
+    private String foreignName;
     /**
      * 企业官网
      */

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/person/PersonInfoDO.java

@@ -34,6 +34,10 @@ public class PersonInfoDO extends TenantBaseDO {
      * 真实姓名
      */
     private String name;
+    /**
+     * 外文姓名
+     */
+    private String foreignName;
     /**
      * 用户性别
      */

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/enterprise/EnterpriseMapper.java

@@ -109,7 +109,7 @@ public interface EnterpriseMapper extends BaseMapperX<EnterpriseDO> {
     default PageResult<EnterpriseBaseSimpleRespVO> search(AppEnterpriseSearchPageReqVO reqVO) {
         MPJLambdaWrapperX<EnterpriseDO> query = new MPJLambdaWrapperX<>();
         query.selectAll(EnterpriseDO.class);
-        query.innerJoin(EnterpriseBusinessDO.class, EnterpriseBusinessDO::getEnterpriseId, EnterpriseDO::getId);
+        query.leftJoin(EnterpriseBusinessDO.class, EnterpriseBusinessDO::getEnterpriseId, EnterpriseDO::getId);
         if (StringUtils.hasText(reqVO.getName())) {
             query.and(wrapper -> wrapper
                     .likeIfExists(EnterpriseDO::getName, reqVO.getName())

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/old/MdeOldSyncService.java

@@ -0,0 +1,325 @@
+package com.citu.module.menduner.system.old;
+
+import com.citu.framework.common.util.date.DateUtils;
+import com.citu.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.citu.framework.tenant.core.util.TenantUtils;
+import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseDO;
+import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseUserBindDO;
+import com.citu.module.menduner.system.dal.dataobject.job.JobAdvertisedDO;
+import com.citu.module.menduner.system.dal.dataobject.person.PersonInfoDO;
+import com.citu.module.menduner.system.dal.dataobject.position.PositionDO;
+import com.citu.module.menduner.system.dal.dataobject.user.MdeUserDO;
+import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseMapper;
+import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseUserBindMapper;
+import com.citu.module.menduner.system.dal.mysql.job.JobAdvertisedMapper;
+import com.citu.module.menduner.system.dal.mysql.person.PersonInfoMapper;
+import com.citu.module.menduner.system.dal.mysql.position.PositionMapper;
+import com.citu.module.menduner.system.dal.mysql.user.MdeUserMapper;
+import com.citu.module.menduner.system.enums.MendunerStatusEnum;
+import com.citu.module.menduner.system.enums.enterprise.EnterpriseUserTypeEnum;
+import com.citu.module.menduner.system.old.dataobject.OldMdeDepartment;
+import com.citu.module.menduner.system.old.dataobject.OldMdeJobAdvertised;
+import com.citu.module.menduner.system.old.dataobject.OldMdePosition;
+import com.citu.module.menduner.system.old.dataobject.OldMdeUser;
+import com.citu.module.menduner.system.old.mysql.OldMdeDepartmentMapper;
+import com.citu.module.menduner.system.old.mysql.OldMdeJobAdvertisedMapper;
+import com.citu.module.menduner.system.old.mysql.OldMdePositionMapper;
+import com.citu.module.menduner.system.old.mysql.OldMdeUserMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
+
+/**
+ * 门墩儿 老平台的数据同步
+ **/
+@Slf4j
+@Component
+public class MdeOldSyncService {
+
+    @Resource
+    private OldMdeDepartmentMapper oldMdeDepartmentMapper;
+
+    @Resource
+    private OldMdePositionMapper oldPositionMapper;
+
+    @Resource
+    private PositionMapper positionMapper;
+
+    @Resource
+    private OldMdeUserMapper oldUserMapper;
+
+    @Resource
+    private MdeUserMapper mdeUserMapper;
+
+    @Resource
+    private PersonInfoMapper personInfoMapper;
+
+    @Resource
+    private PasswordEncoder passwordEncoder;
+
+    @Resource
+    private EnterpriseUserBindMapper enterpriseUserBindMapper;
+
+    @Resource
+    private EnterpriseMapper enterpriseMapper;
+
+    @Resource
+    private OldMdeJobAdvertisedMapper oldJobAdvertisedMapper;
+
+    @Resource
+    private JobAdvertisedMapper jobAdvertisedMapper;
+
+    private String url = "https://www.mendunerhr.com/";
+
+
+    public void run() {
+        // 同步职位信息
+       // syncPosition();
+        // 同步用户信息
+        syncUser();
+       // syncJob();
+
+    }
+
+    private void execute(Runnable runnable) {
+        TenantUtils.execute(155L, runnable);
+    }
+
+    public void syncPosition() {
+
+        // 部门 or 职位类型
+        List<OldMdeDepartment> oldDepartmentList = oldMdeDepartmentMapper.selectList(OldMdeDepartment::getDelFlag, 0);
+
+        List<OldMdePosition> oldMdePositionList = oldPositionMapper.selectList(OldMdePosition::getDelFlag, 0);
+
+        Long top = 8L;
+        PositionDO topPosition = positionMapper.selectOne(PositionDO::getNameEn, "old");
+        if (null == topPosition) {
+            execute(() -> {
+                positionMapper.insert(PositionDO.builder()
+                        .id(top)
+                        .parentId(0L)
+                        .nameCn("old")
+                        .nameEn("old")
+                        .level(1)
+                        .sort(0)
+                        .build());
+            });
+
+        }
+        Long leader = 9L;
+        oldDepartmentList.stream().forEach(
+                oldMdeDepartment -> {
+                    // 查询是否存在
+                    PositionDO positionDO = null;
+
+                    if (0 == oldMdeDepartment.getDepdId()) {
+                        positionDO = positionMapper.selectOne(PositionDO::getId, leader);
+                    } else {
+                        positionDO = positionMapper.selectOne(PositionDO::getId, oldMdeDepartment.getDepdId());
+                    }
+                    if (null != positionDO) {
+                        return;
+                    }
+                    execute(() -> {
+                        positionMapper.insert(PositionDO.builder()
+                                .id(0 == oldMdeDepartment.getDepdId() ? leader : Long.valueOf(oldMdeDepartment.getDepdId()))
+                                .parentId(top)
+                                .nameCn(oldMdeDepartment.getDepdNameCn())
+                                .nameEn(oldMdeDepartment.getDepdNameEn())
+                                .level(2)
+                                .sort(0)
+                                .build());
+                    });
+                }
+        );
+
+        oldMdePositionList.forEach(oldMdePosition -> {
+            // 查询是否存在
+            PositionDO positionDO = positionMapper.selectOne(PositionDO::getId, oldMdePosition.getPositionId());
+            if (null != positionDO) {
+                return;
+            }
+            PositionDO insertionDO = PositionDO.builder()
+                    .id(Long.valueOf(oldMdePosition.getPositionId()))
+                    .parentId(Long.valueOf(oldMdePosition.getDepdId()))
+                    .nameCn(oldMdePosition.getPositionNameCn())
+                    .nameEn(oldMdePosition.getPositionNameEn())
+                    .level(oldMdePosition.getPositionGrade())
+                    .requirement(oldMdePosition.getRequirement())
+                    .content(oldMdePosition.getDescribe())
+                    .sort(0)
+                    .build();
+
+            if (0 == oldMdePosition.getDepdId()) {
+                insertionDO.setLevel(2);
+                insertionDO.setParentId(leader);
+            } else {
+                insertionDO.setLevel(3);
+            }
+
+            execute(() -> {
+                // 插入职位类型
+                positionMapper.insert(insertionDO);
+            });
+
+        });
+
+    }
+
+
+    public void syncUser() {
+
+        // 个人用户
+        List<OldMdeUser> userList = oldUserMapper.selectList(new LambdaQueryWrapperX<OldMdeUser>()
+                .eq(OldMdeUser::getDelFlag, 0)
+        );
+
+        // 新增用户 or 人才基本信息
+        userList.stream().forEach(oldMdeUser -> {
+            MdeUserDO userDO = mdeUserMapper.selectOne(MdeUserDO::getId, oldMdeUser.getUserCode());
+
+            MdeUserDO insertionDO = MdeUserDO.builder()
+                    .id(oldMdeUser.getUserCode())
+                    .username(oldMdeUser.getUserName())
+                    // 重置密码手机号后6位
+                    .password(passwordEncoder.encode("123456"))
+                    .email(oldMdeUser.getEmail())
+                    // 有座机，大坑
+                    .phone(oldMdeUser.getUserName())
+                    .avatar(null==oldMdeUser.getHeadPortrait()?null:url + oldMdeUser.getHeadPortrait())
+                    .status(MendunerStatusEnum.ENABLE.getStatus())
+                    .build();
+
+
+            PersonInfoDO personInfoDO = personInfoMapper.getByUserId(oldMdeUser.getUserCode());
+            personInfoDO = PersonInfoDO.builder()
+                    .id(personInfoDO != null ? personInfoDO.getId() : null)
+                    .userId(oldMdeUser.getUserCode())
+                    .name(oldMdeUser.getName())
+                    .foreignName(oldMdeUser.getForeignName())
+                    // 有座机，大坑
+                    .phone(oldMdeUser.getUserName().contains("+")?null:oldMdeUser.getUserName())
+                    .email(oldMdeUser.getEmail())
+                    .firstWorkTime(null == oldMdeUser.getFirstWork() ? null : oldMdeUser.getFirstWork().atStartOfDay())
+                    .jobStatus(oldMdeUser.getWorkStatus())
+                    .advantage(oldMdeUser.getIntroduction())
+                    .avatar(null==oldMdeUser.getHeadPortrait()?null:url + oldMdeUser.getHeadPortrait())
+                    .build();
+
+            if (null != oldMdeUser.getBirthday()) {
+                personInfoDO.setBirthday(DateUtils.of(oldMdeUser.getBirthday(), FORMAT_YEAR_MONTH_DAY).atStartOfDay());
+            }
+
+            PersonInfoDO finalPersonInfoDO = personInfoDO;
+            execute(() -> {
+                personInfoMapper.insertOrUpdate(finalPersonInfoDO);
+            });
+
+            if (null != userDO) {
+                return;
+            }
+            execute(() -> {
+                mdeUserMapper.insertOrUpdate(insertionDO);
+            });
+
+
+
+
+        });
+
+
+        // 企业用户
+        List<OldMdeUser> enterpriseUserList = userList.stream().filter(c -> c.getIdentityFlag().equals("1")).collect(Collectors.toList());
+        enterpriseUserList.forEach(oldMdeUser -> {
+            EnterpriseUserBindDO userDO = enterpriseUserBindMapper.selectOne(EnterpriseUserBindDO::getUserId, oldMdeUser.getUserCode());
+
+            // 借用用户编号作为企业编号匹配唯一键（旧平台只会存在人-企业一对一）
+            EnterpriseDO enterpriseDO =  enterpriseMapper.selectOne(EnterpriseDO::getId, oldMdeUser.getUserCode());
+
+
+            EnterpriseDO enterpriseInsertionDO = EnterpriseDO.builder()
+                    .id(null==enterpriseDO?oldMdeUser.getUserCode():enterpriseDO.getId())
+                    .parentId(0L)
+                    .name(oldMdeUser.getName())
+                    .foreignName(oldMdeUser.getForeignName())
+                    .anotherName(oldMdeUser.getName())
+                    .website(oldMdeUser.getWebsite())
+                    .introduce(oldMdeUser.getIntroduction())
+                    .contact(oldMdeUser.getEntContacts())
+                    .phone(oldMdeUser.getEntPhone())
+                    .logoUrl(null==oldMdeUser.getHeadPortrait()?null:url + oldMdeUser.getHeadPortrait())
+                    // 营业执照暂时放这
+                    .albumList(null==oldMdeUser.getImage()?null:Collections.singletonList(url +oldMdeUser.getImage()))
+                    .status(MendunerStatusEnum.ENABLE.getStatus())
+                    .build();
+
+
+            EnterpriseUserBindDO userInsertionDO = EnterpriseUserBindDO.builder()
+                    .id(null==userDO?oldMdeUser.getUserCode():userDO.getId())
+                    .enterpriseId(oldMdeUser.getUserCode())
+                    .userId(oldMdeUser.getUserCode())
+                    .name(oldMdeUser.getEntContacts())
+                    .avatar(null==oldMdeUser.getHeadPortrait()?null:url + oldMdeUser.getHeadPortrait())
+                    .email(oldMdeUser.getUserName())
+                    .password((passwordEncoder.encode(oldMdeUser.getUserName())))
+                    .phone(oldMdeUser.getEntPhone())
+                    .userType(EnterpriseUserTypeEnum.ADMIN.getType())
+                    .build();
+
+            execute(() -> {
+                // 插入企业信息
+                enterpriseMapper.insertOrUpdate(enterpriseInsertionDO);
+            });
+            execute(() -> {
+                // 插入企业用户绑定信息
+                enterpriseUserBindMapper.insertOrUpdate(userInsertionDO);
+            });
+        });
+
+
+    }
+
+    public void syncJob() {
+        // 职位信息
+        List<OldMdeJobAdvertised> jobList = oldJobAdvertisedMapper.selectList(OldMdeJobAdvertised::getDelFlag, 0);
+        jobList.stream().forEach(oldMdeJobAdvertised -> {
+            JobAdvertisedDO jobAdvertisedDO = jobAdvertisedMapper.selectOne(JobAdvertisedDO::getId, oldMdeJobAdvertised.getJobId());
+
+            JobAdvertisedDO insertionDO = JobAdvertisedDO.builder()
+                    .id(null==jobAdvertisedDO?oldMdeJobAdvertised.getJobId():jobAdvertisedDO.getId())
+                    .name(oldMdeJobAdvertised.getJobName())
+                    .content(oldMdeJobAdvertised.getJobDescribe())
+                    .requirement(oldMdeJobAdvertised.getJobRequirement())
+                    .positionId(Long.valueOf(oldMdeJobAdvertised.getPositionId()))
+                    .userId(oldMdeJobAdvertised.getPublisher())
+                    .enterpriseId(oldMdeJobAdvertised.getPublisher())
+                    .address(oldMdeJobAdvertised.getWorkExperience())
+                    .longitude(String.valueOf(oldMdeJobAdvertised.getAddLongitude()))
+                    .latitude(String.valueOf(oldMdeJobAdvertised.getAddLatitude()))
+                    // 不知道 学历要求和工作经验要求能否对准
+                    .eduType(oldMdeJobAdvertised.getEducation())
+                    .expType(oldMdeJobAdvertised.getWorkExperience())
+                    .payFrom(oldMdeJobAdvertised.getPayFrom())
+                    .payTo(oldMdeJobAdvertised.getPayTo())
+                    .status(oldMdeJobAdvertised.getJobStatus())
+                    .build();
+
+            execute(() -> {
+                jobAdvertisedMapper.insertOrUpdate(insertionDO);
+            });
+        });
+
+    }
+
+    public void syncPersonExtend() {
+        // 人才教育经历、工作经验、投递记录信息
+    }
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/old/dataobject/MdeJobAdvertised.java

@@ -1,73 +0,0 @@
-package com.citu.module.menduner.system.old.dataobject;
-
-import com.baomidou.dynamic.datasource.annotation.Slave;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Slave
-@Data
-@TableName("mde_job_advertised")
-public class MdeJobAdvertised extends BaseEntity {
-
-    private Integer jobId; // 职位ID（自增）
-
-    private String publisher; // 发布者(用户code)
-
-    private String jobName; // 职位名称
-
-    private Integer positionId; // 职位类别（职位信息表code）
-
-    private String addProvince; // 工作地点-省
-
-    private String addProvinceName; //  省名称
-
-    private String addCity; // 工作地点-市
-
-    private String addCityName; // 市名称
-
-    private String addArea; // 工作地点-区
-
-    private String addAreaName; //  区名称
-
-    private String addDetail; // 工作地点详细地址
-
-    private double addLongitude; // 工作地点-经度
-    private double addLatitude; // 工作地点-纬度
-
-    private String workExperience; // 工作经验（字典表对应code）
-
-    private String education; // 学历（字典表管理，以数值表示）
-
-    private String jobDescribe; // 职位描述
-
-    private String jobStatus; // 职位发布状态[0-招聘中；1-结束]
-
-    private String recommendFlag; //首推标识[0-不推荐；1-推荐 字典表-recommended]
-
-    private String jobRequirement;
-    private String jobInvitation;
-    private String contactInformation;
-
-    private String publisherName;// 发布者名称
-
-    private String headPortrait;// 企业头像
-
-    private String foreignName; //外文名称
-
-    private String identityFlag; // 身份标识
-
-    // 筹开标识
-    private String prepareFlag;
-
-    // 筹开年份
-    private String prepareYear;
-    // 筹开季度
-    private String prepareQuarter;
-
-    private BigDecimal payFrom; // 薪资From
-
-    private BigDecimal payTo; // 薪资To
-
-}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/old/dataobject/MdeUser.java

@@ -1,86 +0,0 @@
-package com.citu.module.menduner.system.old.dataobject;
-
-import com.baomidou.dynamic.datasource.annotation.Slave;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-@Slave
-@Data
-@TableName("mde_user")
-public class MdeUser extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-    private String userCode; // 用户code(自增)
-    private String unionId; // 微信unionId 不同公众号下 unionId相同
-    private String openId; // 微信openid
-    private String openIdMini; // 微信小程序openid
-    private String linkedinId; // 领英账号
-    private String userName; // 登录名[手机号-个人/邮箱-企业]（全局唯一）
-    private String password; // 密码（手机号+密码 混合md5加密）
-    private String name; // 用户姓名（个人）/企业名称（企业）
-    private String foreignName; // 外文名称
-    private String hotelBrand; // 从业酒店品牌code（酒店品牌信息表）
-    private String hotelBrandStr; // 从业酒店品牌名称（品牌信息表中不存在的情况下，用户自由填写）
-    private String entContacts; // 企业联系人
-    private String entPhone; // 企业联系电话
-    private String headPortrait; // 头像（存放头像相对存放地址）
-    private String email; // 邮箱地址（个人用户）
-    // private String addrCountry; // 地址-国家/地区[三位字母代码（ISO 3166-1 alpha-3）]
-    private String addrProvince; // 地址-省（中国）
-    private String addrCity; // 地址-市（中国）
-    private String addrArea; // 地址-区（中国）
-    private String phoneCode; // 国家区号码
-    private String image; // 名片（个人）/营业执照（企业）
-    private String identityFlag; // 身份标识[0-个人；1-企业]
-    private String vipFlag; // 会员标识[0-非会员；1-会员]
-    private Date dueDate; // 会员到期时间
-    private String allowFlag; // 登录开关[0-可登录；1-不可登录]
-    private String careAbout; // 关注的企业(用户id，逗号分隔)
-    private Long fansCount; // 粉丝数
-    private String likeList; // 点赞过的资讯id（以逗号分隔）
-    private String shareList; // 分享的资讯id（以逗号分隔）
-    private String positionList; // 收藏的职位id（以逗号分隔）
-    private String positionTitle; // 当前职位头衔
-    private String checkStatus; // 审核状态
-    private String checkRemarks; // 审核内容
-    private String onJobImage; // 在职证明
-    private String birthday;// 生日
-    private Date firstWork;// 初次参加工作时间
-
-    private String studentFlag;    // 学生标识[0-社招; 1-在校生]
-    private Integer experience;// 行业经验
-    private Integer educationResumeFlag; // 教育经历是否填写
-    private String addDetail;// 工作地点详细地址
-    private double addLongitude;// 工作地点-经度
-    private double addLatitude;// 工作地点-纬度
-    private String website;// 企业官网
-    private Integer workStatus;// 工作状态(字典表维护)[0-无跳槽打算；1-在职-到岗时间待定；2-在职-到岗时间1月左右；3-离职]
-    private String international;// 国际区分[1-国际;2-国内;9-未知]
-    private String introduction; // 个人、企业简介
-    private String recommendFlag; // 是否推送标志
-
-    private String address;
-    private String coName;
-    private String isFriend; // 是否是好友 0不是好友 1是好友
-
-    private String inviter; // 邀请人
-
-    // 筹开标识
-    private String prepareFlag;
-    // 筹开年份
-    private String prepareYear;
-    // 筹开季度
-    private String prepareQuarter;
-    //隐私标志[0-正常；1-隐私]
-    private String privateFlag;
-
-    //订阅标志[0-未订阅；1-订阅]
-    private String subscribedFlag;
-
-    private String topBackgroundPc; // 个人中心顶部背景图-PC
-    private String topBackgroundMbl; // 个人中心顶部背景图-移动
-    private String portraitBackgroundPc; // 头像中心背景图-PC
-    private String portraitBackgroundMbl; // 头像中心背景图-移动
-}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/old/dataobject/MdeUserCv.java

@@ -1,17 +0,0 @@
-package com.citu.module.menduner.system.old.dataobject;
-
-import com.baomidou.dynamic.datasource.annotation.Slave;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-@Slave
-@Data
-@TableName("mde_user_cv")
-public class MdeUserCv extends BaseEntity {
-	
-	private static final long serialVersionUID = 1L;
-	private Long cvId;		// 动态id
-	private String userCode;		// 用户code
-	private String cvTitle;		// 简历标题
-	private String cvUrl;		// 简历地址
-}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/old/dataobject/BaseEntity.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/old/dataobject/OldBaseEntity.java

@@ -6,7 +6,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 @Data
-public class BaseEntity implements Serializable, Cloneable{
+public class OldBaseEntity implements Serializable, Cloneable{
 
     private static final long serialVersionUID = 1L;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/old/dataobject/MdeDepartment.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/old/dataobject/OldMdeDepartment.java

@@ -1,13 +1,16 @@
 package com.citu.module.menduner.system.old.dataobject;
 
-import com.baomidou.dynamic.datasource.annotation.Slave;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
+import lombok.*;
 
-@Slave
+@TableName(value = "mde_department", autoResultMap = true)
 @Data
-@TableName("mde_department")
-public class MdeDepartment extends BaseEntity {
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class OldMdeDepartment extends OldBaseEntity {
 
     private static final long serialVersionUID = 1L;
     private Integer depdId;        // 部门id
@@ -15,6 +18,5 @@ public class MdeDepartment extends BaseEntity {
     private String depdNameEn;        // 部门名称-英文
     private Integer sort;        // 排序字段
 
-    private String depdName;        // 部门名称
 
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/old/dataobject/MdeEducationExperience.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/old/dataobject/OldMdeEducationExperience.java

@@ -1,15 +1,13 @@
 package com.citu.module.menduner.system.old.dataobject;
 
-import com.baomidou.dynamic.datasource.annotation.Slave;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.util.Date;
 
-@Slave
 @Data
 @TableName("mde_education_experience")
-public class MdeEducationExperience extends BaseEntity {
+public class OldMdeEducationExperience extends OldBaseEntity {
 
 
     private Integer eduId; // 教育履历ID（自增）

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/old/dataobject/OldMdeJobAdvertised.java

@@ -0,0 +1,97 @@
+package com.citu.module.menduner.system.old.dataobject;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+@TableName("mde_job_advertised")
+public class OldMdeJobAdvertised extends OldBaseEntity {
+
+    /**
+     * 职位ID（自增）
+     */
+    @TableId
+    private Integer jobId;
+    /**
+     * 发布者(用户code)
+     */
+    private Long publisher;
+    /**
+     * 职位名称
+     */
+    private String jobName;
+    /**
+     * 职位类别（标准职位信息表id）
+     */
+    private Integer positionId;
+    /**
+     * 工作地点-省
+     */
+    private String addProvince;
+    /**
+     * 工作地点-市
+     */
+    private String addCity;
+    /**
+     * 工作地点-区
+     */
+    private String addArea;
+    /**
+     * 工作地点详细地址
+     */
+    private String addDetail;
+    /**
+     * 工作地点-经度
+     */
+    private BigDecimal addLongitude;
+    /**
+     * 工作地点-纬度
+     */
+    private BigDecimal addLatitude;
+    /**
+     * 工作经验（字典表对应code）
+     */
+    private String workExperience;
+    /**
+     * 学历（字典表管理，以数值表示）
+     */
+    private String education;
+    /**
+     * 职位内容
+     */
+    private String jobDescribe;
+    /**
+     * 职位发布状态[0-招聘中；1-结束]
+     */
+    private String jobStatus;
+    /**
+     * 首推标识[0-不推荐；1-推荐 字典表-recommended]
+     */
+    private String recommendFlag;
+    /**
+     * 薪资From
+     */
+    private BigDecimal payFrom;
+    /**
+     * 薪资To
+     */
+    private BigDecimal payTo;
+    /**
+     * 职位要求
+     */
+    private String jobRequirement;
+    /**
+     * 职位邀请(json形式存储，key-受邀的用户id，value-邀请内容
+     */
+    private String jobInvitation;
+    /**
+     * 联系方式
+     */
+    private String contactInformation;
+
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/old/dataobject/MdePosition.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/old/dataobject/OldMdePosition.java

@@ -1,13 +1,12 @@
 package com.citu.module.menduner.system.old.dataobject;
 
-import com.baomidou.dynamic.datasource.annotation.Slave;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-@Slave
 @Data
-@TableName("mde_user")
-public class MdePosition extends BaseEntity {
+@TableName("mde_position")
+public class OldMdePosition extends OldBaseEntity {
 
     private Integer positionId;        // 职位id
     private Integer depdId;        // 部门id(部门信息表)
@@ -15,8 +14,7 @@ public class MdePosition extends BaseEntity {
     private String positionNameEn;        // 职位名称-英文
     private Integer positionGrade;        // 职位等级
     private String requirement; // 默认职位要求
+    @TableField("`describe`")
     private String describe; // 默认职位内容
-    private String depdName; // 部门名称
-    private String positionName;        // 职位名称（传给前台）
 
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/old/dataobject/OldMdeUser.java

@@ -0,0 +1,221 @@
+package com.citu.module.menduner.system.old.dataobject;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+@Data
+@TableName("mde_user")
+public class OldMdeUser extends OldBaseEntity {
+
+    /**
+     * 用户code
+     */
+    @TableId
+    private Long userCode;
+    /**
+     * 微信unionid
+     */
+    private String unionid;
+    /**
+     * 微信 手机端openId
+     */
+    private String openid;
+    /**
+     * 微信小程序openId
+     */
+    private String openidMini;
+    /**
+     * 领英账号
+     */
+    private String linkedinId;
+    /**
+     * 登录名[手机号-个人/邮箱-企业]（全局唯一）
+     */
+    private String userName;
+    /**
+     * 密码（手机号+密码 混合md5加密）
+     */
+    private String password;
+    /**
+     * 外文名称
+     */
+    private String foreignName;
+    /**
+     * 用户姓名（个人）/企业名称（企业）
+     */
+    private String name;
+    /**
+     * 从业酒店子品牌code（酒店子品牌信息表）
+     */
+    private String hotelBrand;
+    /**
+     * 从业酒店子品牌名称（品牌信息表中不存在的情况下，用户自由填写）
+     */
+    private String hotelBrandStr;
+    /**
+     * 企业联系人
+     */
+    private String entContacts;
+    /**
+     * 企业联系电话
+     */
+    private String entPhone;
+    /**
+     * 头像（存放头像相对存放地址）
+     */
+    private String headPortrait;
+    /**
+     * 邮箱地址（个人用户）
+     */
+    private String email;
+    /**
+     * 地址-省（中国）[企业-公司地址；个人-意向工作地]
+     */
+    private String addrProvince;
+    /**
+     * 地址-市（中国）
+     */
+    private String addrCity;
+    /**
+     * 地址-区（中国）
+     */
+    private String addrArea;
+    /**
+     * 国际手机区号
+     */
+    private String phoneCode;
+    /**
+     * 名片（个人）/营业执照（企业）
+     */
+    private String image;
+    /**
+     * 身份标识[0-个人；1-企业]
+     */
+    private String identityFlag;
+    /**
+     * 会员标识[11-个人一级；12-个人二级；13-个人三级；19-个人试用；20-职位发布；21-企业一级；22-企业二级；23-企业三级；24-筹开企业；29-企业试用]
+     */
+    private String vipFlag;
+    /**
+     * 简介
+     */
+    private String introduction;
+    /**
+     * 会员到期时间
+     */
+    private LocalDate dueDate;
+    /**
+     * 登录开关[0-可登录；1-不可登录]
+     */
+    private String allowFlag;
+    /**
+     * 关注的企业(用户id，逗号分隔)
+     */
+    private String careAbout;
+    /**
+     * 粉丝数
+     */
+    private Long fansCount;
+    /**
+     * 点赞过的资讯id（以逗号分隔）
+     */
+    private String likeList;
+    /**
+     * 分享的资讯id（以逗号分隔）
+     */
+    private String shareList;
+    /**
+     * 收藏的职位id（以逗号分隔）
+     */
+    private String positionList;
+    /**
+     * 邀请人
+     */
+    private String inviter;
+    /**
+     * 推荐标识[1-推荐；0-不推荐]
+     */
+    private String recommendFlag;
+    /**
+     * 筹开标识[0-运营酒店；1-筹开酒店 字典表对应]
+     */
+    private String prepareFlag;
+    /**
+     * 筹开年份
+     */
+    private String prepareYear;
+    /**
+     * 筹开季度[Q1，Q2，Q3，Q4]
+     */
+    private String prepareQuarter;
+    /**
+     * 隐私标志[0-正常；1-隐私]
+     */
+    private String privateFlag;
+    /**
+     * 订阅标志[0-未订阅；1-订阅]
+     */
+    private String subscribedFlag;
+    /**
+     * 生日
+     */
+    private String birthday;
+    /**
+     * 学生标识[0-社招；1-在校生]
+     */
+    private String studentFlag;
+    /**
+     * 初次参加工作时间
+     */
+    private LocalDate firstWork;
+    /**
+     * 行业经验
+     */
+    private Integer experience;
+    /**
+     * 工作地点详细地址
+     */
+    private String addDetail;
+    /**
+     * 工作地点-经度
+     */
+    private BigDecimal addLongitude;
+    /**
+     * 工作地点-纬度
+     */
+    private BigDecimal addLatitude;
+    /**
+     * 企业官网
+     */
+    private String website;
+    /**
+     * 工作状态(字典表维护)[0-无跳槽打算；1-在职-考虑换个环境；2-在职-有好的工作可考虑；3-离职]
+     */
+    private String workStatus;
+    /**
+     * 国际区分[1-国际;2-国内;9-未知]
+     */
+    private String international;
+    /**
+     * 审核状态[1-待审核；2-通过；3-拒绝；4-待激活]
+     */
+    private String checkStatus;
+    /**
+     * 审核意见
+     */
+    private String checkRemarks;
+    /**
+     * 到期时间
+     */
+    private LocalDateTime finishTime;
+    /**
+     * 操作人员在职证明
+     */
+    private String onJobImage;
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/old/dataobject/OldMdeUserCv.java

@@ -0,0 +1,15 @@
+package com.citu.module.menduner.system.old.dataobject;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("mde_user_cv")
+public class OldMdeUserCv extends OldBaseEntity {
+
+    private static final long serialVersionUID = 1L;
+    private Long cvId;        // 动态id
+    private String userCode;        // 用户code
+    private String cvTitle;        // 简历标题
+    private String cvUrl;        // 简历地址
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/old/dataobject/MdeWorkExperience.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/old/dataobject/OldMdeWorkExperience.java

@@ -1,16 +1,14 @@
 package com.citu.module.menduner.system.old.dataobject;
 
-import com.baomidou.dynamic.datasource.annotation.Slave;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.Date;
 
-@Slave
 @Data
 @TableName("mde_work_experience")
-public class MdeWorkExperience extends BaseEntity {
+public class OldMdeWorkExperience extends OldBaseEntity {
 
     private Integer workId; // 工作履历ID（自增）
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/old/mysql/OldMdeDepartmentMapper.java

@@ -0,0 +1,11 @@
+package com.citu.module.menduner.system.old.mysql;
+
+import com.baomidou.dynamic.datasource.annotation.Slave;
+import com.citu.framework.mybatis.core.mapper.BaseMapperX;
+import com.citu.module.menduner.system.old.dataobject.OldMdeDepartment;
+import org.apache.ibatis.annotations.Mapper;
+
+@Slave
+@Mapper
+public interface OldMdeDepartmentMapper extends BaseMapperX<OldMdeDepartment> {
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/old/mysql/OldMdeEducationExperienceMapper.java

@@ -0,0 +1,12 @@
+package com.citu.module.menduner.system.old.mysql;
+
+import com.baomidou.dynamic.datasource.annotation.Slave;
+import com.citu.framework.mybatis.core.mapper.BaseMapperX;
+import com.citu.module.menduner.system.old.dataobject.OldMdeEducationExperience;
+import org.apache.ibatis.annotations.Mapper;
+
+@Slave
+@Mapper
+public interface OldMdeEducationExperienceMapper extends BaseMapperX<OldMdeEducationExperience> {
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/old/mysql/OldMdeJobAdvertisedMapper.java

@@ -0,0 +1,11 @@
+package com.citu.module.menduner.system.old.mysql;
+
+import com.baomidou.dynamic.datasource.annotation.Slave;
+import com.citu.framework.mybatis.core.mapper.BaseMapperX;
+import com.citu.module.menduner.system.old.dataobject.OldMdeJobAdvertised;
+import org.apache.ibatis.annotations.Mapper;
+
+@Slave
+@Mapper
+public interface OldMdeJobAdvertisedMapper extends BaseMapperX<OldMdeJobAdvertised> {
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/old/mysql/OldMdePositionMapper.java

@@ -0,0 +1,11 @@
+package com.citu.module.menduner.system.old.mysql;
+
+import com.baomidou.dynamic.datasource.annotation.Slave;
+import com.citu.framework.mybatis.core.mapper.BaseMapperX;
+import com.citu.module.menduner.system.old.dataobject.OldMdePosition;
+import org.apache.ibatis.annotations.Mapper;
+
+@Slave
+@Mapper
+public interface OldMdePositionMapper extends BaseMapperX<OldMdePosition> {
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/old/mysql/OldMdeUserCvMapper.java

@@ -0,0 +1,12 @@
+package com.citu.module.menduner.system.old.mysql;
+
+import com.baomidou.dynamic.datasource.annotation.Slave;
+import com.citu.framework.mybatis.core.mapper.BaseMapperX;
+import com.citu.module.menduner.system.old.dataobject.OldMdeUserCv;
+import org.apache.ibatis.annotations.Mapper;
+
+@Slave
+@Mapper
+public interface OldMdeUserCvMapper extends BaseMapperX<OldMdeUserCv> {
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/old/mysql/OldMdeUserMapper.java

@@ -0,0 +1,11 @@
+package com.citu.module.menduner.system.old.mysql;
+
+import com.baomidou.dynamic.datasource.annotation.Slave;
+import com.citu.framework.mybatis.core.mapper.BaseMapperX;
+import com.citu.module.menduner.system.old.dataobject.OldMdeUser;
+import org.apache.ibatis.annotations.Mapper;
+
+@Slave
+@Mapper
+public interface OldMdeUserMapper extends BaseMapperX<OldMdeUser> {
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/old/mysql/OldMdeWorkExperienceMapper.java

@@ -0,0 +1,11 @@
+package com.citu.module.menduner.system.old.mysql;
+
+import com.baomidou.dynamic.datasource.annotation.Slave;
+import com.citu.framework.mybatis.core.mapper.BaseMapperX;
+import com.citu.module.menduner.system.old.dataobject.OldMdeWorkExperience;
+import org.apache.ibatis.annotations.Mapper;
+
+@Slave
+@Mapper
+public interface OldMdeWorkExperienceMapper extends BaseMapperX<OldMdeWorkExperience> {
+}

menduner/menduner-system-biz/src/main/resources/application.yaml

@@ -152,6 +152,13 @@ citu:
       - /rpc-api/menduner/system/enterprise-account/create/point/record
       - /rpc-api/menduner/system/enterprise-account/create/balance/record
     ignore-tables:
+      - mde_department
+      - mde_education_experience
+      - mde_job_advertised
+      - mde_position
+      - mde_user
+      - mde_user_cv
+      - mde_work_experience
 
 debug: false
 

menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/user/MdeUserServiceImplTest.java → menduner/menduner-system-biz/src/test/java/com/citu/module/menduner/system/service/user/OldOldMdeUserMapperServiceImplTest.java

@@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.*;
  * @author Rayson
  */
 @Import(MdeUserServiceImpl.class)
-public class MdeUserServiceImplTest extends BaseDbUnitTest {
+public class OldOldMdeUserMapperServiceImplTest extends BaseDbUnitTest {
 
     @Resource
     private MdeUserServiceImpl mdeUserService;