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

synchronizer optimize

Browse Source
This commit is contained in:
MaxKey
2022-03-11 16:08:29 +08:00
parent ea1bf3a9a1
commit be44a579c6
27 changed files with 1100 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,7 @@ package org.maxkey.synchronizer.workweixin;
import org.maxkey.constants.ConstsStatus;
import org.maxkey.entity.Organizations;
import org.maxkey.entity.SynchroRelated;
import org.maxkey.synchronizer.AbstractSynchronizerService;
import org.maxkey.synchronizer.ISynchronizerService;
import org.maxkey.synchronizer.workweixin.entity.WorkWeixinDepts;
@@ -36,6 +37,7 @@ public class WorkweixinOrganizationService extends AbstractSynchronizerService i
String access_token;
static String DEPTS_URL="https://qyapi.weixin.qq.com/cgi-bin/department/list?access_token=%s";
static long ROOT_DEPT_ID = 1;
public void sync() {
_logger.info("Sync Workweixin Organizations ...");
@@ -44,9 +46,34 @@ public class WorkweixinOrganizationService extends AbstractSynchronizerService i
WorkWeixinDeptsResponse rsp = requestDepartmentList(access_token);
for(WorkWeixinDepts dept : rsp.getDepartment()) {
_logger.info("dept : " + dept.getId()+" "+ dept.getName()+" "+ dept.getParentid());
Organizations organization = buildOrganization(dept);
organizationsService.saveOrUpdate(organization);
_logger.debug("dept : " + dept.getId()+" "+ dept.getName()+" "+ dept.getParentid());
//root
if(dept.getId() == ROOT_DEPT_ID) {
Organizations rootOrganization = organizationsService.get(Organizations.ROOT_ORG_ID);
SynchroRelated rootSynchroRelated = buildSynchroRelated(rootOrganization,dept);
synchroRelatedService.updateSynchroRelated(
this.synchronizer,rootSynchroRelated,Organizations.CLASS_TYPE);
}else {
//synchro Related
SynchroRelated synchroRelated =
synchroRelatedService.findByOriginId(
this.synchronizer,dept.getId() + "",Organizations.CLASS_TYPE );
Organizations organization = buildOrganization(dept);
if(synchroRelated == null) {
organization.setId(organization.generateId());
organizationsService.insert(organization);
_logger.debug("Organizations : " + organization);
synchroRelated = buildSynchroRelated(organization,dept);
}else {
organization.setId(synchroRelated.getObjectId());
organizationsService.update(organization);
}
synchroRelatedService.updateSynchroRelated(
this.synchronizer,synchroRelated,Organizations.CLASS_TYPE);
}
}
} catch (Exception e) {
@@ -55,23 +82,43 @@ public class WorkweixinOrganizationService extends AbstractSynchronizerService i
}
public SynchroRelated buildSynchroRelated(Organizations organization,WorkWeixinDepts dept) {
return new SynchroRelated(
organization.getId(),
organization.getName(),
organization.getName(),
Organizations.CLASS_TYPE,
synchronizer.getId(),
synchronizer.getName(),
dept.getId()+"",
dept.getName(),
"",
dept.getParentid()+"",
synchronizer.getInstId());
}
public WorkWeixinDeptsResponse requestDepartmentList(String access_token) {
HttpRequestAdapter request =new HttpRequestAdapter();
String responseBody = request.get(String.format(DEPTS_URL, access_token));
WorkWeixinDeptsResponse deptsResponse =JsonUtils.gson2Object(responseBody, WorkWeixinDeptsResponse.class);
_logger.info("response : " + responseBody);
_logger.trace("response : " + responseBody);
for(WorkWeixinDepts dept : deptsResponse.getDepartment()) {
_logger.info("WorkWeixinDepts : " + dept);
_logger.debug("WorkWeixinDepts : " + dept);
}
return deptsResponse;
}
public Organizations buildOrganization(WorkWeixinDepts dept) {
//Parent
SynchroRelated synchroRelatedParent =
synchroRelatedService.findByOriginId(
this.synchronizer,dept.getParentid() + "",Organizations.CLASS_TYPE);
Organizations org = new Organizations();
org.setId(dept.getId()+"");
org.setName(dept.getName());
org.setParentId(dept.getParentid()+"");
org.setCode(dept.getId()+"");
org.setParentId(synchroRelatedParent.getObjectId());
org.setParentName(synchroRelatedParent.getObjectName());
org.setSortIndex(dept.getOrder());
org.setInstId(this.synchronizer.getInstId());
org.setStatus(ConstsStatus.ACTIVE);

36
maxkey-synchronizers/maxkey-synchronizer-workweixin/src/main/java/org/maxkey/synchronizer/workweixin/WorkweixinUsersService.java
View File

@@ -17,11 +17,10 @@
package org.maxkey.synchronizer.workweixin;
import java.sql.Types;
import java.util.List;
import org.maxkey.constants.ConstsStatus;
import org.maxkey.entity.Organizations;
import org.maxkey.entity.SynchroRelated;
import org.maxkey.entity.UserInfo;
import org.maxkey.synchronizer.AbstractSynchronizerService;
import org.maxkey.synchronizer.ISynchronizerService;
@@ -44,21 +43,38 @@ public class WorkweixinUsersService extends AbstractSynchronizerService implemen
public void sync() {
_logger.info("Sync Workweixin Users...");
try {
List<Organizations> organizations =
organizationsService.find("instid = ?",
new Object[] { this.synchronizer.getInstId() },
new int[] { Types.VARCHAR});
for(Organizations dept : organizations) {
List<SynchroRelated> synchroRelateds =
synchroRelatedService.findOrgs(this.synchronizer);
for(SynchroRelated relatedOrg : synchroRelateds) {
HttpRequestAdapter request =new HttpRequestAdapter();
String responseBody = request.get(String.format(USERS_URL, access_token,dept.getId()));
String responseBody = request.get(String.format(USERS_URL, access_token,relatedOrg.getOriginId()));
WorkWeixinUsersResponse usersResponse =JsonUtils.gson2Object(responseBody, WorkWeixinUsersResponse.class);
_logger.info("response : " + responseBody);
_logger.trace("response : " + responseBody);
for(WorkWeixinUsers user : usersResponse.getUserlist()) {
UserInfo userInfo = buildUserInfo(user);
_logger.info("userInfo : " + userInfo);
_logger.debug("userInfo : " + userInfo);
userInfo.setPassword(userInfo.getUsername() + UserInfo.DEFAULT_PASSWORD_SUFFIX);
userInfoService.saveOrUpdate(userInfo);
SynchroRelated synchroRelated = new SynchroRelated(
userInfo.getId(),
userInfo.getUsername(),
userInfo.getDisplayName(),
UserInfo.CLASS_TYPE,
synchronizer.getId(),
synchronizer.getName(),
user.getUserid(),
user.getName(),
user.getUserid(),
"",
synchronizer.getInstId());
synchroRelatedService.updateSynchroRelated(
this.synchronizer,synchroRelated,UserInfo.CLASS_TYPE);
socialsAssociate(synchroRelated,"workweixin");
}
}