LiRuochen_WorkFlow/MaxKey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

name to real name

Browse Source
This commit is contained in:
MaxKey
2022-07-04 09:12:58 +08:00
parent 8bfdaa33c0
commit 451af2dbac
82 changed files with 1376 additions and 1459 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/maxkey/synchronizer/activedirectory/ActiveDirectoryOrganizationService.java
View File

@@ -70,7 +70,7 @@ public class ActiveDirectoryOrganizationService extends AbstractSynchronizerSer
parentOrg = rootOrganization;
}
organization.setParentId(parentOrg.getId());
organization.setParentName(parentOrg.getName());
organization.setParentName(parentOrg.getOrgName());
organization.setCodePath(parentOrg.getCodePath()+"/"+organization.getId());
_logger.info("parentNamePath " + parentNamePath+" , namePah " + organization.getNamePath());
@@ -83,7 +83,7 @@ public class ActiveDirectoryOrganizationService extends AbstractSynchronizerSer
organizationsService.insert(organization);
_logger.debug("Organizations : " + organization);
synchroRelated = buildSynchroRelated(organization,organization.getLdapDn(),organization.getName());
synchroRelated = buildSynchroRelated(organization,organization.getLdapDn(),organization.getOrgName());
}else {
organization.setId(synchroRelated.getObjectId());
organizationsService.update(organization);
@@ -99,7 +99,7 @@ public class ActiveDirectoryOrganizationService extends AbstractSynchronizerSer
this.synchronizer.getId(),
this.synchronizer.getName(),
organization.getId(),
organization.getName(),
organization.getOrgName(),
Organizations.class.getSimpleName(),
org.maxkey.util.DateUtils.getCurrentDateAsString(),
"success",
@@ -164,8 +164,8 @@ public class ActiveDirectoryOrganizationService extends AbstractSynchronizerSer
public SynchroRelated buildSynchroRelated(Organizations organization,String ldapDN,String name) {
return new SynchroRelated(
organization.getId(),
organization.getName(),
organization.getName(),
organization.getOrgName(),
organization.getOrgName(),
Organizations.CLASS_TYPE,
synchronizer.getId(),
synchronizer.getName(),
@@ -181,7 +181,7 @@ public class ActiveDirectoryOrganizationService extends AbstractSynchronizerSer
Organizations org = new Organizations();
org.setLdapDn(nameInNamespace);
String []namePaths = name.replaceAll(",OU=", "/").replaceAll("OU=", "/").split("/");
String namePah= "/"+rootOrganization.getName();
String namePah= "/"+rootOrganization.getOrgName();
for(int i = namePaths.length -1 ; i >= 0 ; i --) {
namePah = namePah + "/" + namePaths[i];
}
@@ -189,10 +189,10 @@ public class ActiveDirectoryOrganizationService extends AbstractSynchronizerSer
namePah = namePah.substring(0, namePah.length() - 1);
org.setId(org.generateId());
org.setCode(org.getId());
org.setOrgCode(org.getId());
org.setNamePath(namePah);
org.setLevel(namePaths.length);
org.setName(LdapUtils.getAttributeStringValue(OrganizationalUnit.OU,attributeMap));
org.setOrgName(LdapUtils.getAttributeStringValue(OrganizationalUnit.OU,attributeMap));
org.setCountry(LdapUtils.getAttributeStringValue(OrganizationalUnit.CO,attributeMap));
org.setRegion(LdapUtils.getAttributeStringValue(OrganizationalUnit.ST,attributeMap));
org.setLocality(LdapUtils.getAttributeStringValue(OrganizationalUnit.L,attributeMap));

4
maxkey-synchronizers/maxkey-synchronizer-activedirectory/src/main/java/org/maxkey/synchronizer/activedirectory/ActiveDirectoryUsersService.java
View File

@@ -120,7 +120,7 @@ public class ActiveDirectoryUsersService extends AbstractSynchronizerService
UserInfo userInfo = new UserInfo();
userInfo.setLdapDn(nameInNamespace);
String []namePaths = name.replaceAll(",OU=", "/").replaceAll("OU=", "/").split("/");
String namePah= "/"+rootOrganization.getName();
String namePah= "/"+rootOrganization.getOrgName();
for(int i = namePaths.length -1 ; i >= 0 ; i --) {
namePah = namePah + "/" + namePaths[i];
}
@@ -133,7 +133,7 @@ public class ActiveDirectoryUsersService extends AbstractSynchronizerService
deptOrg = rootOrganization;
}
userInfo.setDepartment(deptOrg.getName());
userInfo.setDepartment(deptOrg.getOrgName());
userInfo.setDepartmentId(deptOrg.getId());
try {
userInfo.setId(userInfo.generateId());

8
maxkey-synchronizers/maxkey-synchronizer-dingtalk/src/main/java/org/maxkey/synchronizer/dingtalk/DingtalkOrganizationService.java
View File

@@ -135,8 +135,8 @@ public class DingtalkOrganizationService extends AbstractSynchronizerService im
public SynchroRelated buildSynchroRelated(Organizations organization,String deptId,String name,String parentId) {
return new SynchroRelated(
organization.getId(),
organization.getName(),
organization.getName(),
organization.getOrgName(),
organization.getOrgName(),
Organizations.CLASS_TYPE,
synchronizer.getId(),
synchronizer.getName(),
@@ -154,8 +154,8 @@ public class DingtalkOrganizationService extends AbstractSynchronizerService im
this.synchronizer,dept.getParentId() + "",Organizations.CLASS_TYPE);
Organizations org = new Organizations();
org.setId(dept.getDeptId()+"");
org.setCode(dept.getDeptId()+"");
org.setName(dept.getName());
org.setOrgCode(dept.getDeptId()+"");
org.setOrgName(dept.getName());
org.setParentCode(dept.getParentId()+"");
if(synchroRelatedParent != null) {
org.setParentId(synchroRelatedParent.getObjectId());

8
maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/FeishuOrganizationService.java
View File

@@ -126,8 +126,8 @@ public class FeishuOrganizationService extends AbstractSynchronizerService imple
public SynchroRelated buildSynchroRelated(Organizations org,FeishuDepts dept) {
return new SynchroRelated(
org.getId(),
org.getName(),
org.getName(),
org.getOrgName(),
org.getOrgName(),
Organizations.CLASS_TYPE,
synchronizer.getId(),
synchronizer.getName(),
@@ -145,8 +145,8 @@ public class FeishuOrganizationService extends AbstractSynchronizerService imple
this.synchronizer,dept.getParent_department_id(),Organizations.CLASS_TYPE);
Organizations org = new Organizations();
org.setCode(dept.getDepartment_id()+"");
org.setName(dept.getName());
org.setOrgCode(dept.getDepartment_id()+"");
org.setOrgName(dept.getName());
org.setFullName(dept.getName());
org.setParentId(synchroRelatedParent.getObjectId());
org.setParentName(synchroRelatedParent.getObjectName());

16
maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapOrganizationService.java
View File

@@ -70,7 +70,7 @@ public class LdapOrganizationService extends AbstractSynchronizerService implem
parentOrg = rootOrganization;
}
organization.setParentId(parentOrg.getId());
organization.setParentName(parentOrg.getName());
organization.setParentName(parentOrg.getOrgName());
organization.setCodePath(parentOrg.getCodePath()+"/"+organization.getId());
_logger.info("parentNamePath " + parentNamePath+" , namePah " + organization.getNamePath());
@@ -83,7 +83,7 @@ public class LdapOrganizationService extends AbstractSynchronizerService implem
organizationsService.insert(organization);
_logger.debug("Organizations : " + organization);
synchroRelated = buildSynchroRelated(organization,organization.getLdapDn(),organization.getName());
synchroRelated = buildSynchroRelated(organization,organization.getLdapDn(),organization.getOrgName());
}else {
organization.setId(synchroRelated.getObjectId());
organizationsService.update(organization);
@@ -100,7 +100,7 @@ public class LdapOrganizationService extends AbstractSynchronizerService implem
historySynchronizer.setSyncId(this.synchronizer.getId());
historySynchronizer.setSyncName(this.synchronizer.getName());
historySynchronizer.setObjectId(organization.getId());
historySynchronizer.setObjectName(organization.getName());
historySynchronizer.setObjectName(organization.getOrgName());
historySynchronizer.setObjectType(Organizations.class.getSimpleName());
historySynchronizer.setInstId(synchronizer.getInstId());
historySynchronizer.setResult("success");
@@ -158,8 +158,8 @@ public class LdapOrganizationService extends AbstractSynchronizerService implem
public SynchroRelated buildSynchroRelated(Organizations organization,String ldapDN,String name) {
return new SynchroRelated(
organization.getId(),
organization.getName(),
organization.getName(),
organization.getOrgName(),
organization.getOrgName(),
Organizations.CLASS_TYPE,
synchronizer.getId(),
synchronizer.getName(),
@@ -175,7 +175,7 @@ public class LdapOrganizationService extends AbstractSynchronizerService implem
Organizations org = new Organizations();
org.setLdapDn(nameInNamespace);
String []namePaths = name.replaceAll(",OU=", "/").replaceAll("OU=", "/").split("/");
String namePah= "/"+rootOrganization.getName();
String namePah= "/"+rootOrganization.getOrgName();
for(int i = namePaths.length -1 ; i >= 0 ; i --) {
namePah = namePah + "/" + namePaths[i];
}
@@ -183,10 +183,10 @@ public class LdapOrganizationService extends AbstractSynchronizerService implem
namePah = namePah.substring(0, namePah.length() - 1);
org.setId(org.generateId());
org.setCode(org.getId());
org.setOrgCode(org.getId());
org.setNamePath(namePah);
org.setLevel(namePaths.length);
org.setName(LdapUtils.getAttributeStringValue(OrganizationalUnit.OU,attributeMap));
org.setOrgName(LdapUtils.getAttributeStringValue(OrganizationalUnit.OU,attributeMap));
//org.setCountry(LdapUtils.getAttributeStringValue(OrganizationalUnit.CO,attributeMap));
org.setRegion(LdapUtils.getAttributeStringValue(OrganizationalUnit.ST,attributeMap));
org.setLocality(LdapUtils.getAttributeStringValue(OrganizationalUnit.L,attributeMap));

4
maxkey-synchronizers/maxkey-synchronizer-ldap/src/main/java/org/maxkey/synchronizer/ldap/LdapUsersService.java
View File

@@ -111,7 +111,7 @@ public class LdapUsersService extends AbstractSynchronizerService implements IS
UserInfo userInfo = new UserInfo();
userInfo.setLdapDn(nameInNamespace);
String []namePaths = name.replaceAll(",OU=", "/").replaceAll("OU=", "/").split("/");
String namePah= "/"+rootOrganization.getName();
String namePah= "/"+rootOrganization.getOrgName();
for(int i = namePaths.length -1 ; i >= 0 ; i --) {
namePah = namePah + "/" + namePaths[i];
}
@@ -120,7 +120,7 @@ public class LdapUsersService extends AbstractSynchronizerService implements IS
String deptNamePath= namePah.substring(0, namePah.lastIndexOf("/"));
_logger.info("deptNamePath " + deptNamePath);
Organizations deptOrg = orgsNamePathMap.get(deptNamePath);
userInfo.setDepartment(deptOrg.getName());
userInfo.setDepartment(deptOrg.getOrgName());
userInfo.setDepartmentId(deptOrg.getId());
try {

6
maxkey-synchronizers/maxkey-synchronizer-reorgdept/src/main/java/org/maxkey/synchronizer/workweixin/service/ReorgDeptService.java
View File

@@ -74,7 +74,7 @@ public class ReorgDeptService extends AbstractSynchronizerService implements ISy
if(listOrg.get(i).getParentId().equals(rootParentOrgId)){
tempOrg = listOrg.get(i);
tempOrg.setReorgNamePath(true);
tempOrg.setNamePath("/"+tempOrg.getName());
tempOrg.setNamePath("/"+tempOrg.getOrgName());
tempOrg.setCodePath("/"+tempOrg.getId());
tempOrg.setParentId("-1");
tempOrg.setParentName("");
@@ -89,9 +89,9 @@ public class ReorgDeptService extends AbstractSynchronizerService implements ISy
tempOrg = listOrg.get(i);
if(!tempOrg.isReorgNamePath() && parentOrg != null){
tempOrg.setReorgNamePath(true);
tempOrg.setParentName(parentOrg.getName());
tempOrg.setParentName(parentOrg.getOrgName());
tempOrg.setCodePath(parentOrg.getCodePath()+"/"+tempOrg.getId());
tempOrg.setNamePath(parentOrg.getNamePath()+"/"+tempOrg.getName());
tempOrg.setNamePath(parentOrg.getNamePath()+"/"+tempOrg.getOrgName());
orgMap.put(tempOrg.getId(), tempOrg);
_logger.info("reorg : " + tempOrg);
}

8
maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinOrganizationService.java
View File

@@ -85,8 +85,8 @@ public class WorkweixinOrganizationService extends AbstractSynchronizerService i
public SynchroRelated buildSynchroRelated(Organizations organization,WorkWeixinDepts dept) {
return new SynchroRelated(
organization.getId(),
organization.getName(),
organization.getName(),
organization.getOrgName(),
organization.getOrgName(),
Organizations.CLASS_TYPE,
synchronizer.getId(),
synchronizer.getName(),
@@ -115,8 +115,8 @@ public class WorkweixinOrganizationService extends AbstractSynchronizerService i
synchroRelatedService.findByOriginId(
this.synchronizer,dept.getParentid() + "",Organizations.CLASS_TYPE);
Organizations org = new Organizations();
org.setName(dept.getName());
org.setCode(dept.getId()+"");
org.setOrgName(dept.getName());
org.setOrgCode(dept.getId()+"");
org.setParentId(synchroRelatedParent.getObjectId());
org.setParentName(synchroRelatedParent.getObjectName());
org.setSortIndex(dept.getOrder());

8
maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/maxkey/synchronizer/AbstractSynchronizerService.java
View File

@@ -65,7 +65,7 @@ public abstract class AbstractSynchronizerService {
for(Organizations org : orgsList) {
if(org.getId().equals(rootOrgId) && rootOrgId.equals("1")) {
rootOrganization = org;
rootOrganization.setNamePath("/"+rootOrganization.getName());
rootOrganization.setNamePath("/"+rootOrganization.getOrgName());
rootOrganization.setCodePath("/1");
rootOrganization.setParentId("-1");
rootOrganization.setParentName("");
@@ -108,9 +108,9 @@ public abstract class AbstractSynchronizerService {
for(Organizations org : orgsList) {
if(org.getParentId().equals(parentOrg.getId())) {
if(org.getNamePath() == null
|| !org.getNamePath().equals(parentOrg.getNamePath()+"/"+org.getName())) {
org.setParentName(parentOrg.getName());
org.setNamePath(parentOrg.getNamePath()+"/"+org.getName());
|| !org.getNamePath().equals(parentOrg.getNamePath()+"/"+org.getOrgName())) {
org.setParentName(parentOrg.getOrgName());
org.setNamePath(parentOrg.getNamePath()+"/"+org.getOrgName());
org.setCodePath(parentOrg.getCodePath()+"/"+org.getId());
organizationsService.update(org);
}