synchronizer optimize

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

@@ -23,6 +23,7 @@ import java.util.concurrent.LinkedBlockingQueue;
 
 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.feishu.entity.FeishuDepts;
@@ -40,30 +41,55 @@ public class FeishuOrganizationService extends AbstractSynchronizerService imple
 	
 	String access_token;
 	
-	static String DEPTS_URL="https://open.feishu.cn/open-apis/contact/v3/departments/%s/children?page_size=50";
-	
+	static String DEPTS_URL = "https://open.feishu.cn/open-apis/contact/v3/departments/%s/children?page_size=50";
+	static String ROOT_DEPT_URL = "https://open.feishu.cn/open-apis/contact/v3/departments/%s";
+	static String ROOT_DEPT_ID = "0";
 	public void sync() {
 		_logger.info("Sync Feishu Organizations ...");
 
 		LinkedBlockingQueue<String> deptsQueue = new LinkedBlockingQueue<String>();
-		deptsQueue.add("0");
-		HashMap<String,FeishuDepts> deptMap = new HashMap<String,FeishuDepts>();
+		
+		deptsQueue.add(ROOT_DEPT_ID);
+		//root
+		FeishuDeptsResponse rspRoot = requestDepartment(ROOT_DEPT_URL,ROOT_DEPT_ID,access_token);
+		Organizations rootOrganization = organizationsService.get(Organizations.ROOT_ORG_ID);
+		SynchroRelated rootSynchroRelated = buildSynchroRelated(rootOrganization,rspRoot.getData().getDepartment());
+				
+		synchroRelatedService.updateSynchroRelated(
+				this.synchronizer,rootSynchroRelated,Organizations.CLASS_TYPE);
+		
+		//child
 		try {
 			while(deptsQueue.element() != null) {
 				FeishuDeptsResponse rsp = requestDepartmentList(access_token,deptsQueue.poll());
 				if(rsp.getCode() == 0 && rsp.getData().getItems() != null) {
 					for(FeishuDepts dept : rsp.getData().getItems()) {
-						_logger.info("dept : id {} , Parent {} , Name {} , od {}" ,
+						_logger.debug("dept : id {} , Parent {} , Name {} , od {}" ,
 								 dept.getDepartment_id(),
 								 dept.getParent_department_id(),
 								 dept.getName(),
 								 dept.getOpen_department_id()
 								 );
 						deptsQueue.add(dept.getOpen_department_id());
-						deptMap.put(dept.getOpen_department_id(), dept);
-						Organizations organization = buildOrganization(dept,deptMap.get(dept.getParent_department_id()));
-						organizationsService.saveOrUpdate(organization);
-						_logger.info("Organizations : " + organization);
+						//synchro Related
+						SynchroRelated synchroRelated = 
+								synchroRelatedService.findByOriginId(
+										this.synchronizer,dept.getOpen_department_id(),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);
 					}
 				}
 			}
@@ -80,21 +106,50 @@ public class FeishuOrganizationService extends AbstractSynchronizerService imple
 		String responseBody = request.get(String.format(DEPTS_URL, deptId),headers);
 		FeishuDeptsResponse deptsResponse  =JsonUtils.gson2Object(responseBody, FeishuDeptsResponse.class);
 		
-		_logger.info("response : " + responseBody);
+		_logger.trace("response : " + responseBody);
 
 		return deptsResponse;
 	}
 	
-	public Organizations buildOrganization(FeishuDepts dept,FeishuDepts parentDept) {
+	public FeishuDeptsResponse requestDepartment(String url ,String deptId ,String access_token) {
+		HttpRequestAdapter request =new HttpRequestAdapter();
+		HashMap<String,String> headers =new HashMap<String,String>();
+		headers.put("Authorization", AuthorizationHeaderUtils.createBearer(access_token));
+		String responseBody = request.get(String.format(url, deptId),headers);
+		FeishuDeptsResponse deptsResponse  =JsonUtils.gson2Object(responseBody, FeishuDeptsResponse.class);
+		
+		_logger.trace("response : " + responseBody);
+
+		return deptsResponse;
+	}
+	
+	public SynchroRelated buildSynchroRelated(Organizations org,FeishuDepts dept) {
+		return  new SynchroRelated(
+				org.getId(),
+				org.getName(),
+				org.getName(),
+				Organizations.CLASS_TYPE,
+				synchronizer.getId(),
+				synchronizer.getName(),
+				dept.getOpen_department_id(),
+				dept.getName(),
+				dept.getDepartment_id(),
+				dept.getParent_department_id(),
+				synchronizer.getInstId());
+	}
+	
+	public Organizations buildOrganization(FeishuDepts dept) {
+		//Parent
+		SynchroRelated synchroRelatedParent = 
+				synchroRelatedService.findByOriginId(
+				this.synchronizer,dept.getParent_department_id(),Organizations.CLASS_TYPE);
+		
 		Organizations org = new Organizations();
-		org.setId(dept.getOpen_department_id()+"");
 		org.setCode(dept.getDepartment_id()+"");
 		org.setName(dept.getName());
-		if(parentDept == null) {
-			org.setParentId("1");
-		}else {
-			org.setParentId(parentDept.getOpen_department_id()+"");
-		}
+		org.setFullName(dept.getName());
+		org.setParentId(synchroRelatedParent.getObjectId());
+		org.setParentName(synchroRelatedParent.getObjectName());
 		org.setSortIndex(Integer.parseInt(dept.getOrder()));
 		org.setInstId(this.synchronizer.getInstId());
 		org.setStatus(ConstsStatus.ACTIVE);

maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/FeishuUsersService.java

@@ -17,12 +17,11 @@
 
 package org.maxkey.synchronizer.feishu;
 
-import java.sql.Types;
 import java.util.HashMap;
 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;
@@ -46,23 +45,41 @@ public class FeishuUsersService extends AbstractSynchronizerService implements I
 	public void sync() {
 		_logger.info("Sync Feishu 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();
 				HashMap<String,String> headers =new HashMap<String,String>();
 				headers.put("Authorization", AuthorizationHeaderUtils.createBearer(access_token));
-				String responseBody = request.get(String.format(USERS_URL,dept.getId()),headers);
+				String responseBody = request.get(String.format(USERS_URL,relatedOrg.getOriginId()),headers);
 				FeishuUsersResponse usersResponse  =JsonUtils.gson2Object(responseBody, FeishuUsersResponse.class);
-				_logger.info("response : " + responseBody);
+				_logger.trace("response : " + responseBody);
 				if(usersResponse.getCode() == 0 && usersResponse.getData().getItems() != null) {
-					for(FeishuUsers user : usersResponse.getData().getItems()) {
-						UserInfo userInfo  = buildUserInfo(user);
-						_logger.info("userInfo : " + userInfo);
+					for(FeishuUsers feiShuUser : usersResponse.getData().getItems()) {
+						UserInfo userInfo  = buildUserInfo(feiShuUser,relatedOrg);
+						_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(),
+								feiShuUser.getOpen_id(),
+								feiShuUser.getName(),
+								feiShuUser.getUser_id(),
+								feiShuUser.getUnion_id(),
+								synchronizer.getInstId());
+						synchroRelatedService.updateSynchroRelated(
+								this.synchronizer,synchroRelated,UserInfo.CLASS_TYPE);
+						
+						synchroRelated.setOriginId(feiShuUser.getUnion_id());
+						socialsAssociate(synchroRelated,"feishu");
+						
 					}
 				}
 			}
@@ -77,8 +94,9 @@ public class FeishuUsersService extends AbstractSynchronizerService implements I
 		
 	}
 
-	public UserInfo buildUserInfo(FeishuUsers user) {
+	public UserInfo buildUserInfo(FeishuUsers user,SynchroRelated relatedOrg) {
 		UserInfo userInfo = new  UserInfo();
+		userInfo.setId(userInfo.generateId());
 		userInfo.setUsername(user.getUser_id());//账号
 		userInfo.setNickName(user.getNickname());//名字
 		userInfo.setDisplayName(user.getName());//名字
@@ -89,7 +107,10 @@ public class FeishuUsersService extends AbstractSynchronizerService implements I
 		
 		userInfo.setEmployeeNumber(user.getEmployee_no());
 		userInfo.setWorkPhoneNumber(user.getMobile());//工作电话
-		userInfo.setDepartmentId(user.getDepartment_ids()[0]+"");
+		
+		userInfo.setDepartmentId(relatedOrg.getObjectId());
+		userInfo.setDepartment(relatedOrg.getObjectName());
+		
 		userInfo.setJobTitle(user.getJob_title());//职务
 		userInfo.setWorkAddressFormatted(user.getWork_station());//工作地点
 

maxkey-synchronizers/maxkey-synchronizer-feishu/src/main/java/org/maxkey/synchronizer/feishu/entity/FeishuDeptsData.java

@@ -26,6 +26,8 @@ public class FeishuDeptsData extends ResponseData {
 	String page_token;
 	ArrayList<FeishuDepts> items;
 
+	FeishuDepts department;
+	
 	public boolean isHas_more() {
 		return has_more;
 	}
@@ -50,6 +52,14 @@ public class FeishuDeptsData extends ResponseData {
 		this.items = items;
 	}
 
+	public FeishuDepts getDepartment() {
+		return department;
+	}
+
+	public void setDepartment(FeishuDepts department) {
+		this.department = department;
+	}
+
 	public FeishuDeptsData() {
 		super();
 	}