From bd6b518aae61608ddc2d82b43ccc283dc95b9c54 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 11 三月 2026 13:59:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/system/controller/UserController.java | 173 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 147 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/zy/system/controller/UserController.java b/src/main/java/com/zy/system/controller/UserController.java
index 9344ff6..b7fefb9 100644
--- a/src/main/java/com/zy/system/controller/UserController.java
+++ b/src/main/java/com/zy/system/controller/UserController.java
@@ -1,16 +1,20 @@
package com.zy.system.controller;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.common.i18n.I18nMessageService;
import com.zy.common.web.BaseController;
import com.zy.system.entity.Role;
import com.zy.system.entity.User;
+import com.zy.system.entity.UserLogin;
import com.zy.system.service.RoleService;
+import com.zy.system.service.UserLoginService;
import com.zy.system.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -24,11 +28,17 @@
private UserService userService;
@Autowired
private RoleService roleService;
+ @Autowired
+ private UserLoginService userLoginService;
+ @Autowired
+ private I18nMessageService i18nMessageService;
@RequestMapping(value = "/user/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") Long id) {
- return R.ok(userService.selectById(String.valueOf(id)));
+ User user = userService.getById(String.valueOf(id));
+ sanitizeUser(user);
+ return R.ok(user);
}
@RequestMapping(value = "/user/list/auth")
@@ -39,31 +49,36 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
excludeTrash(param);
- EntityWrapper<User> wrapper = new EntityWrapper<>();
+ QueryWrapper<User> wrapper = new QueryWrapper<>();
convert(param, wrapper);
- wrapper.orderBy("id", false);
+ wrapper.orderBy(true, false, "id");
+ Page<User> page;
if (9527 == getUserId()) {
- return R.ok(userService.selectPage(new Page<>(curr, limit), wrapper));
+ page = userService.page(new Page<>(curr, limit), wrapper);
+ sanitizeUsers(page.getRecords());
+ return R.ok(page);
}
Long roleId = getUser().getRoleId();
- Role role = roleService.selectById(roleId);
+ Role role = roleService.getById(roleId);
Long leaderId = role.getLeader();
if (null != leaderId) {
List<Long> leaderIds = new ArrayList<>();
leaderIds.add(role.getId());
while (leaderId != null) {
- Role leader = roleService.selectById(leaderId);
+ Role leader = roleService.getById(leaderId);
leaderIds.add(leader.getId());
leaderId = leader.getLeader();
}
wrapper.notIn("role_id", leaderIds);
}
- return R.ok(userService.selectPage(new Page<>(curr, limit), wrapper));
+ page = userService.page(new Page<>(curr, limit), wrapper);
+ sanitizeUsers(page.getRecords());
+ return R.ok(page);
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ private void convert(Map<String, Object> map, QueryWrapper wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
if (entry.getKey().endsWith(">")) {
wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
@@ -82,17 +97,18 @@
return R.error();
}
if (null == user.getId()){
- userService.insert(user);
- } else {
- userService.updateById(user);
+ normalizeNewUser(user);
+ userService.save(user);
+ return R.ok();
}
- return R.ok();
+ return update(user);
}
@RequestMapping(value = "/user/add/auth")
@ManagerAuth(memo = "绯荤粺鐢ㄦ埛娣诲姞")
public R add(User user) {
- userService.insert(user);
+ normalizeNewUser(user);
+ userService.save(user);
return R.ok();
}
@@ -102,20 +118,84 @@
if (Cools.isEmpty(user) || null==user.getId()){
return R.error();
}
- User entity = userService.selectById(user.getId());
+ User entity = userService.getById(user.getId());
+ if (Cools.isEmpty(entity)) {
+ return new R(10001, i18nMessageService.getMessage("response.user.notFound"));
+ }
+ UpdateWrapper<User> wrapper = new UpdateWrapper<>();
+ wrapper.eq("id", entity.getId());
+ boolean needUpdate = false;
if (user.getPassword()!=null) {
- entity.setPassword(user.getPassword());
+ wrapper.set("password", user.getPassword());
+ needUpdate = true;
}
if (user.getUsername()!=null) {
- entity.setUsername(user.getUsername());
+ wrapper.set("username", user.getUsername());
+ needUpdate = true;
}
if (user.getMobile()!=null) {
- entity.setMobile(user.getMobile());
+ wrapper.set("mobile", user.getMobile());
+ needUpdate = true;
}
if (user.getRoleId() !=null) {
- entity.setRoleId(user.getRoleId());
+ wrapper.set("role_id", user.getRoleId());
+ needUpdate = true;
}
- userService.updateById(entity);
+ if (user.getStatus() != null) {
+ wrapper.set("status", user.getStatus());
+ needUpdate = true;
+ }
+ if (user.getMfaAllow() != null) {
+ int mfaAllow = normalizeMfaAllow(user.getMfaAllow());
+ wrapper.set("mfa_allow", mfaAllow);
+ if (mfaAllow != 1) {
+ wrapper.set("mfa_enabled", 0);
+ wrapper.set("mfa_secret", null);
+ wrapper.set("mfa_bound_time", null);
+ }
+ needUpdate = true;
+ }
+ if (!needUpdate) {
+ return R.ok();
+ }
+ userService.update(wrapper);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/user/password/update/auth")
+ @ManagerAuth(memo = "绯荤粺鐢ㄦ埛淇敼瀵嗙爜")
+ public R updatePassword(String oldPassword, String password) {
+ if (Cools.isEmpty(oldPassword, password)) {
+ return R.error();
+ }
+ User user = userService.getById(getUserId());
+ if (Cools.isEmpty(user)) {
+ return new R(10001, i18nMessageService.getMessage("response.user.notFound"));
+ }
+ if (!Cools.eq(user.getPassword(), oldPassword)) {
+ return new R(10008, i18nMessageService.getMessage("response.user.oldPasswordMismatch"));
+ }
+ userService.update(new UpdateWrapper<User>()
+ .eq("id", user.getId())
+ .set("password", password));
+ userLoginService.remove(new QueryWrapper<UserLogin>().eq("user_id", user.getId()).eq("system_type", "WCS"));
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/user/resetPassword/auth")
+ @ManagerAuth(memo = "绯荤粺鐢ㄦ埛閲嶇疆瀵嗙爜")
+ public R resetPassword(Long id, String password) {
+ if (id == null || Cools.isEmpty(password)) {
+ return R.error();
+ }
+ User user = userService.getById(id);
+ if (Cools.isEmpty(user)) {
+ return new R(10001, i18nMessageService.getMessage("response.user.notFound"));
+ }
+ userService.update(new UpdateWrapper<User>()
+ .eq("id", id)
+ .set("password", password));
+ userLoginService.remove(new QueryWrapper<UserLogin>().eq("user_id", id).eq("system_type", "WCS"));
return R.ok();
}
@@ -123,7 +203,7 @@
@ManagerAuth(memo = "绯荤粺鐢ㄦ埛鍒犻櫎")
public R delete(@RequestParam(value="ids[]") Long[] ids){
for (Long id : ids){
- userService.deleteById(id);
+ userService.removeById(id);
}
return R.ok();
}
@@ -132,19 +212,19 @@
@ManagerAuth(memo = "绯荤粺鐢ㄦ埛瀵煎嚭")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- EntityWrapper<User> wrapper = new EntityWrapper<>();
+ QueryWrapper<User> wrapper = new QueryWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("user"));
convert(map, wrapper);
- List<User> list = userService.selectList(wrapper);
+ List<User> list = userService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/userQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<User> wrapper = new EntityWrapper<>();
+ QueryWrapper<User> wrapper = new QueryWrapper<>();
wrapper.like("username", condition);
- Page<User> page = userService.selectPage(new Page<>(0, 10), wrapper);
+ Page<User> page = userService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (User user : page.getRecords()){
Map<String, Object> map = new HashMap<>();
@@ -155,4 +235,45 @@
return R.ok(result);
}
+ private void normalizeNewUser(User user) {
+ if (Cools.isEmpty(user)) {
+ return;
+ }
+ int mfaAllow = normalizeMfaAllow(user.getMfaAllow());
+ user.setMfaAllow(mfaAllow);
+ if (mfaAllow != 1) {
+ user.setMfaEnabled(0);
+ user.setMfaSecret(null);
+ user.setMfaBoundTime(null);
+ } else if (user.getMfaEnabled() == null) {
+ user.setMfaEnabled(0);
+ }
+ }
+
+ private int normalizeMfaAllow(Integer mfaAllow) {
+ return Integer.valueOf(1).equals(mfaAllow) ? 1 : 0;
+ }
+
+ private void sanitizeUsers(List<User> users) {
+ if (users == null) {
+ return;
+ }
+ for (User user : users) {
+ sanitizeUser(user);
+ }
+ }
+
+ private void sanitizeUser(User user) {
+ if (user == null) {
+ return;
+ }
+ user.setPassword(null);
+ user.setMfaSecret(null);
+ user.setPasskeyCredentialId(null);
+ user.setPasskeyPublicKey(null);
+ user.setPasskeyAlgorithm(null);
+ user.setPasskeySignCount(null);
+ user.setPasskeyTransports(null);
+ }
+
}
--
Gitblit v1.9.1