若依 2.0

RuoYi

2019-12-02 fee8a5955b61ce8e880f376c68b03a2ec8ac7dbb

 ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java

@@ -3,6 +3,7 @@
import java.util.List;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.security.access.prepost.PreAuthorize;

import org.springframework.validation.annotation.Validated;

import org.springframework.web.bind.annotation.DeleteMapping;

import org.springframework.web.bind.annotation.GetMapping;

import org.springframework.web.bind.annotation.PathVariable;

@@ -13,6 +14,8 @@
import org.springframework.web.bind.annotation.RestController;

import com.ruoyi.common.constant.UserConstants;

import com.ruoyi.common.utils.SecurityUtils;

import com.ruoyi.common.utils.StringUtils;

import com.ruoyi.common.utils.poi.ExcelUtil;

import com.ruoyi.framework.aspectj.lang.annotation.Log;

import com.ruoyi.framework.aspectj.lang.enums.BusinessType;

import com.ruoyi.framework.web.controller.BaseController;

@@ -53,16 +56,32 @@
        return getDataTable(list);

    }



    @Log(title = "用户管理", businessType = BusinessType.EXPORT)

    @PreAuthorize("@ss.hasPermi('system:user:export')")

    @GetMapping("/export")

    public AjaxResult export(SysUser user)

    {

        List<SysUser> list = userService.selectUserList(user);

        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);

        return util.exportExcel(list, "用户数据");

    }



    /**

     * 根据用户编号获取详细信息

     */

    @PreAuthorize("@ss.hasPermi('system:user:query')")

    @GetMapping(value = "/{userId}")

    public AjaxResult getInfo(@PathVariable Long userId)

    @GetMapping(value = { "/", "/{userId}" })

    public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)

    {

        AjaxResult ajax = AjaxResult.success(userService.selectUserById(userId));

        ajax.put("postIds", postService.selectPostListByUserId(userId));

        ajax.put("roleIds", roleService.selectRoleListByUserId(userId));

        AjaxResult ajax = AjaxResult.success();

        ajax.put("roles", roleService.selectRoleAll());

        ajax.put("posts", postService.selectPostAll());

        if (StringUtils.isNotNull(userId))

        {

            ajax.put(AjaxResult.DATA_TAG, userService.selectUserById(userId));

            ajax.put("postIds", postService.selectPostListByUserId(userId));

            ajax.put("roleIds", roleService.selectRoleListByUserId(userId));

        }

        return ajax;

    }



@@ -72,7 +91,7 @@
    @PreAuthorize("@ss.hasPermi('system:user:add')")

    @Log(title = "用户管理", businessType = BusinessType.INSERT)

    @PostMapping

    public AjaxResult add(@RequestBody SysUser user)

    public AjaxResult add(@Validated @RequestBody SysUser user)

    {

        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName())))

        {

@@ -97,7 +116,7 @@
    @PreAuthorize("@ss.hasPermi('system:user:edit')")

    @Log(title = "用户管理", businessType = BusinessType.UPDATE)

    @PutMapping

    public AjaxResult edit(@RequestBody SysUser user)

    public AjaxResult edit(@Validated @RequestBody SysUser user)

    {

        userService.checkUserAllowed(user);

        if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))

@@ -117,11 +136,10 @@
     */

    @PreAuthorize("@ss.hasPermi('system:user:remove')")

    @Log(title = "用户管理", businessType = BusinessType.DELETE)

    @DeleteMapping("/{userId}")

    public AjaxResult remove(@PathVariable Long userId)

    @DeleteMapping("/{userIds}")

    public AjaxResult remove(@PathVariable Long[] userIds)

    {

        userService.checkUserAllowed(new SysUser(userId));

        return toAjax(userService.deleteUserById(userId));

        return toAjax(userService.deleteUserByIds(userIds));

    }



    /**