【modify】去掉user不对接的字段，数据库已经同步删除

laws-modules-docking/src/main/java/com/jero/modules/docking/iam/client/TestClient.java

@@ -101,21 +101,13 @@ public class TestClient {
         iamUserAcceptDto.setSrmsSex("1"); // 男
         iamUserAcceptDto.setSrmsPost("主任");
         iamUserAcceptDto.setSrmsDutyLevelId("4"); // 主管级，srms不解析，直接存
-        iamUserAcceptDto.setSrmsRace("3"); // 工程技术族，srms不解析，直接存
-        iamUserAcceptDto.setSrmsPostSequence("3"); // 工程，srms不解析，直接存
-        iamUserAcceptDto.setSrmsTechnicalPosition("5"); // 正高级工程师，srms不解析，直接存
         iamUserAcceptDto.setSrmsDirectLeadership("1706939999105900545"); // 直接上级，不清楚应该存什么，暂时存为id（fcc-test）
         iamUserAcceptDto.setSrmsPostStatus("1"); // 在岗，srms不解析，直接存
         iamUserAcceptDto.setSrmsStatus("1"); // 1在册，0离职
         iamUserAcceptDto.setSrmsOfficePhone("022-87648762");
         iamUserAcceptDto.setSrmsPhone("13811112222");
         iamUserAcceptDto.setSrmsEmail("test@sinotruk.com");
-        iamUserAcceptDto.setSrmsIdNumber("532522199302120034");
-        iamUserAcceptDto.setSrmsEducation("3"); // 专科，srms不解析，直接存
-        iamUserAcceptDto.setSrmsDepartmentBeforeTransfer("测试部门");  // srms不解析，直接存
         iamUserAcceptDto.setSrmsCreateTime("2023-10-15 10:35:20");
-//        iamUserAcceptDto.setSrmsUpdateTime("2023-10-15 10:35:20"); // 测试不发送UpdateTime的情况
-        iamUserAcceptDto.setSrmsEntryTime("2020-11-11");
 
         iamUserAcceptDto.setBimRequestId(UUIDUtils.randomUUID20());
         iamUserAcceptDto.setBimRemoteUser("srmsIam");
@@ -145,7 +137,6 @@ public class TestClient {
         iamUserAcceptDto.setBimUid("1709786346053017601"); // 数据库中取到的ID
         iamUserAcceptDto.setSrmsPost("科长");
         iamUserAcceptDto.setSrmsUpdateTime("2023-10-15 10:35:20"); // 测试不发送UpdateTime的情况
-        iamUserAcceptDto.setSrmsEntryTime("2020-11-12");
 
         iamUserAcceptDto.setBimRequestId(UUIDUtils.randomUUID20());
         iamUserAcceptDto.setBimRemoteUser("srmsIam");

laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/IamUserAcceptDto.java

@@ -23,7 +23,7 @@ public class IamUserAcceptDto extends IamCommonAcceptDto {
     private String srmsCompanyCode;
 
     /**
-     * 部门编码
+     * 部门编码，用于做人员和组织的关联
      */
     @IamProperty(required = true, multivalued = false)
     private String srmsOrgCode;
@@ -70,24 +70,6 @@ public class IamUserAcceptDto extends IamCommonAcceptDto {
     @IamProperty(required = true, multivalued = false)
     private String srmsDutyLevelId;
 
-    /**
-     * 族
-     */
-    @IamProperty(required = true, multivalued = false)
-    private String srmsRace;
-
-    /**
-     * 岗位序列
-     */
-    @IamProperty(required = true, multivalued = false)
-    private String srmsPostSequence;
-
-    /**
-     * 专业技术职务（职称）
-     */
-    @IamProperty(required = true, multivalued = false)
-    private String srmsTechnicalPosition;
-
     /**
      * 直接上级
      */
@@ -124,24 +106,6 @@ public class IamUserAcceptDto extends IamCommonAcceptDto {
     @IamProperty(required = true, multivalued = false)
     private String srmsEmail;
 
-    /**
-     * 身份证号码
-     */
-    @IamProperty(required = true, multivalued = false)
-    private String srmsIdNumber;
-
-    /**
-     * 学历
-     */
-    @IamProperty(required = true, multivalued = false)
-    private String srmsEducation;
-
-    /**
-     * 借调前所属部门
-     */
-    @IamProperty(required = false, multivalued = false)
-    private String srmsDepartmentBeforeTransfer;
-
     /**
      * 创建时间
      */
@@ -154,33 +118,4 @@ public class IamUserAcceptDto extends IamCommonAcceptDto {
     @IamProperty(required = true, multivalued = false)
     private String srmsUpdateTime;
 
-    /**
-     * 劳务派遣单位编码
-     */
-    @IamProperty(required = false, multivalued = false)
-    private String srmsLaborDispatchCode;
-
-    /**
-     * 劳务派遣单位名称
-     */
-    @IamProperty(required = false, multivalued = false)
-    private String srmsLaborDispatchName;
-
-    /**
-     * 职业资格
-     */
-    @IamProperty(required = false, multivalued = false)
-    private String srmsProfessionalQualification;
-
-    /**
-     * 职业资格等级
-     */
-    @IamProperty(required = false, multivalued = false)
-    private String srmsProfessionalLevel;
-
-    /**
-     * 进入集团时间
-     */
-    @IamProperty(required = true, multivalued = false)
-    private String srmsEntryTime;
 }

laws-modules-docking/src/main/java/com/jero/modules/docking/iam/service/SyncIamService.java

@@ -203,19 +203,9 @@ public class SyncIamService {
         sysUser.setTypeId(userAcceptDto.getSrmsTypeId());
         sysUser.setPost(userAcceptDto.getSrmsPost());
         sysUser.setDutyLevelId(userAcceptDto.getSrmsDutyLevelId());
-        sysUser.setRace(userAcceptDto.getSrmsRace());
-        sysUser.setPostSequence(userAcceptDto.getSrmsPostSequence());
-        sysUser.setTechnicalPosition(userAcceptDto.getSrmsTechnicalPosition());
         sysUser.setDirectLeadership(userAcceptDto.getSrmsDirectLeadership());
         sysUser.setPostStatus(userAcceptDto.getSrmsPostStatus());
-        sysUser.setIdNumber(userAcceptDto.getSrmsIdNumber());
+
-        sysUser.setEducation(userAcceptDto.getSrmsEducation());
-        sysUser.setDepartmentBeforeTransfer(userAcceptDto.getSrmsDepartmentBeforeTransfer());
-        sysUser.setLaborDispatchCode(userAcceptDto.getSrmsLaborDispatchCode());
-        sysUser.setLaborDispatchName(userAcceptDto.getSrmsLaborDispatchName());
-        sysUser.setProfessionalQualification(userAcceptDto.getSrmsProfessionalQualification());
-        sysUser.setProfessionalLevel(userAcceptDto.getSrmsProfessionalLevel());
-        sysUser.setEntryTime(userAcceptDto.getSrmsEntryTime());
 
         // 获取组织机构(多个逗号分隔)，TODO 有两个和组织关联在字段，用哪个还需要再和IAM沟通
         String companyCode = userAcceptDto.getSrmsCompanyCode();
@@ -302,21 +292,6 @@ public class SyncIamService {
             sysUser.setDutyLevelId(userAcceptDto.getSrmsDutyLevelId());
         }
 
-        if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsRace())){
-            sysUser.setRace(userAcceptDto.getSrmsRace());
-        }
-
-
-        if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsPostSequence())){
-            sysUser.setPostSequence(userAcceptDto.getSrmsPostSequence());
-        }
-
-
-        if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsTechnicalPosition())){
-            sysUser.setTechnicalPosition(userAcceptDto.getSrmsTechnicalPosition());
-        }
-
-
         if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsDirectLeadership())){
             sysUser.setDirectLeadership(userAcceptDto.getSrmsDirectLeadership());
         }
@@ -326,48 +301,7 @@ public class SyncIamService {
             sysUser.setPostStatus(userAcceptDto.getSrmsPostStatus());
         }
 
-
+        // 获取组织机构(多个逗号分隔)
-        if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsIdNumber())){
-            sysUser.setIdNumber(userAcceptDto.getSrmsIdNumber());
-        }
-
-
-        if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsEducation())){
-            sysUser.setEducation(userAcceptDto.getSrmsEducation());
-        }
-
-
-        if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsDepartmentBeforeTransfer())){
-            sysUser.setDepartmentBeforeTransfer(userAcceptDto.getSrmsDepartmentBeforeTransfer());
-        }
-
-
-        if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsLaborDispatchCode())){
-            sysUser.setLaborDispatchCode(userAcceptDto.getSrmsLaborDispatchCode());
-        }
-
-
-        if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsLaborDispatchName())){
-            sysUser.setLaborDispatchName(userAcceptDto.getSrmsLaborDispatchName());
-        }
-
-
-        if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsProfessionalQualification())){
-            sysUser.setProfessionalQualification(userAcceptDto.getSrmsProfessionalQualification());
-        }
-
-
-        if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsProfessionalLevel())){
-            sysUser.setProfessionalLevel(userAcceptDto.getSrmsProfessionalLevel());
-        }
-
-
-        if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsEntryTime())){
-            sysUser.setEntryTime(userAcceptDto.getSrmsEntryTime());
-        }
-
-        // 获取组织机构(多个逗号分隔)，TODO 有两个和组织关联在字段，用哪个还需要再和IAM沟通
-        String companyCode = userAcceptDto.getSrmsCompanyCode();
         String orgCode = userAcceptDto.getSrmsOrgCode();
 
         String selectedDeparts = null;