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 | 166 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 98 insertions(+), 68 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 5331b6b..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
@@ -4,25 +4,24 @@
import cn.gistack.system.user.service.IUserService;
import cn.gistack.system.user.sync.dto.AccountBean;
import cn.gistack.system.user.sync.dto.ApiPushDTO;
-import cn.gistack.system.user.sync.util.GenerateUtil;
-import cn.gistack.system.user.sync.util.MD5Util;
-import cn.gistack.system.user.sync.util.SecurityUtil;
+import cn.gistack.system.user.sync.exception.ErrorCode;
+import cn.gistack.system.user.sync.util.*;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.alibaba.nacos.shaded.com.google.gson.JsonObject;
import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tenant.annotation.NonDS;
-import org.springblade.core.tool.api.R;
+import org.springframework.scheduling.annotation.Async;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.*;
/**
* @PROJECT_NAME: skjcmanager
@@ -40,80 +39,111 @@
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 R userPush(@RequestBody ApiPushDTO apiPushDTO) {
+ 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");
+ String timestamp = request.getParameter("timestamp");
+ String sign = request.getParameter("sign");
+ String salt = request.getParameter("salt");
+
+ // 校验签名防止篡改参数
+ String sign2 = SignBuilder.create(appId, MD5Util.getMD5String(appSecret))
+ .requestPath("/api/blade-user/sync/userpush")
+ .requestMethod("POST")
+ .salt(salt)
+ .timestamp(Long.valueOf(timestamp))
+ .sign();
+
+ if (!clientId.equals(appId) || !sign.equals(sign2)) {
+ ret.put("code", ErrorCode.SIGN_CHECK_ERROR.getCode());
+ ret.put("msg", ErrorCode.SIGN_CHECK_ERROR.getMsg());
+ ret.put("data", "");
+ return ret;
+ }
+
+ // 解密syncData
String syncData = SecurityUtil.decryptAES(apiPushDTO.getSyncData(), MD5Util.getMD5String(appSecret));
List<AccountBean> accountBeanList = JSONArray.parseArray(syncData, AccountBean.class);
- //循环list
- accountBeanList.forEach(accountBean -> {
- //判断手机号是否在库中
- User params = new User();
- params.setPhone(accountBean.getPrincipalId());
- User one = userService.getOne(Condition.getQueryWrapper(params));
+ // 异步执行用户处理
- if (one == null){
- //不在，看status状态，若为1则不操作。0添加进库
- if (accountBean.getStatus().equals("0")){
+ int pcount = Runtime.getRuntime().availableProcessors();
+ //最大线程数控制
+ int maxthreadNum = 30;
+ ExecutorService executor = new ThreadPoolExecutor(pcount, maxthreadNum, 10, TimeUnit.SECONDS,
+ new ArrayBlockingQueue<>(1000), Executors.defaultThreadFactory(), new ThreadPoolExecutor.CallerRunsPolicy());
+ System.out.println("开始执行用户处理！！！！！！！！！！！！");
- User saveUser = new User();
- //设置id为手机号
-// saveUser.setId(Long.parseLong(accountBean.getPrincipalId()));
- //账号为手机号
- saveUser.setAccount(accountBean.getPrincipalId());
- saveUser.setPhone(accountBean.getPrincipalId());
- //设置姓名
- saveUser.setRealName(accountBean.getAttributes().get("realName"));
- //设置部门(默认给省)
- saveUser.setDeptId("420000000000");
- //设置角色(权限与市州水库管理业务人员一致)
- saveUser.setRoleId("1688732764750766082");
- //设置租户id
- saveUser.setTenantId("000000");
- userService.save(saveUser);
- }
- }else {
- //在，看status状态，若为1则删除用户。0更新？
- if (accountBean.getStatus().equals("1")){
- userService.removeUser(accountBean.getPrincipalId());
- } else { //更新
- //设置姓名
- one.setRealName(accountBean.getAttributes().get("realName"));
- userService.updateUser(one);
- }
+ 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);
}
+
});
- return R.data(apiPushDTO.getTimestamp());
+
+ // 关闭线程池
+ executor.shutdown();
+
+ ret.put("code", 1000);
+ ret.put("msg", "成功");
+ ret.put("data", apiPushDTO.getSign());
+ System.out.println("处理返回了~~~~");
+ return ret;
}
-// public static void main(String[] args) {
-// Map<String,String> attributes = new HashMap<>();
-// // "staffCode": "15563378977",
-// // "realName": "zhliu",
-// // "email": null,
-// // "phone": "15563378977",
-// // "employeeNum": "zhliu",
-// // "idCard": null,
-// // "employeeStatus": "1",
-// // "userType": "0",
-// // "sort": "1"
-// attributes.put("staffCode","15563378977");
-// attributes.put("realName","zhliu");
-// attributes.put("email",null);
-// attributes.put("phone","15563378977");
-// attributes.put("employeeNum","zhliu");
-// attributes.put("idCard", null);
-// attributes.put("employeeStatus","1");
-// attributes.put("userType","0");
-// attributes.put("sort","1");
-// String syncData = SecurityUtil.encryptAES(JSON.toJSONString(attributes), MD5Util.getMD5String(appSecret));
-// System.out.println("加密后：" + syncData);
-// String jiemi = SecurityUtil.decryptAES(syncData, MD5Util.getMD5String(appSecret));
-// System.out.printf("解密后：" + jiemi);
-//
-// }
+ public void asyncUserGo(AccountBean accountBean) {
+ //判断手机号是否在库中
+ User params = new User();
+ params.setPhone(accountBean.getPrincipalId());
+ User one = userService.getOne(Condition.getQueryWrapper(params));
+
+ if (one == null) {
+ //不在，看status状态，若为1则不操作。0添加进库
+ if (accountBean.getStatus().equals("0")) {
+
+ User saveUser = new User();
+ //设置id为手机号
+// saveUser.setId(Long.parseLong(accountBean.getPrincipalId()));
+ //账号为手机号
+ saveUser.setAccount(accountBean.getPrincipalId());
+ saveUser.setPhone(accountBean.getPrincipalId());
+ //设置姓名
+ saveUser.setRealName(accountBean.getAttributes().get("realName"));
+ //设置部门(默认给省)
+ saveUser.setDeptId("420000000000");
+ //设置角色(权限与市州水库管理业务人员一致)
+ saveUser.setRoleId("1688732764750766082");
+ //设置租户id
+ saveUser.setTenantId("000000");
+ userService.save(saveUser);
+ }
+ } 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