diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/DeptController.java b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/DeptController.java index c491543..5f01d15 100644 --- a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/DeptController.java +++ b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/DeptController.java @@ -73,7 +73,7 @@ public class DeptController { Map data = new HashMap<>(); data.put("createtime", "2020-01-01 00:00:00"); data.put("enable", "1"); - data.put("number", Arrays.asList("ZHY002.001")); + data.put("number", Arrays.asList("ZHY002.005.003")); // data.put("level", "3"); Map deptReq = new HashMap<>(); @@ -149,6 +149,10 @@ public class DeptController { //部门名称 String deptName = deptData.getString("name"); + + if (deptName.contains("、")){ + deptName = deptName.replace("、", "_"); + } //父部门编码 JSONObject structureObj = deptData.getJSONArray("structure").getJSONObject(0); String parentDeptCode = structureObj.getString("viewparent_id"); @@ -158,10 +162,11 @@ public class DeptController { //开始封装数据 Map deptSyncReq = new HashMap<>(); - deptSyncReq.put("name", deptName); + deptSyncReq.put("name", deptName+"_"); deptSyncReq.put("erp_id__c", deptId); deptSyncReq.put("field_Vj6sf__c", deptCode); deptSyncReq.put("field_v711K__c", parentDeptName); + deptSyncReq.put("field_31u4r__c", parentDeptCode); deptSyncReq.put("owner", Arrays.asList("FSUID_50D3C26809B163F663DC8557268A8D44")); deptSyncReq.put("dataObjectApiName", "DepartmentObj"); @@ -181,6 +186,11 @@ public class DeptController { System.out.println(parentDeptRes); + if (!"success".equals(parentDeptRes.getString("errorDescription"))){ + log.info("查询失败"); + continue; + } + if (parentDeptRes.getJSONObject("data").getJSONArray("dataList").isEmpty()) { log.info("父编码为空,将不再向下执行"); continue; @@ -195,8 +205,9 @@ public class DeptController { //判断部门是否在crm中存在 //请求封装 JSONObject deptIsExistReq = crmRequestUtil.getCRMList(Arrays.asList( - new Filter("EQ", "name", Arrays.asList(deptName)), - new Filter("EQ", "field_v711K__c", Arrays.asList(parentDeptName)) + new Filter("EQ", "name", Arrays.asList(deptName+"_")), + new Filter("EQ", "field_v711K__c", Arrays.asList(parentDeptName)), + new Filter("EQ", "field_31u4r__c", Arrays.asList(parentDeptCode)) ), "DepartmentObj"); //开始发起请求 @@ -377,6 +388,10 @@ public class DeptController { //部门名称 String deptName = deptData.getString("name"); + + if (deptName.contains("、")){ + deptName = deptName.replace("、", "_"); + } //父部门编码 JSONObject structureObj = deptData.getJSONArray("structure").getJSONObject(0); String parentDeptCode = structureObj.getString("viewparent_id"); @@ -390,6 +405,7 @@ public class DeptController { deptSyncReq.put("erp_id__c", deptId); deptSyncReq.put("field_Vj6sf__c", deptCode); deptSyncReq.put("field_v711K__c", parentDeptName); + deptSyncReq.put("field_31u4r__c", parentDeptCode); deptSyncReq.put("owner", Arrays.asList("FSUID_50D3C26809B163F663DC8557268A8D44")); deptSyncReq.put("dataObjectApiName", "DepartmentObj"); @@ -423,7 +439,8 @@ public class DeptController { //请求封装 JSONObject deptIsExistReq = crmRequestUtil.getCRMList(Arrays.asList( new Filter("EQ", "name", Arrays.asList(deptName)), - new Filter("EQ", "field_v711K__c", Arrays.asList(parentDeptName)) + new Filter("EQ", "field_v711K__c", Arrays.asList(parentDeptName)), + new Filter("EQ", "field_31u4r__c", Arrays.asList(parentDeptCode)) ), "DepartmentObj"); //开始发起请求 @@ -594,11 +611,13 @@ public class DeptController { JSONObject structureObj = deptData.getJSONArray("structure").getJSONObject(0); //父级全称 String parentDeptName = structureObj.getString("viewparent_name"); + String parentDeptCode = structureObj.getString("viewparent_id"); //开始查询CRM JSONObject crmReq = crmRequestUtil.getCRMList(Arrays.asList( new Filter("EQ", "name", Arrays.asList(deptName)), - new Filter("EQ", "field_v711K__c", Arrays.asList(parentDeptName)) + new Filter("EQ", "field_v711K__c", Arrays.asList(parentDeptName)), + new Filter("EQ", "field_31u4r__c", Arrays.asList(parentDeptCode)) ), "DepartmentObj"); JSONObject crmRes = new JSONObject(); diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/UsceController.java b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/UsceController.java index b42fada..956b987 100644 --- a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/UsceController.java +++ b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/UsceController.java @@ -31,7 +31,7 @@ public class UsceController { private final Logger log = LoggerFactory.getLogger(UsceController.class); public static void main(String[] args) throws Exception { - new UsceController().getUserData(); + // new UsceController().getUserData(); new UsceController().saveSynUser(); } @@ -42,7 +42,7 @@ public class UsceController { // time = "2024-05-01"; String sendUrl = "http://192.168.31.121:8022/ierp/kapi/v2/f9w5/base/bos_user/userQuery"; Map headers = new HashMap(); - String token = "2095350818281620480_zNEz67jlgYhXk3CDVnn9b2Ynxd9Wokh3GC185e2S7ch8bP5QHt2KqC5lFmY2ALuHNRPmQtPgPmotXZ1P4jt0a5NI2eWEWNtZiy2501"; + String token = "2095350818281620480_YjTXXBgsnPw1njDkmd7vEw6DCpYTl3AXecvkvO3gelJu41WbhuxYION9M4OB2B722b5zQwcBxmT9OyCbMrW8DqFpCIz9iHmTZRRC01"; headers.put("accessToken", token);//放token JSONObject params = new JSONObject(); @@ -51,7 +51,7 @@ public class UsceController { datajson.put("createtime","2012-02-26 11:04:43"); JSONArray arr = new JSONArray(); String[] strings = { - "ZHY005.001.005" + "ZHY005.001.004" }; // 将字符串添加到 JSONArray 中