From 01d21ba4462916086774f94aea7b72b8299a32e4 Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Fri, 10 Nov 2023 13:03:48 +0800
Subject: [PATCH] =?UTF-8?q?bug:=20=E4=BF=AE=E6=94=B9=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/adc/da/slrs/DataSync/DataSyncController.java     | 6 ++++++
 .../java/com/adc/da/sync/service/SyncUserService.java    | 9 ++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/DataSyncController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/DataSyncController.java
index 6274e720..29f8bcd0 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/DataSyncController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/DataSyncController.java
@@ -59,6 +59,12 @@ public class DataSyncController {
         return iDataSyncService.orgDataSync2();
     }
 
+    @ApiOperation("同步组织机构，改成全量同步")
+    @PostMapping("/importOrgData3")
+    public String importOrgData3() throws Exception {
+        return iDataSyncService.orgDataSync3();
+    }
+
     @ApiOperation("同步组织机构,添加参数")
     @PostMapping("/updateByOrgs")
     public String updateByOrgs() throws Exception {
diff --git a/adc-da-sys/src/main/java/com/adc/da/sync/service/SyncUserService.java b/adc-da-sys/src/main/java/com/adc/da/sync/service/SyncUserService.java
index 233a4cad..f6ca0b93 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sync/service/SyncUserService.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sync/service/SyncUserService.java
@@ -126,6 +126,7 @@ public class SyncUserService {
 
         List<String> json=new ArrayList<>();
         byte[] cookie = null;
+        int index = 1;
         do {
             Map<String, Object> params = new HashMap<String, Object>();
             params.put("cookie", Base64.encodeBase64String(cookie));
@@ -137,7 +138,7 @@ public class SyncUserService {
             params.forEach((key, value) -> log.info("同步用户数据的请求参数：" + key + " : " + value));
             // 用户测试
             String rs = util.getResponseFromServer("http://idmsync.foton.com.cn/rest/users/getUserList", params);
-            log.info("远程调用同步的员工数据："+rs);
+            log.info("第{}次调用，远程调用同步的员工数据：{}",index,rs);
             JSONObject responseStr = JSON.parseObject(rs);
             if(responseStr.containsKey("status") && responseStr.getBoolean("status")){
                 json.add(rs);
@@ -159,7 +160,7 @@ public class SyncUserService {
                     }
                 }
             }
-
+            index++;
         } while (cookie != null);
         return json;
     }
@@ -265,6 +266,7 @@ public class SyncUserService {
 
         byte[] cookie = null;
         List<String> json=new ArrayList<>();
+        int index=1;
         do {
             Map<String, Object> params = new HashMap<String, Object>();
             params.put("cookie", Base64.encodeBase64String(cookie));
@@ -274,7 +276,7 @@ public class SyncUserService {
             params.put("basedn", "ou=Organizations,o=foton.com.cn,o=isp");
             // 组织测试
             String rs = util.getResponseFromServer("http://idmsync.foton.com.cn/rest/orgs/getOrgList", params);
-            log.info("远程调用同步的部门数据："+rs);
+            log.info("第{}次调用：远程调用同步的部门数据：{}",index,rs);
             JSONObject responseStr = JSONObject.parseObject(rs);
             if(responseStr.containsKey("status") && responseStr.getBoolean("status")){
                 json.add(rs);
@@ -296,6 +298,7 @@ public class SyncUserService {
                     }
                 }
             }
+            index++;
         } while (cookie != null);
         return json;
     }