From 358b0f726980e9b7b825c36dc97b4282197ae6fa Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 24 Oct 2023 18:03:20 +0800
Subject: [PATCH] 用户初始化逻辑变更
---
skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/feign/UserClient.java | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 46 insertions(+), 0 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/feign/UserClient.java b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/feign/UserClient.java
index 60c5c3e..002f059 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/feign/UserClient.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/feign/UserClient.java
@@ -20,8 +20,10 @@
import cn.gistack.system.user.entity.UserInfo;
import cn.gistack.system.user.entity.UserOauth;
import cn.gistack.system.user.enums.UserEnum;
+import com.alibaba.nacos.common.utils.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.AllArgsConstructor;
+import org.codehaus.janino.IClass;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
@@ -30,6 +32,8 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
/**
* 用户服务Feign实现类
@@ -62,6 +66,18 @@
}
@Override
+ @GetMapping(USER_INFO_BY_PHONE)
+ public R<List<User>> userInfoByPhone(String tenantId, String phone) {
+ return R.data(service.userInfoByPhone(tenantId, phone));
+ }
+
+ @Override
+ @GetMapping(USER_INFO_BY_PHONE_OR_ACCOUNT)
+ public R<List<User>> userInfoByPhoneOrAccount(String tenantId, String phone) {
+ return R.data(service.userInfoByPhoneOrAccount(tenantId, phone));
+ }
+
+ @Override
@GetMapping(USER_INFO_BY_TYPE)
public R<UserInfo> userInfo(String tenantId, String account, String userType) {
return R.data(service.userInfo(tenantId, account, UserEnum.of(userType)));
@@ -80,9 +96,39 @@
}
@Override
+ @PostMapping(UPDATE_USER)
+ public R<Boolean> upateUser(User user) {
+ return R.data(service.updateUser(user));
+ }
+
+ @Override
@PostMapping(REMOVE_USER)
public R<Boolean> removeUser(String tenantIds) {
return R.data(service.remove(Wrappers.<User>query().lambda().in(User::getTenantId, Func.toStrList(tenantIds))));
}
+ @Override
+ public R<List<User>> getAllUserList() {
+ return R.data(service.list());
+ }
+
+ @GetMapping(ENCRYPT_USER)
+ @Override
+ public String encryptUser() {
+ //查询所有用户
+ List<User> list = service.list();
+ int count = 0;
+
+ for (User user : list){
+ //如果sm4iv无值就更新数据
+ if (StringUtils.isEmpty(user.getSm4iv())){
+ boolean b = service.updateById(user);
+ if (b){
+ count++;
+ }
+ }
+ }
+ return "共：<span style='color:red'>"+ list.size() + "</span>名用户，成功加密：<span style='color:red'>"+ count + "</span>名用户";
+ }
+
}
--
Gitblit v1.9.3