ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

格式化

This commit is contained in:
zhujunjieit 2018-12-07 23:30:39 +08:00
parent d43ba637ed
commit e407f4c48c
1 changed files with 47 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
View File

@ -1,6 +1,7 @@
package com.ruoyi.web.controller.system; package com.ruoyi.web.controller.system;
import java.util.List; import java.util.List;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
@ -32,8 +33,7 @@ import com.ruoyi.framework.web.base.BaseController;
*/ */
@Controller @Controller
@RequestMapping("/system/user") @RequestMapping("/system/user")
public class SysUserController extends BaseController public class SysUserController extends BaseController {
{
private String prefix = "system/user"; private String prefix = "system/user";
@Autowired @Autowired
@ -50,40 +50,36 @@ public class SysUserController extends BaseController
@RequiresPermissions("system:user:view") @RequiresPermissions("system:user:view")
@GetMapping() @GetMapping()
public String user() public String user() {
{
return prefix + "/user"; return prefix + "/user";
} }
@RequiresPermissions("system:user:list") @RequiresPermissions("system:user:list")
@PostMapping("/list") @PostMapping("/list")
@ResponseBody @ResponseBody
public TableDataInfo list(SysUser user) public TableDataInfo list(SysUser user) {
{
List<SysUser> list = userService.selectUserList(user); List<SysUser> list = userService.selectUserList( user );
return getDataTable(list); return getDataTable( list );
} }
@Log(title = "用户管理", businessType = BusinessType.EXPORT) @Log(title = "用户管理", businessType = BusinessType.EXPORT)
@RequiresPermissions("system:user:export") @RequiresPermissions("system:user:export")
@PostMapping("/export") @PostMapping("/export")
@ResponseBody @ResponseBody
public AjaxResult export(SysUser user) public AjaxResult export(SysUser user) {
{ List<SysUser> list = userService.selectUserList( user );
List<SysUser> list = userService.selectUserList(user); ExcelUtil<SysUser> util = new ExcelUtil<SysUser>( SysUser.class );
ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class); return util.exportExcel( list, "user" );
return util.exportExcel(list, "user");
} }
/** /**
* 新增用户 * 新增用户
*/ */
@GetMapping("/add") @GetMapping("/add")
public String add(ModelMap mmap) public String add(ModelMap mmap) {
{ mmap.put( "roles", roleService.selectRoleAll() );
mmap.put("roles", roleService.selectRoleAll()); mmap.put( "posts", postService.selectPostAll() );
mmap.put("posts", postService.selectPostAll());
return prefix + "/add"; return prefix + "/add";
} }
@ -95,27 +91,24 @@ public class SysUserController extends BaseController
@PostMapping("/add") @PostMapping("/add")
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@ResponseBody @ResponseBody
public AjaxResult addSave(SysUser user) public AjaxResult addSave(SysUser user) {
{ if (StringUtils.isNotNull( user.getUserId() ) && SysUser.isAdmin( user.getUserId() )) {
if (StringUtils.isNotNull(user.getUserId()) && SysUser.isAdmin(user.getUserId())) return error( "不允许修改超级管理员用户" );
{
return error("不允许修改超级管理员用户");
} }
user.setSalt(ShiroUtils.randomSalt()); user.setSalt( ShiroUtils.randomSalt() );
user.setPassword(passwordService.encryptPassword(user.getLoginName(), user.getPassword(), user.getSalt())); user.setPassword( passwordService.encryptPassword( user.getLoginName(), user.getPassword(), user.getSalt() ) );
user.setCreateBy(ShiroUtils.getLoginName()); user.setCreateBy( ShiroUtils.getLoginName() );
return toAjax(userService.insertUser(user)); return toAjax( userService.insertUser( user ) );
} }
/** /**
* 修改用户 * 修改用户
*/ */
@GetMapping("/edit/{userId}") @GetMapping("/edit/{userId}")
public String edit(@PathVariable("userId") Long userId, ModelMap mmap) public String edit(@PathVariable("userId") Long userId, ModelMap mmap) {
{ mmap.put( "user", userService.selectUserById( userId ) );
mmap.put("user", userService.selectUserById(userId)); mmap.put( "roles", roleService.selectRolesByUserId( userId ) );
mmap.put("roles", roleService.selectRolesByUserId(userId)); mmap.put( "posts", postService.selectPostsByUserId( userId ) );
mmap.put("posts", postService.selectPostsByUserId(userId));
return prefix + "/edit"; return prefix + "/edit";
} }
@ -127,22 +120,19 @@ public class SysUserController extends BaseController
@PostMapping("/edit") @PostMapping("/edit")
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@ResponseBody @ResponseBody
public AjaxResult editSave(SysUser user) public AjaxResult editSave(SysUser user) {
{ if (StringUtils.isNotNull( user.getUserId() ) && SysUser.isAdmin( user.getUserId() )) {
if (StringUtils.isNotNull(user.getUserId()) && SysUser.isAdmin(user.getUserId())) return error( "不允许修改超级管理员用户" );
{
return error("不允许修改超级管理员用户");
} }
user.setUpdateBy(ShiroUtils.getLoginName()); user.setUpdateBy( ShiroUtils.getLoginName() );
return toAjax(userService.updateUser(user)); return toAjax( userService.updateUser( user ) );
} }
@RequiresPermissions("system:user:resetPwd") @RequiresPermissions("system:user:resetPwd")
@Log(title = "重置密码", businessType = BusinessType.UPDATE) @Log(title = "重置密码", businessType = BusinessType.UPDATE)
@GetMapping("/resetPwd/{userId}") @GetMapping("/resetPwd/{userId}")
public String resetPwd(@PathVariable("userId") Long userId, ModelMap mmap) public String resetPwd(@PathVariable("userId") Long userId, ModelMap mmap) {
{ mmap.put( "user", userService.selectUserById( userId ) );
mmap.put("user", userService.selectUserById(userId));
return prefix + "/resetPwd"; return prefix + "/resetPwd";
} }
@ -150,26 +140,21 @@ public class SysUserController extends BaseController
@Log(title = "重置密码", businessType = BusinessType.UPDATE) @Log(title = "重置密码", businessType = BusinessType.UPDATE)
@PostMapping("/resetPwd") @PostMapping("/resetPwd")
@ResponseBody @ResponseBody
public AjaxResult resetPwdSave(SysUser user) public AjaxResult resetPwdSave(SysUser user) {
{ user.setSalt( ShiroUtils.randomSalt() );
user.setSalt(ShiroUtils.randomSalt()); user.setPassword( passwordService.encryptPassword( user.getLoginName(), user.getPassword(), user.getSalt() ) );
user.setPassword(passwordService.encryptPassword(user.getLoginName(), user.getPassword(), user.getSalt())); return toAjax( userService.resetUserPwd( user ) );
return toAjax(userService.resetUserPwd(user));
} }
@RequiresPermissions("system:user:remove") @RequiresPermissions("system:user:remove")
@Log(title = "用户管理", businessType = BusinessType.DELETE) @Log(title = "用户管理", businessType = BusinessType.DELETE)
@PostMapping("/remove") @PostMapping("/remove")
@ResponseBody @ResponseBody
public AjaxResult remove(String ids) public AjaxResult remove(String ids) {
{ try {
try return toAjax( userService.deleteUserByIds( ids ) );
{ } catch (Exception e) {
return toAjax(userService.deleteUserByIds(ids)); return error( e.getMessage() );
}
catch (Exception e)
{
return error(e.getMessage());
} }
} }
@ -178,9 +163,8 @@ public class SysUserController extends BaseController
*/ */
@PostMapping("/checkLoginNameUnique") @PostMapping("/checkLoginNameUnique")
@ResponseBody @ResponseBody
public String checkLoginNameUnique(SysUser user) public String checkLoginNameUnique(SysUser user) {
{ return userService.checkLoginNameUnique( user.getLoginName() );
return userService.checkLoginNameUnique(user.getLoginName());
} }
/** /**
@ -188,9 +172,8 @@ public class SysUserController extends BaseController
*/ */
@PostMapping("/checkPhoneUnique") @PostMapping("/checkPhoneUnique")
@ResponseBody @ResponseBody
public String checkPhoneUnique(SysUser user) public String checkPhoneUnique(SysUser user) {
{ return userService.checkPhoneUnique( user );
return userService.checkPhoneUnique(user);
} }
/** /**
@ -198,8 +181,7 @@ public class SysUserController extends BaseController
*/ */
@PostMapping("/checkEmailUnique") @PostMapping("/checkEmailUnique")
@ResponseBody @ResponseBody
public String checkEmailUnique(SysUser user) public String checkEmailUnique(SysUser user) {
{ return userService.checkEmailUnique( user );
return userService.checkEmailUnique(user);
} }
} }