From 1565e0558ddf93b07720a07a5aef61136f2d21c7 Mon Sep 17 00:00:00 2001 From: laker <935009066@qq.com> Date: Wed, 27 Nov 2024 15:58:21 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BB=A3=E7=A0=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96=20code=20cleanup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../laker/admin/framework/model/PageVO.java | 10 +-- .../sys/controller/SysUserController.java | 63 +++++++++---------- web/admin/view/system/user.html | 7 +++ 3 files changed, 42 insertions(+), 38 deletions(-) diff --git a/src/main/java/com/laker/admin/framework/model/PageVO.java b/src/main/java/com/laker/admin/framework/model/PageVO.java index 48bb6e6..0a6bd2b 100644 --- a/src/main/java/com/laker/admin/framework/model/PageVO.java +++ b/src/main/java/com/laker/admin/framework/model/PageVO.java @@ -1,7 +1,7 @@ package com.laker.admin.framework.model; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.CharSequenceUtil; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.ApiModelProperty; @@ -43,17 +43,17 @@ public class PageVO implements Serializable { Page page = new Page(); page.setCurrent(current); page.setSize(size); - if (StrUtil.isNotBlank(orderBy)) { + if (CharSequenceUtil.isNotBlank(orderBy)) { List orders = new ArrayList<>(); - List orderItems = StrUtil.split(orderBy, ","); + List orderItems = CharSequenceUtil.split(orderBy, ","); for (String orderItemStr : orderItems) { - List orderAndSort = StrUtil.split(orderItemStr, " "); + List orderAndSort = CharSequenceUtil.split(orderItemStr, " "); if (CollUtil.size(orderAndSort) != 2) { continue; } String order = orderAndSort.get(0); String sort = orderAndSort.get(1); - orders.add(new OrderItem(order, StrUtil.equalsIgnoreCase("ASC", sort))); + orders.add(new OrderItem(order, CharSequenceUtil.equalsIgnoreCase("ASC", sort))); } page.setOrders(orders); } diff --git a/src/main/java/com/laker/admin/module/sys/controller/SysUserController.java b/src/main/java/com/laker/admin/module/sys/controller/SysUserController.java index ecfbff3..56ae3e1 100644 --- a/src/main/java/com/laker/admin/module/sys/controller/SysUserController.java +++ b/src/main/java/com/laker/admin/module/sys/controller/SysUserController.java @@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckRole; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; +import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.crypto.SecureUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -68,10 +68,10 @@ public class SysUserController { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(deptId != null, SysUser::getDeptId, deptId) - .and(StrUtil.isNotBlank(keyWord), i -> - i.like(StrUtil.isNotBlank(keyWord), SysUser::getUserName, keyWord) + .and(CharSequenceUtil.isNotBlank(keyWord), i -> + i.like(CharSequenceUtil.isNotBlank(keyWord), SysUser::getUserName, keyWord) .or() - .like(StrUtil.isNotBlank(keyWord), SysUser::getNickName, keyWord)); + .like(CharSequenceUtil.isNotBlank(keyWord), SysUser::getNickName, keyWord)); Page pageList = sysUserService.page(roadPage, queryWrapper); return PageResponse.ok(pageList.getRecords(), pageList.getTotal()); @@ -88,23 +88,22 @@ public class SysUserController { @GetMapping("/getAll") @ApiOperation(value = "获取所有用户") - public Response getAll() { + public Response> getAll() { List list = sysUserService.list(); - if (CollUtil.isNotEmpty(list)) { - List collect = list.stream().map(sysUser -> FlowAssigneVo.builder() - .name(sysUser.getNickName()).value(String.valueOf(sysUser.getUserId())).build()).collect(Collectors.toList()); - collect.add(0, FlowAssigneVo.builder().name("请选择").value("").build()); - collect.add(1, FlowAssigneVo.builder().name("当前用户").value("CurrentUser").build()); - return Response.ok(collect); + if (CollUtil.isEmpty(list)) { + return Response.ok(); } - return Response.ok(); + List collect = list.stream().map(sysUser -> FlowAssigneVo.builder() + .name(sysUser.getNickName()).value(String.valueOf(sysUser.getUserId())).build()).collect(Collectors.toList()); + collect.add(0, FlowAssigneVo.builder().name("请选择").value("").build()); + collect.add(1, FlowAssigneVo.builder().name("当前用户").value("CurrentUser").build()); + return Response.ok(collect); } @PostMapping @ApiOperation(value = "新增或者更新") @Transactional - @SaCheckPermission("user.update") - public Response saveOrUpdate(@RequestBody SysUser param) { + public Response saveOrUpdate(@RequestBody SysUser param) { if (param.getUserId() == null && param.getDeptId() == null) { return Response.error500("请选择部门"); @@ -122,7 +121,7 @@ public class SysUserController { } else { sysUserService.saveOrUpdate(param); } - if (StrUtil.isNotBlank(param.getRoleIds())) { + if (CharSequenceUtil.isNotBlank(param.getRoleIds())) { ArrayList list = CollUtil.newArrayList(param.getRoleIds().split(",")); list.add(param.getDataRoleId()); this.saveUserRole(param.getUserId(), list); @@ -134,11 +133,11 @@ public class SysUserController { @PutMapping("/switch") @ApiOperation(value = "用户启用停用开关") @SaCheckPermission("user.switch") - public Response userSwitch(@RequestBody SysUser param) { + public Response userSwitch(@RequestBody SysUser param) { return Response.ok(sysUserService.updateById(param)); } - private boolean saveUserRole(Long userId, List roleIds) { + private void saveUserRole(Long userId, List roleIds) { sysUserRoleService.remove(Wrappers.lambdaQuery().eq(SysUserRole::getUserId, userId)); List sysUserRoles = new ArrayList<>(); roleIds.forEach(roleId -> { @@ -147,16 +146,16 @@ public class SysUserController { sysUserRole.setUserId(userId); sysUserRoles.add(sysUserRole); }); - return sysUserRoleService.saveBatch(sysUserRoles); + sysUserRoleService.saveBatch(sysUserRoles); } @PutMapping("/updatePwd") @ApiOperation(value = "更新用户密码") @SaCheckPermission("user.update.pwd") - public Response updatePwd(@RequestBody PwdQo param) { + public Response updatePwd(@RequestBody PwdQo param) { - if (!StrUtil.equals(param.getNewPassword(), param.getConfirmPassword())) { + if (!CharSequenceUtil.equals(param.getNewPassword(), param.getConfirmPassword())) { return Response.error("500", "两次输入密码不一致"); } long userId = StpUtil.getLoginIdAsLong(); @@ -177,7 +176,7 @@ public class SysUserController { @ApiOperation(value = "重置用户密码") @SaCheckPermission("user.reset.pwd") @SaCheckRole("admin") - public Response resetPwd(@PathVariable Long userId) { + public Response resetPwd(@PathVariable Long userId) { SysUser user = new SysUser(); user.setUserId(userId); user.setPassword(SecureUtil.sha256(easyConfig.getDefaultPwd())); @@ -188,7 +187,7 @@ public class SysUserController { @PutMapping("/updateAvatar") @ApiOperation(value = "更新用户头像") @SaCheckPermission("user.updateAvatar") - public Response resetPwd(@RequestBody UserDto userDto) { + public Response resetPwd(@RequestBody UserDto userDto) { long userId = StpUtil.getLoginIdAsLong(); SysUser user = new SysUser(); user.setAvatar(userDto.getAvatar()); @@ -199,30 +198,28 @@ public class SysUserController { @GetMapping("/{id}") @ApiOperation(value = "根据id查询") - public Response get(@PathVariable Long id) { + public Response get(@PathVariable Long id) { return Response.ok(sysUserService.getById(id)); } @DeleteMapping("/{id}") @ApiOperation(value = "根据id删除") @SaCheckPermission("user.delete") - public Response delete(@PathVariable Long id) { + public Response delete(@PathVariable Long id) { return Response.ok(sysUserService.removeById(id)); } @GetMapping("/getRoles") - public Response edit(Long userId, Integer roleType) { + public Response> edit(Long userId, Integer roleType) { List allRole = sysRoleService.list(Wrappers.lambdaQuery().eq(SysRole::getRoleType, roleType)); if (userId != null) { List myRole = sysUserRoleService.list(Wrappers.lambdaQuery() .eq(SysUserRole::getUserId, userId)); - allRole.forEach(sysRole -> { - myRole.forEach(sysUserRole -> { - if (sysRole.getRoleId().equals(sysUserRole.getRoleId())) { - sysRole.setChecked(true); - } - }); - }); + allRole.forEach(sysRole -> myRole.forEach(sysUserRole -> { + if (sysRole.getRoleId().equals(sysUserRole.getRoleId())) { + sysRole.setChecked(true); + } + })); } else { allRole.stream() .filter(sysRole -> sysRole.getRoleType() == 1) @@ -240,7 +237,7 @@ public class SysUserController { @DeleteMapping("/batch/{ids}") @ApiOperation(value = "根据批量删除ids删除") @SaCheckPermission("dict.delete") - public Response batchRemove(@PathVariable Long[] ids) { + public Response batchRemove(@PathVariable Long[] ids) { return Response.ok(sysUserService.removeByIds(CollUtil.toList(ids))); } diff --git a/web/admin/view/system/user.html b/web/admin/view/system/user.html index 28c3c19..d302a2d 100644 --- a/web/admin/view/system/user.html +++ b/web/admin/view/system/user.html @@ -290,6 +290,7 @@ title: '提示' }, function (index) { layer.close(index); + // 弹出loading加载层 let loading = layer.load(); easyAdmin.http({ url: "/sys/user/" + obj.data['userId'], @@ -313,6 +314,9 @@ area: ['260px', '80px'] }); } + }, complete: function () { + // 关闭loading加载层 + layer.close(loading); } }) }); @@ -356,6 +360,9 @@ time: 1000 }); } + }, complete: function () { + // 关闭loading加载层 + layer.close(loading); } }) });