1、优化人才地图接口

2、完善数据同步

menduner/menduner-im-biz/src/main/resources/i18n/messages_en_US.properties

@@ -106,7 +106,7 @@
 1_100_016_014=The length of the mobile verification code is 4-6 digits
 1_100_016_015=The length of the phone number is 8-11 digits
 1_100_016_016=Phone verification codes must all be numbers
-1_100_016_017=Password length is 4-16 bits
+1_100_016_017=Password length is 8-16 bits
 1_100_016_018=User ID cannot be empty
 1_100_016_019=Password cannot be empty
 1_100_016_020=User account cannot be empty

menduner/menduner-im-biz/src/main/resources/i18n/messages_zh_CN.properties

@@ -106,7 +106,7 @@
 1_100_016_014=手机验证码长度为 4-6 位
 1_100_016_015=手机号码长度为 8-11 位
 1_100_016_016=手机验证码必须都是数字
-1_100_016_017=密码长度为 4-16 位
+1_100_016_017=密码长度为 8-16 位
 1_100_016_018=用户编号不能为空
 1_100_016_019=密码不能为空
 1_100_016_020=用户账号不能为空

menduner/menduner-mall-biz/src/main/resources/i18n/messages_en_US.properties

@@ -106,7 +106,7 @@
 1_100_016_014=The length of the mobile verification code is 4-6 digits
 1_100_016_015=The length of the phone number is 8-11 digits
 1_100_016_016=Phone verification codes must all be numbers
-1_100_016_017=Password length is 4-16 bits
+1_100_016_017=Password length is 8-16 bits
 1_100_016_018=User ID cannot be empty
 1_100_016_019=Password cannot be empty
 1_100_016_020=User account cannot be empty

menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/enums/ErrorCodeConstants.java

@@ -132,7 +132,7 @@ public interface ErrorCodeConstants {
     ErrorCode MDE_USER_CODE_LENGTH = new ErrorCode(1_100_016_014, "手机验证码长度为 4-6 位");
     ErrorCode MDE_USER_PHONE_LENGTH = new ErrorCode(1_100_016_015, "手机号码长度为 8-11 位");
     ErrorCode MDE_USER_CODE_NUMBER = new ErrorCode(1_100_016_016, "手机验证码必须都是数字");
-    ErrorCode MDE_USER_PASSWORD_LENGTH = new ErrorCode(1_100_016_017, "密码长度为 4-16 位");
+    ErrorCode MDE_USER_PASSWORD_LENGTH = new ErrorCode(1_100_016_017, "密码长度为 8-16 位");
     ErrorCode MDE_USER_ID_NOT_NULL = new ErrorCode(1_100_016_018, "用户编号不能为空");
     ErrorCode MDE_USER_PASSWORD_NOT_NULL = new ErrorCode(1_100_016_019, "密码不能为空");
     ErrorCode MDE_USER_USERNAME_NOT_NULL = new ErrorCode(1_100_016_020, "用户账号不能为空");

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/auth/vo/AppMdeAuthLoginReqVO.java

@@ -21,7 +21,7 @@ public class AppMdeAuthLoginReqVO {
 
     @Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "buzhidao")
     @NotEmpty(message = "{1_100_016_019}")
-    @Length(min = 4, max = 16, message = "{1_100_016_014}")
+//    @Length(min = 4, max = 16, message = "{1_100_016_014}")
     private String password;
 
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/user/vo/AppMdeUserResetPasswordReqVO.java

@@ -21,7 +21,7 @@ public class AppMdeUserResetPasswordReqVO {
 
     @Schema(description = "新密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "buzhidao")
     @NotEmpty(message = "{1_100_016_012}")
-    @Length(min = 4, max = 16, message = "{1_100_016_017}")
+    @Length(min = 8, max = 16, message = "{1_100_016_017}")
     private String password;
 
     @Schema(description = "手机验证码", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/user/MdeUserUpdatePasswordReqVO.java

@@ -17,7 +17,7 @@ public class MdeUserUpdatePasswordReqVO {
 
     @Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "123456")
     @NotEmpty(message = "{1_100_016_012}")
-    @Length(min = 4, max = 16, message = "{1_100_016_017}")
+    @Length(min = 8, max = 16, message = "{1_100_016_017}")
     private String password;
 
 }

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

@@ -118,6 +118,10 @@ public class EnterpriseDO extends TenantBaseDO {
      * 是否筹备
      */
     private Boolean prepare;
+    /**
+     * 营业执照照片
+     */
+    private String businessUrl;
     /**
      * 帐号状态（0正常 1停用）
      **/

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

@@ -3,7 +3,6 @@ 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.db.TenantBaseDO;
-import com.citu.framework.tenant.core.util.TenantUtils;
 import com.citu.module.menduner.system.dal.dataobject.cvattachment.CvAttachmentDO;
 import com.citu.module.menduner.system.dal.dataobject.eduexp.EduExpDO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseDO;
@@ -36,10 +35,10 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -119,18 +118,18 @@ public class MdeOldSyncService {
     @Async
     public void run() {
         // 同步职位信息
-        // syncPosition();
+        syncPosition();
         // 同步用户信息
-        // syncUser();
+        syncUser();
         // 同步发布职位
-        // syncJob();
+        syncJob();
         // 同步人才工作经历、教育经历
         syncPersonExtend();
         // 同步人才简历附件、投递简历
         syncCv();
     }
 
-
+    @Async
     public void syncPosition() {
 
         // 部门 or 职位类型
@@ -226,7 +225,7 @@ public class MdeOldSyncService {
                     .id(oldMdeUser.getUserCode())
                     .username(oldMdeUser.getIdentityFlag().equals("0") ? oldMdeUser.getUserName() : oldMdeUser.getEntPhone())
                     // 重置密码手机号后6位
-                    .password(passwordEncoder.encode("123456"))
+                    .password(passwordEncoder.encode("147258369"))
                     .email(oldMdeUser.getEmail())
                     // 有座机，大坑
                     // 个人用户getUserName是手机号，企业用户是邮箱，所以企业用户取getEntPhone
@@ -298,8 +297,7 @@ public class MdeOldSyncService {
                     .contact(oldMdeUser.getEntContacts())
                     .phone(oldMdeUser.getEntPhone())
                     .logoUrl(null == oldMdeUser.getHeadPortrait() ? null : url + oldMdeUser.getHeadPortrait())
-                    // 营业执照暂时放这
-                    .albumList(null == oldMdeUser.getImage() ? null : Collections.singletonList(url + oldMdeUser.getImage()))
+                    .businessUrl(null == oldMdeUser.getImage() ? null : url + oldMdeUser.getImage())
                     .status(MendunerStatusEnum.ENABLE.getStatus())
                     .build();
 
@@ -329,6 +327,7 @@ public class MdeOldSyncService {
 
     }
 
+
     public void syncJob() {
         // 职位信息
         List<OldMdeJobAdvertised> jobList = oldJobAdvertisedMapper.selectList(OldMdeJobAdvertised::getDelFlag, 0);
@@ -368,6 +367,7 @@ public class MdeOldSyncService {
 
     }
 
+    @Async
     public void syncPersonExtend() {
         // 人才教育经历、工作经历
         List<OldMdeEducationExperience> eduList =
@@ -413,6 +413,7 @@ public class MdeOldSyncService {
 
     }
 
+    @Async
     public void syncCv() {
         // 人才投递的简历、附件
         List<OldMdeUserCv> cvList = oldUserCvMapper.selectList(OldMdeUserCv::getDelFlag, 0);
@@ -430,9 +431,11 @@ public class MdeOldSyncService {
 
         List<OldPositionCvRelDO> cvRelDOList = oldPositionCvRelDOMapper.selectList(new LambdaQueryWrapperX<OldPositionCvRelDO>()
                 .eq(OldPositionCvRelDO::getDelFlag, 0)
-                .isNotNull(OldPositionCvRelDO::getCvUrl)
         );
         cvRelDOList.forEach(e -> {
+            if (!StringUtils.hasText(e.getCvUrl())) {
+                return;
+            }
             JobCvRelDO cvDO = jobCvRelMapper.selectOne(JobCvRelDO::getId, e.getIntvId());
             // 根据职位查询企业ID
             JobAdvertisedDO advertisedDO = jobAdvertisedMapper.selectOne(JobAdvertisedDO::getId, e.getPosId());
@@ -441,6 +444,7 @@ public class MdeOldSyncService {
             }
             JobCvRelDO insertionDO = JobCvRelDO.builder()
                     .id(null == cvDO ? e.getIntvId() : cvDO.getId())
+                    .type("0")
                     .enterpriseId(advertisedDO.getEnterpriseId())
                     .jobId(advertisedDO.getId())
                     .publishUserId(Long.valueOf(e.getPublisher()))

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/person/PersonIntegrationServiceImpl.java

@@ -197,15 +197,17 @@ public class PersonIntegrationServiceImpl implements PersonIntegrationService {
     @Override
     public PageResult<PersonInfoRespVO> queryPage(PersonMapQueryReqVO reqVO) {
         Long[] ids = null;
-        if (null != reqVO.getLabels()) {
-            GraphQueryDTO condition = GraphQueryDTO.builder()
-                    .label(reqVO.getLabels()).type(SyncConstants.PERSON)
-                    .build();
-            if(StringUtils.hasText(reqVO.getContent())) {
+        if (null != reqVO.getLabels() || StringUtils.hasText(reqVO.getContent())) {
+            GraphQueryDTO condition = GraphQueryDTO.builder().type(SyncConstants.PERSON).build();
+            if (null != reqVO.getLabels()) {
+                condition.setLabel(reqVO.getLabels());
+            }
+            if (StringUtils.hasText(reqVO.getContent())) {
                 condition.setContent(reqVO.getContent());
             }
             ids = graphApi.query(condition).getCheckedData();
         }
+
         return personInfoMapper.queryPage(reqVO, ids);
     }
 

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

@@ -159,6 +159,6 @@ citu:
       - mde_user
       - mde_user_cv
       - mde_work_experience
-
+      - mde_position_cv_rel
 debug: false
 

menduner/menduner-system-biz/src/main/resources/i18n/messages_en_US.properties

@@ -107,7 +107,7 @@
 1_100_016_014=The length of the mobile verification code is 4-6 digits
 1_100_016_015=The length of the phone number is 8-11 digits
 1_100_016_016=Phone verification codes must all be numbers
-1_100_016_017=Password length is 4-16 bits
+1_100_016_017=Password length is 8-16 bits
 1_100_016_018=User ID cannot be empty
 1_100_016_019=Password cannot be empty
 1_100_016_020=User account cannot be empty

menduner/menduner-system-biz/src/main/resources/i18n/messages_zh_CN.properties

@@ -107,7 +107,7 @@
 1_100_016_014=手机验证码长度为 4-6 位
 1_100_016_015=手机号码长度为 8-11 位
 1_100_016_016=手机验证码必须都是数字
-1_100_016_017=密码长度为 4-16 位
+1_100_016_017=密码长度为 8-16 位
 1_100_016_018=用户编号不能为空
 1_100_016_019=密码不能为空
 1_100_016_020=用户账号不能为空