From e5137fe9122fde3b5d87e97b8d76f967651b57c0 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 05 Sep 2023 17:49:57 +0800
Subject: [PATCH] Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev
---
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 bd68711..3a72fb2 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
@@ -39,11 +39,15 @@
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";
@PostMapping("/userpush")
public Object userPush(@RequestBody ApiPushDTO apiPushDTO, HttpServletRequest request) {
+ System.out.println("请求参数:" + JSON.toJSONString(apiPushDTO));
Map<String, Object> ret = new HashMap<>();
String clientId = request.getParameter("clientId");
@@ -74,25 +78,26 @@
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(new Runnable() {
- @Override
- public void run() {
- //业务处理
- System.out.println("当前线程：" + Thread.currentThread().getName() + " " + index);
- System.out.println("当前处理对象：" + JSON.toJSONString(accountBean));
- asyncUserGo(accountBean);
- }
- });
- };
+ 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();
ret.put("code", 1000);
ret.put("msg", "成功");
@@ -134,6 +139,7 @@
} else { //更新
//设置姓名
one.setRealName(accountBean.getAttributes().get("realName"));
+ one.setName(accountBean.getAttributes().get("realName"));
userService.updateUser(one);
}
}
--
Gitblit v1.9.3