From b79be8b37db83880811d8682d64a0b019f1d2b64 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Fri, 08 Sep 2023 11:56:37 +0800
Subject: [PATCH] 同步用户取消删除

---
 skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/sync/controller/UserPushController.java |   36 +++++++++++++++++++++---------------
 1 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/sync/controller/UserPushController.java b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/sync/controller/UserPushController.java
index 389819b..a023603 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/sync/controller/UserPushController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/sync/controller/UserPushController.java
@@ -38,8 +38,10 @@
 	private final IUserService userService;
 
 	private final static String appId = "46a23e7c5fe54f46a37848dc740dc001";
-
 	private final static String appSecret = "AxVGmJcsfxEx36zptmr8J+sv7MAhL1mUuwrk4woGUrM=";
+//	测试key
+//	private final static String appId = "30980cc0e70246df89f8b96b609db055";
+//	private final static String appSecret = "tZnrux6iKg0DWjFA8Pohf/ht4ARIREv2oHpRbSF/5us=";
 
 	private final static String method = "post";
 
@@ -76,21 +78,24 @@
 
 		int pcount = Runtime.getRuntime().availableProcessors();
 		//最大线程数控制
-		int maxthreadNum = accountBeanList.size();
+		int maxthreadNum = 30;
 		ExecutorService executor = new ThreadPoolExecutor(pcount, maxthreadNum, 10, TimeUnit.SECONDS,
 			new ArrayBlockingQueue<>(1000), Executors.defaultThreadFactory(), new ThreadPoolExecutor.CallerRunsPolicy());
 		System.out.println("开始执行用户处理!!!!!!!!!!!!");
-		//循环list
-		for (int i = 0; i < maxthreadNum; i++)  {
-			final int index = i;
-			final AccountBean accountBean = accountBeanList.get(i);
-			executor.execute(() -> {
-				//业务处理
+
+		executor.execute(() -> {
+			//业务处理
+			//循环list
+			for (int i = 0; i < maxthreadNum; i++) {
+				final int index = i;
+				final AccountBean accountBean = accountBeanList.get(i);
 				System.out.println("当前线程:" + Thread.currentThread().getName() + " " + index);
 				System.out.println("当前处理对象:" + JSON.toJSONString(accountBean));
 				asyncUserGo(accountBean);
-			});
-		}
+			}
+
+		});
+
 		// 关闭线程池
 		executor.shutdown();
 
@@ -128,14 +133,15 @@
 				userService.save(saveUser);
 			}
 		} else {
-			//在,看status状态,若为1则删除用户。0更新?
-			if (accountBean.getStatus().equals("1")) {
-				userService.removeUser(accountBean.getPrincipalId());
-			} else { //更新
+			//在,看status状态,若为1则删除用户。0更新?  先不删除
+//			if (accountBean.getStatus().equals("1")) {
+//				userService.removeUser(accountBean.getPrincipalId());
+//			} else { //更新
 				//设置姓名
 				one.setRealName(accountBean.getAttributes().get("realName"));
+				one.setName(accountBean.getAttributes().get("realName"));
 				userService.updateUser(one);
-			}
+//			}
 		}
 
 	}

--
Gitblit v1.9.3