From 82de5a307466894bbb0258f8a63a26a7bb96d80d Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 16 十月 2025 09:55:35 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/system/controller/UserController.java | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/zy/system/controller/UserController.java b/src/main/java/com/zy/system/controller/UserController.java
index 98825f2..498fa3c 100644
--- a/src/main/java/com/zy/system/controller/UserController.java
+++ b/src/main/java/com/zy/system/controller/UserController.java
@@ -3,15 +3,15 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.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.web.BaseController;
import com.zy.system.entity.Role;
import com.zy.system.entity.User;
import com.zy.system.service.RoleService;
import com.zy.system.service.UserService;
-import com.core.annotations.ManagerAuth;
-import com.core.common.Cools;
-import com.core.common.DateUtils;
-import com.core.common.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -33,11 +33,11 @@
@RequestMapping(value = "/user/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<User> wrapper = new EntityWrapper<>();
convert(param, wrapper);
@@ -63,10 +63,10 @@
return R.ok(userService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -79,10 +79,10 @@
@RequestMapping(value = "/user/edit/auth")
@ManagerAuth(memo = "绯荤粺鐢ㄦ埛缂栬緫")
public R edit(User user) {
- if (Cools.isEmpty(user)){
+ if (Cools.isEmpty(user)) {
return R.error();
}
- if (null == user.getId()){
+ if (null == user.getId()) {
user.setStatus(1);
user.setCreateTime(new Date());
userService.insert(user);
@@ -101,23 +101,23 @@
return R.ok();
}
- @RequestMapping(value = "/user/update/auth")
+ @RequestMapping(value = "/user/update/auth")
@ManagerAuth(memo = "绯荤粺鐢ㄦ埛淇敼")
- public R update(User user){
- if (Cools.isEmpty(user) || null==user.getId()){
+ public R update(User user) {
+ if (Cools.isEmpty(user) || null == user.getId()) {
return R.error();
}
User entity = userService.selectById(user.getId());
- if (user.getPassword()!=null) {
+ if (user.getPassword() != null) {
entity.setPassword(user.getPassword());
}
- if (user.getUsername()!=null) {
+ if (user.getUsername() != null) {
entity.setUsername(user.getUsername());
}
- if (user.getMobile()!=null) {
+ if (user.getMobile() != null) {
entity.setMobile(user.getMobile());
}
- if (user.getRoleId()!=null) {
+ if (user.getRoleId() != null) {
entity.setRoleId(user.getRoleId());
}
userService.updateById(entity);
@@ -126,8 +126,8 @@
@RequestMapping(value = "/user/delete/auth")
@ManagerAuth(memo = "绯荤粺鐢ㄦ埛鍒犻櫎")
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
userService.deleteById(id);
}
return R.ok();
@@ -135,7 +135,7 @@
@RequestMapping(value = "/user/export/auth")
@ManagerAuth(memo = "绯荤粺鐢ㄦ埛瀵煎嚭")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<User> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("user"));
@@ -151,7 +151,7 @@
wrapper.like("username", condition);
Page<User> page = userService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (User user : page.getRecords()){
+ for (User user : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", user.getId());
map.put("value", user.getUsername());
--
Gitblit v1.9.1