fix

code/sapparent/sapservice/src/main/java/org/fouram/service/SapReportService.java

@@ -44,37 +44,47 @@ public class SapReportService extends BaseService {
 	public void saveSapAllReportData() throws Exception {
 		HttpHeaders headers = getHttpHeaders();
 		List<SapUser> sapUsers = selectReportUserList();
+		this.saveSapCertificates(headers, sapUsers);
+		this.saveSapCourses(headers, sapUsers);
+		this.saveSapEducation(headers, sapUsers);
+		this.saveSapInsideWorkExperience(headers, sapUsers);
+		this.saveSapLanguages(headers, sapUsers);
+		this.saveSapOverallPerformance(headers, sapUsers);
+		this.saveSapEmpJob(headers, sapUsers);
+		this.saveSapOutsideWorkExperience(headers, sapUsers);
+		this.saveSapEmpEmployment(headers, sapUsers);
+		this.saveSapEmpJobRelationships(headers, sapUsers);
+		this.saveSapPerEmail(headers, sapUsers);
+		this.saveSapPerGlobalInfoCHN(headers, sapUsers);
+		this.saveSapPerNationalId(headers, sapUsers);
+		this.saveSapPerPersonal(headers, sapUsers);
+		this.saveSapPerPerson(headers, sapUsers);
+		this.saveSapPerPhone(headers, sapUsers);
+		this.saveSapPerSocialAccount(headers, sapUsers);
+	}
+	
+	private String getPersonIds(List<SapUser> sapUsers) {
 		String personIds = "";
-		String userIds = "";
 		for (SapUser sapUser : sapUsers) {
 			personIds += "'" + sapUser.getPersonId() + "',";
+		}
+		return personIds;
+	}
+	
+	private String getUserIds(List<SapUser> sapUsers) {
+		String userIds = "";
+		for (SapUser sapUser : sapUsers) {
 			userIds += "'" + sapUser.getUserId() + "',";
 		}
-		this.saveSapCertificates(headers, userIds);
-		this.saveSapCourses(headers, userIds);
-		this.saveSapEducation(headers, userIds);
-		this.saveSapInsideWorkExperience(headers, userIds);
-		this.saveSapLanguages(headers, userIds);
-		this.saveSapOverallPerformance(headers, userIds);
-		this.saveSapEmpJob(headers, userIds);
-		this.saveSapOutsideWorkExperience(headers, userIds);
-		this.saveSapEmpEmployment(headers, personIds);
-		this.saveSapEmpJobRelationships(headers, userIds);
-		this.saveSapPerEmail(headers, personIds);
-		this.saveSapPerGlobalInfoCHN(headers, personIds);
-		this.saveSapPerNationalId(headers, personIds);
-		this.saveSapPerPersonal(headers, personIds);
-		this.saveSapPerPerson(headers, personIds);
-		this.saveSapPerPhone(headers, personIds);
-		this.saveSapPerSocialAccount(headers, personIds);
+		return userIds;
 	}
 
-// 基本信息	PerPerson,PerPersonal
-	public void saveSapPerPerson(HttpHeaders headers, String personIds) throws Exception {
+	// 基本信息	PerPerson
+	public void saveSapPerPerson(HttpHeaders headers, List<SapUser> sapUsers) throws Exception {
 		delete("SapReportMapper.deleteSapPerPerson", null);
 
 		String url = "https://api15.sapsf.cn/odata/v2/PerPerson?$filter=personIdExternal in %s&$format=json&$expand=customString1Nav";
-		url = String.format(url, personIds);
+		url = String.format(url, getPersonIds(sapUsers));
 		JsonNode node = requestService.getForObject(url, headers);
 		if (node != null) {
 			Iterator<JsonNode> iterator = node.get("d").get("results").elements();
@@ -92,11 +102,11 @@ public class SapReportService extends BaseService {
 	}
 
 // 基本信息	PerPerson,PerPersonal
-	public void saveSapPerPersonal(HttpHeaders headers, String personIds) throws Exception {
+	public void saveSapPerPersonal(HttpHeaders headers, List<SapUser> sapUsers) throws Exception {
 		delete("SapReportMapper.deleteSapPerPersonal", null);
 
 		String url = "https://api15.sapsf.cn/odata/v2/PerPersonal?$filter=personIdExternal in %s&$format=json&$expand=maritalStatusNav";
-		url = String.format(url, personIds);
+		url = String.format(url, getPersonIds(sapUsers));
 		JsonNode node = requestService.getForObject(url, headers);
 		if (node != null) {
 			Iterator<JsonNode> iterator = node.get("d").get("results").elements();
@@ -124,11 +134,11 @@ public class SapReportService extends BaseService {
 	}
 
 // 个人信息	PerGlobalInfoCHN
-	public void saveSapPerGlobalInfoCHN(HttpHeaders headers, String personIds) throws Exception {
+	public void saveSapPerGlobalInfoCHN(HttpHeaders headers, List<SapUser> sapUsers) throws Exception {
 		delete("SapReportMapper.deleteSapPerGlobalInfoCHN", null);
 
 		String url = "https://api15.sapsf.cn/odata/v2/PerGlobalInfoCHN?$filter=personIdExternal in %s&$format=json";
-		url = String.format(url, personIds);
+		url = String.format(url, getPersonIds(sapUsers));
 		JsonNode node = requestService.getForObject(url, headers);
 		if (node != null) {
 			Iterator<JsonNode> iterator = node.get("d").get("results").elements();
@@ -150,11 +160,11 @@ public class SapReportService extends BaseService {
 	}
 
 // 国家身份信息	PerNationalId
-	public void saveSapPerNationalId(HttpHeaders headers, String personIds) throws Exception {
+	public void saveSapPerNationalId(HttpHeaders headers, List<SapUser> sapUsers) throws Exception {
 		delete("SapReportMapper.deleteSapPerNationalId", null);
 
 		String url = "https://api15.sapsf.cn/odata/v2/PerNationalId?$filter=personIdExternal in %s&$format=json&$expand=countryNav";
-		url = String.format(url, personIds);
+		url = String.format(url, getPersonIds(sapUsers));
 		JsonNode node = requestService.getForObject(url, headers);
 		if (node != null) {
 			Iterator<JsonNode> iterator = node.get("d").get("results").elements();
@@ -172,11 +182,11 @@ public class SapReportService extends BaseService {
 	}
 
 // 邮件信息	PerEmail
-	public void saveSapPerEmail(HttpHeaders headers, String personIds) throws Exception {
+	public void saveSapPerEmail(HttpHeaders headers, List<SapUser> sapUsers) throws Exception {
 		delete("SapReportMapper.deleteSapPerEmail", null);
 
 		String url = "https://api15.sapsf.cn/odata/v2/PerEmail?$filter=personIdExternal in %s&$format=json&$expand=emailTypeNav";
-		url = String.format(url, personIds);
+		url = String.format(url, getPersonIds(sapUsers));
 		JsonNode node = requestService.getForObject(url, headers);
 		if (node != null) {
 			Iterator<JsonNode> iterator = node.get("d").get("results").elements();
@@ -195,11 +205,11 @@ public class SapReportService extends BaseService {
 	}
 
 // 通讯信息	PerPhone
-	public void saveSapPerPhone(HttpHeaders headers, String personIds) throws Exception {
+	public void saveSapPerPhone(HttpHeaders headers, List<SapUser> sapUsers) throws Exception {
 		delete("SapReportMapper.deleteSapPerPhone", null);
 
 		String url = "https://api15.sapsf.cn/odata/v2/PerPhone?$filter=personIdExternal in %s&$format=json&$expand=phoneTypeNav";
-		url = String.format(url, personIds);
+		url = String.format(url, getPersonIds(sapUsers));
 		JsonNode node = requestService.getForObject(url, headers);
 		if (node != null) {
 			Iterator<JsonNode> iterator = node.get("d").get("results").elements();
@@ -217,11 +227,11 @@ public class SapReportService extends BaseService {
 	}
 
 // 社交账号	PerSocialAccount
-	public void saveSapPerSocialAccount(HttpHeaders headers, String personIds) throws Exception {
+	public void saveSapPerSocialAccount(HttpHeaders headers, List<SapUser> sapUsers) throws Exception {
 		delete("SapReportMapper.deleteSapPerSocialAccount", null);
 
 		String url = "https://api15.sapsf.cn/odata/v2/PerSocialAccount?$filter=personIdExternal in %s&$format=json&$expand=domainNav";
-		url = String.format(url, personIds);
+		url = String.format(url, getPersonIds(sapUsers));
 		JsonNode node = requestService.getForObject(url, headers);
 		if (node != null) {
 			Iterator<JsonNode> iterator = node.get("d").get("results").elements();
@@ -238,11 +248,11 @@ public class SapReportService extends BaseService {
 	}
 
 // 雇佣详细信息	EmpEmployment
-	public void saveSapEmpEmployment(HttpHeaders headers, String personIds) throws Exception {
+	public void saveSapEmpEmployment(HttpHeaders headers, List<SapUser> sapUsers) throws Exception {
 		delete("SapReportMapper.deleteSapEmpEmployment", null);
 
 		String url = "https://api15.sapsf.cn/odata/v2/EmpEmployment?$filter=personIdExternal in %s&$format=json";
-		url = String.format(url, personIds);
+		url = String.format(url, getPersonIds(sapUsers));
 		JsonNode node = requestService.getForObject(url, headers);
 		if (node != null) {
 			Iterator<JsonNode> iterator = node.get("d").get("results").elements();
@@ -271,12 +281,12 @@ public class SapReportService extends BaseService {
 	}
 
 	// 组织以及职位信息 EmpJob
-	public void saveSapEmpJob(HttpHeaders headers, String userIds) throws Exception {
+	public void saveSapEmpJob(HttpHeaders headers, List<SapUser> sapUsers) throws Exception {
 		delete("SapReportMapper.deleteSapEmpJob", null);
 
 		String url = "https://api15.sapsf.cn/odata/v2/EmpJob?$filter=userId in %s&$format=json"
 				+ "&$expand=positionNav,companyNav,divisionNav,departmentNav,customString19Nav,locationNav,jobCodeNav,customString2Nav,customString4Nav";
-		url = String.format(url, userIds);
+		url = String.format(url, getUserIds(sapUsers));
 		JsonNode node = requestService.getForObject(url, headers);
 		if (node != null) {
 			Iterator<JsonNode> iterator = node.get("d").get("results").elements();
@@ -309,11 +319,11 @@ public class SapReportService extends BaseService {
 	}
 
 	// 工作关系 EmpJobRelationships
-	public void saveSapEmpJobRelationships(HttpHeaders headers, String userIds) throws Exception {
+	public void saveSapEmpJobRelationships(HttpHeaders headers, List<SapUser> sapUsers) throws Exception {
 		delete("SapReportMapper.deleteSapEmpJobRelationships", null);
 
 		String url = "https://api15.sapsf.cn/odata/v2/EmpJobRelationships?$filter=userId in %s&$format=json&$expand=relationshipTypeNav,relUserNav";
-		url = String.format(url, userIds);
+		url = String.format(url, getUserIds(sapUsers));
 		JsonNode node = requestService.getForObject(url, headers);
 		if (node != null) {
 			Iterator<JsonNode> iterator = node.get("d").get("results").elements();
@@ -331,11 +341,11 @@ public class SapReportService extends BaseService {
 	}
 
 	// 先前工作经历 Background_OutsideWorkExperience
-	public void saveSapOutsideWorkExperience(HttpHeaders headers, String userIds) throws Exception {
+	public void saveSapOutsideWorkExperience(HttpHeaders headers, List<SapUser> sapUsers) throws Exception {
 		delete("SapReportMapper.deleteSapOutsideWorkExperience", null);
 
 		String url = "https://api15.sapsf.cn/odata/v2/Background_OutsideWorkExperience?$filter=userId in %s&$format=json";
-		url = String.format(url, userIds);
+		url = String.format(url, getUserIds(sapUsers));
 		JsonNode node = requestService.getForObject(url, headers);
 		if (node != null) {
 			Iterator<JsonNode> iterator = node.get("d").get("results").elements();
@@ -362,9 +372,9 @@ public class SapReportService extends BaseService {
 	}
 
 	// 公司内工作经历 Background_InsideWorkExperience
-	public void saveSapInsideWorkExperience(HttpHeaders headers, String userIds) throws Exception {
+	public void saveSapInsideWorkExperience(HttpHeaders headers, List<SapUser> sapUsers) throws Exception {
 		String url = "https://api15.sapsf.cn/odata/v2/Background_InsideWorkExperience?$filter=userId in %s&$format=json";
-		url = String.format(url, userIds);
+		url = String.format(url, getUserIds(sapUsers));
 		JsonNode node = requestService.getForObject(url, headers);
 		if (node != null) {
 			Iterator<JsonNode> iterator = node.get("d").get("results").elements();
@@ -383,9 +393,9 @@ public class SapReportService extends BaseService {
 	}
 
 	// 培训经历 Background_Courses
-	public void saveSapCourses(HttpHeaders headers, String userIds) throws Exception {
+	public void saveSapCourses(HttpHeaders headers, List<SapUser> sapUsers) throws Exception {
 		String url = "https://api15.sapsf.cn/odata/v2/Background_Courses?$filter=userId in %s&$format=json&$expand=custom3Nav,lengthNav";
-		url = String.format(url, userIds);
+		url = String.format(url, getUserIds(sapUsers));
 		JsonNode node = requestService.getForObject(url, headers);
 		if (node != null) {
 			Iterator<JsonNode> iterator = node.get("d").get("results").elements();
@@ -411,9 +421,9 @@ public class SapReportService extends BaseService {
 	}
 
 	// 学历教育 Background_Education
-	public void saveSapEducation(HttpHeaders headers, String userIds) throws Exception {
+	public void saveSapEducation(HttpHeaders headers, List<SapUser> sapUsers) throws Exception {
 		String url = "https://api15.sapsf.cn/odata/v2/Background_Education?$filter=userId in %s&$format=json";
-		url = String.format(url, userIds);
+		url = String.format(url, getUserIds(sapUsers));
 		JsonNode node = requestService.getForObject(url, headers);
 		if (node != null) {
 			Iterator<JsonNode> iterator = node.get("d").get("results").elements();
@@ -434,11 +444,11 @@ public class SapReportService extends BaseService {
 	}
 
 	// 证书 Background_Certificates
-	public void saveSapCertificates(HttpHeaders headers, String userIds) throws Exception {
+	public void saveSapCertificates(HttpHeaders headers, List<SapUser> sapUsers) throws Exception {
 		delete("SapReportMapper.deleteSapCertificates", null);
 
 		String url = "https://api15.sapsf.cn/odata/v2/Background_Certificates?$filter=userId in %s&$format=json";
-		url = String.format(url, userIds);
+		url = String.format(url, getUserIds(sapUsers));
 		JsonNode node = requestService.getForObject(url, headers);
 		if (node != null) {
 			Iterator<JsonNode> iterator = node.get("d").get("results").elements();
@@ -458,11 +468,11 @@ public class SapReportService extends BaseService {
 	}
 
 	// 语言能力 Background_Languages
-	public void saveSapLanguages(HttpHeaders headers, String userIds) throws Exception {
+	public void saveSapLanguages(HttpHeaders headers, List<SapUser> sapUsers) throws Exception {
 		delete("SapReportMapper.deleteSapLanguages", null);
 
 		String url = "https://api15.sapsf.cn/odata/v2/Background_Languages?$filter=userId in %s&$format=json&$expand=languageNav,speakingProfNav,readingProfNav,writingProfNav";
-		url = String.format(url, userIds);
+		url = String.format(url, getUserIds(sapUsers));
 		JsonNode node = requestService.getForObject(url, headers);
 		if (node != null) {
 			Iterator<JsonNode> iterator = node.get("d").get("results").elements();
@@ -482,11 +492,11 @@ public class SapReportService extends BaseService {
 	}
 
 	// 绩效历史 TrendData_SysOverallPerformance
-	public void saveSapOverallPerformance(HttpHeaders headers, String userIds) throws Exception {
+	public void saveSapOverallPerformance(HttpHeaders headers, List<SapUser> sapUsers) throws Exception {
 		delete("SapReportMapper.deleteSapOverallPerformance", null);
 
 		String url = "https://api15.sapsf.cn/odata/v2/TrendData_SysOverallPerformance?$filter=userId in %s&$format=json";
-		url = String.format(url, userIds);
+		url = String.format(url, getUserIds(sapUsers));
 		JsonNode node = requestService.getForObject(url, headers);
 		if (node != null) {
 			Iterator<JsonNode> iterator = node.get("d").get("results").elements();