From e407f4c48c6aa9ce40f714d5a66e9c451c98d06b Mon Sep 17 00:00:00 2001 From: zhujunjieit Date: Fri, 7 Dec 2018 23:30:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysUserController.java | 112 ++++++++---------- 1 file changed, 47 insertions(+), 65 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java index 7c4a3bf22..d9e3fc84d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java @@ -1,6 +1,7 @@ package com.ruoyi.web.controller.system; import java.util.List; + import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -27,13 +28,12 @@ import com.ruoyi.framework.web.base.BaseController; /** * 用户信息 - * + * * @author ruoyi */ @Controller @RequestMapping("/system/user") -public class SysUserController extends BaseController -{ +public class SysUserController extends BaseController { private String prefix = "system/user"; @Autowired @@ -50,40 +50,36 @@ public class SysUserController extends BaseController @RequiresPermissions("system:user:view") @GetMapping() - public String user() - { + public String user() { return prefix + "/user"; } @RequiresPermissions("system:user:list") @PostMapping("/list") @ResponseBody - public TableDataInfo list(SysUser user) - { + public TableDataInfo list(SysUser user) { - List list = userService.selectUserList(user); - return getDataTable(list); + List list = userService.selectUserList( user ); + return getDataTable( list ); } @Log(title = "用户管理", businessType = BusinessType.EXPORT) @RequiresPermissions("system:user:export") @PostMapping("/export") @ResponseBody - public AjaxResult export(SysUser user) - { - List list = userService.selectUserList(user); - ExcelUtil util = new ExcelUtil(SysUser.class); - return util.exportExcel(list, "user"); + public AjaxResult export(SysUser user) { + List list = userService.selectUserList( user ); + ExcelUtil util = new ExcelUtil( SysUser.class ); + return util.exportExcel( list, "user" ); } /** * 新增用户 */ @GetMapping("/add") - public String add(ModelMap mmap) - { - mmap.put("roles", roleService.selectRoleAll()); - mmap.put("posts", postService.selectPostAll()); + public String add(ModelMap mmap) { + mmap.put( "roles", roleService.selectRoleAll() ); + mmap.put( "posts", postService.selectPostAll() ); return prefix + "/add"; } @@ -95,27 +91,24 @@ public class SysUserController extends BaseController @PostMapping("/add") @Transactional(rollbackFor = Exception.class) @ResponseBody - public AjaxResult addSave(SysUser user) - { - if (StringUtils.isNotNull(user.getUserId()) && SysUser.isAdmin(user.getUserId())) - { - return error("不允许修改超级管理员用户"); + public AjaxResult addSave(SysUser user) { + if (StringUtils.isNotNull( user.getUserId() ) && SysUser.isAdmin( user.getUserId() )) { + return error( "不允许修改超级管理员用户" ); } - user.setSalt(ShiroUtils.randomSalt()); - user.setPassword(passwordService.encryptPassword(user.getLoginName(), user.getPassword(), user.getSalt())); - user.setCreateBy(ShiroUtils.getLoginName()); - return toAjax(userService.insertUser(user)); + user.setSalt( ShiroUtils.randomSalt() ); + user.setPassword( passwordService.encryptPassword( user.getLoginName(), user.getPassword(), user.getSalt() ) ); + user.setCreateBy( ShiroUtils.getLoginName() ); + return toAjax( userService.insertUser( user ) ); } /** * 修改用户 */ @GetMapping("/edit/{userId}") - public String edit(@PathVariable("userId") Long userId, ModelMap mmap) - { - mmap.put("user", userService.selectUserById(userId)); - mmap.put("roles", roleService.selectRolesByUserId(userId)); - mmap.put("posts", postService.selectPostsByUserId(userId)); + public String edit(@PathVariable("userId") Long userId, ModelMap mmap) { + mmap.put( "user", userService.selectUserById( userId ) ); + mmap.put( "roles", roleService.selectRolesByUserId( userId ) ); + mmap.put( "posts", postService.selectPostsByUserId( userId ) ); return prefix + "/edit"; } @@ -127,22 +120,19 @@ public class SysUserController extends BaseController @PostMapping("/edit") @Transactional(rollbackFor = Exception.class) @ResponseBody - public AjaxResult editSave(SysUser user) - { - if (StringUtils.isNotNull(user.getUserId()) && SysUser.isAdmin(user.getUserId())) - { - return error("不允许修改超级管理员用户"); + public AjaxResult editSave(SysUser user) { + if (StringUtils.isNotNull( user.getUserId() ) && SysUser.isAdmin( user.getUserId() )) { + return error( "不允许修改超级管理员用户" ); } - user.setUpdateBy(ShiroUtils.getLoginName()); - return toAjax(userService.updateUser(user)); + user.setUpdateBy( ShiroUtils.getLoginName() ); + return toAjax( userService.updateUser( user ) ); } @RequiresPermissions("system:user:resetPwd") @Log(title = "重置密码", businessType = BusinessType.UPDATE) @GetMapping("/resetPwd/{userId}") - public String resetPwd(@PathVariable("userId") Long userId, ModelMap mmap) - { - mmap.put("user", userService.selectUserById(userId)); + public String resetPwd(@PathVariable("userId") Long userId, ModelMap mmap) { + mmap.put( "user", userService.selectUserById( userId ) ); return prefix + "/resetPwd"; } @@ -150,26 +140,21 @@ public class SysUserController extends BaseController @Log(title = "重置密码", businessType = BusinessType.UPDATE) @PostMapping("/resetPwd") @ResponseBody - public AjaxResult resetPwdSave(SysUser user) - { - user.setSalt(ShiroUtils.randomSalt()); - user.setPassword(passwordService.encryptPassword(user.getLoginName(), user.getPassword(), user.getSalt())); - return toAjax(userService.resetUserPwd(user)); + public AjaxResult resetPwdSave(SysUser user) { + user.setSalt( ShiroUtils.randomSalt() ); + user.setPassword( passwordService.encryptPassword( user.getLoginName(), user.getPassword(), user.getSalt() ) ); + return toAjax( userService.resetUserPwd( user ) ); } @RequiresPermissions("system:user:remove") @Log(title = "用户管理", businessType = BusinessType.DELETE) @PostMapping("/remove") @ResponseBody - public AjaxResult remove(String ids) - { - try - { - return toAjax(userService.deleteUserByIds(ids)); - } - catch (Exception e) - { - return error(e.getMessage()); + public AjaxResult remove(String ids) { + try { + return toAjax( userService.deleteUserByIds( ids ) ); + } catch (Exception e) { + return error( e.getMessage() ); } } @@ -178,9 +163,8 @@ public class SysUserController extends BaseController */ @PostMapping("/checkLoginNameUnique") @ResponseBody - public String checkLoginNameUnique(SysUser user) - { - return userService.checkLoginNameUnique(user.getLoginName()); + public String checkLoginNameUnique(SysUser user) { + return userService.checkLoginNameUnique( user.getLoginName() ); } /** @@ -188,9 +172,8 @@ public class SysUserController extends BaseController */ @PostMapping("/checkPhoneUnique") @ResponseBody - public String checkPhoneUnique(SysUser user) - { - return userService.checkPhoneUnique(user); + public String checkPhoneUnique(SysUser user) { + return userService.checkPhoneUnique( user ); } /** @@ -198,8 +181,7 @@ public class SysUserController extends BaseController */ @PostMapping("/checkEmailUnique") @ResponseBody - public String checkEmailUnique(SysUser user) - { - return userService.checkEmailUnique(user); + public String checkEmailUnique(SysUser user) { + return userService.checkEmailUnique( user ); } } \ No newline at end of file