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

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

@ -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;
@ -32,8 +33,7 @@ import com.ruoyi.framework.web.base.BaseController;
*/
@Controller
@RequestMapping("/system/user")
public class SysUserController extends BaseController
{
public class SysUserController extends BaseController {
private String prefix = "system/user";
@Autowired
@ -50,16 +50,14 @@ 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<SysUser> list = userService.selectUserList( user );
return getDataTable( list );
@ -69,8 +67,7 @@ public class SysUserController extends BaseController
@RequiresPermissions("system:user:export")
@PostMapping("/export")
@ResponseBody
public AjaxResult export(SysUser user)
{
public AjaxResult export(SysUser user) {
List<SysUser> list = userService.selectUserList( user );
ExcelUtil<SysUser> util = new ExcelUtil<SysUser>( SysUser.class );
return util.exportExcel( list, "user" );
@ -80,8 +77,7 @@ public class SysUserController extends BaseController
* 新增用户
*/
@GetMapping("/add")
public String add(ModelMap mmap)
{
public String add(ModelMap mmap) {
mmap.put( "roles", roleService.selectRoleAll() );
mmap.put( "posts", postService.selectPostAll() );
return prefix + "/add";
@ -95,10 +91,8 @@ 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()))
{
public AjaxResult addSave(SysUser user) {
if (StringUtils.isNotNull( user.getUserId() ) && SysUser.isAdmin( user.getUserId() )) {
return error( "不允许修改超级管理员用户" );
}
user.setSalt( ShiroUtils.randomSalt() );
@ -111,8 +105,7 @@ public class SysUserController extends BaseController
* 修改用户
*/
@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( "roles", roleService.selectRolesByUserId( userId ) );
mmap.put( "posts", postService.selectPostsByUserId( userId ) );
@ -127,10 +120,8 @@ 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()))
{
public AjaxResult editSave(SysUser user) {
if (StringUtils.isNotNull( user.getUserId() ) && SysUser.isAdmin( user.getUserId() )) {
return error( "不允许修改超级管理员用户" );
}
user.setUpdateBy( ShiroUtils.getLoginName() );
@ -140,8 +131,7 @@ public class SysUserController extends BaseController
@RequiresPermissions("system:user:resetPwd")
@Log(title = "重置密码", businessType = BusinessType.UPDATE)
@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 ) );
return prefix + "/resetPwd";
}
@ -150,8 +140,7 @@ public class SysUserController extends BaseController
@Log(title = "重置密码", businessType = BusinessType.UPDATE)
@PostMapping("/resetPwd")
@ResponseBody
public AjaxResult resetPwdSave(SysUser 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 ) );
@ -161,14 +150,10 @@ public class SysUserController extends BaseController
@Log(title = "用户管理", businessType = BusinessType.DELETE)
@PostMapping("/remove")
@ResponseBody
public AjaxResult remove(String ids)
{
try
{
public AjaxResult remove(String ids) {
try {
return toAjax( userService.deleteUserByIds( ids ) );
}
catch (Exception e)
{
} catch (Exception e) {
return error( e.getMessage() );
}
}
@ -178,8 +163,7 @@ public class SysUserController extends BaseController
*/
@PostMapping("/checkLoginNameUnique")
@ResponseBody
public String checkLoginNameUnique(SysUser user)
{
public String checkLoginNameUnique(SysUser user) {
return userService.checkLoginNameUnique( user.getLoginName() );
}
@ -188,8 +172,7 @@ public class SysUserController extends BaseController
*/
@PostMapping("/checkPhoneUnique")
@ResponseBody
public String checkPhoneUnique(SysUser 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)
{
public String checkEmailUnique(SysUser user) {
return userService.checkEmailUnique( user );
}
}