seata单独依赖模块

RuoYi

2022-09-29 0dfbb5fbf3927be210767dd18595fc42fed84e95

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java

@@ -29,10 +29,12 @@
import com.ruoyi.common.security.annotation.InnerAuth;

import com.ruoyi.common.security.annotation.RequiresPermissions;

import com.ruoyi.common.security.utils.SecurityUtils;

import com.ruoyi.system.api.domain.SysDept;

import com.ruoyi.system.api.domain.SysRole;

import com.ruoyi.system.api.domain.SysUser;

import com.ruoyi.system.api.model.LoginUser;

import com.ruoyi.system.service.ISysConfigService;

import com.ruoyi.system.service.ISysDeptService;

import com.ruoyi.system.service.ISysPermissionService;

import com.ruoyi.system.service.ISysPostService;

import com.ruoyi.system.service.ISysRoleService;

@@ -52,6 +54,9 @@


    @Autowired

    private ISysRoleService roleService;



    @Autowired

    private ISysDeptService deptService;



    @Autowired

    private ISysPostService postService;

@@ -116,9 +121,9 @@
            return R.fail("用户名或密码错误");

        }

        // 角色集合

        Set<String> roles = permissionService.getRolePermission(sysUser.getUserId());

        Set<String> roles = permissionService.getRolePermission(sysUser);

        // 权限集合

        Set<String> permissions = permissionService.getMenuPermission(sysUser.getUserId());

        Set<String> permissions = permissionService.getMenuPermission(sysUser);

        LoginUser sysUserVo = new LoginUser();

        sysUserVo.setSysUser(sysUser);

        sysUserVo.setRoles(roles);

@@ -138,7 +143,7 @@
        {

            return R.fail("当前系统没有开启注册功能！");

        }

        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(username)))

        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(sysUser)))

        {

            return R.fail("保存用户'" + username + "'失败，注册账号已存在");

        }

@@ -153,13 +158,13 @@
    @GetMapping("getInfo")

    public AjaxResult getInfo()

    {

        Long userId = SecurityUtils.getUserId();

        SysUser user = userService.selectUserById(SecurityUtils.getUserId());

        // 角色集合

        Set<String> roles = permissionService.getRolePermission(userId);

        Set<String> roles = permissionService.getRolePermission(user);

        // 权限集合

        Set<String> permissions = permissionService.getMenuPermission(userId);

        Set<String> permissions = permissionService.getMenuPermission(user);

        AjaxResult ajax = AjaxResult.success();

        ajax.put("user", userService.selectUserById(userId));

        ajax.put("user", user);

        ajax.put("roles", roles);

        ajax.put("permissions", permissions);

        return ajax;

@@ -179,9 +184,10 @@
        ajax.put("posts", postService.selectPostAll());

        if (StringUtils.isNotNull(userId))

        {

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

            SysUser sysUser = userService.selectUserById(userId);

            ajax.put(AjaxResult.DATA_TAG, sysUser);

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

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

            ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));

        }

        return ajax;

    }

@@ -194,7 +200,7 @@
    @PostMapping

    public AjaxResult add(@Validated @RequestBody SysUser user)

    {

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

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

        {

            return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");

        }

@@ -222,7 +228,12 @@
    public AjaxResult edit(@Validated @RequestBody SysUser user)

    {

        userService.checkUserAllowed(user);

        if (StringUtils.isNotEmpty(user.getPhonenumber())

        userService.checkUserDataScope(user.getUserId());

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

        {

            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，登录账号已存在");

        }

        else if (StringUtils.isNotEmpty(user.getPhonenumber())

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

        {

            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");

@@ -260,6 +271,7 @@
    public AjaxResult resetPwd(@RequestBody SysUser user)

    {

        userService.checkUserAllowed(user);

        userService.checkUserDataScope(user.getUserId());

        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));

        user.setUpdateBy(SecurityUtils.getUsername());

        return toAjax(userService.resetPwd(user));

@@ -274,6 +286,7 @@
    public AjaxResult changeStatus(@RequestBody SysUser user)

    {

        userService.checkUserAllowed(user);

        userService.checkUserDataScope(user.getUserId());

        user.setUpdateBy(SecurityUtils.getUsername());

        return toAjax(userService.updateUserStatus(user));

    }

@@ -301,7 +314,18 @@
    @PutMapping("/authRole")

    public AjaxResult insertAuthRole(Long userId, Long[] roleIds)

    {

        userService.checkUserDataScope(userId);

        userService.insertUserAuth(userId, roleIds);

        return success();

    }



    /**

     * 获取部门树列表

     */

    @RequiresPermissions("system:user:list")

    @GetMapping("/deptTree")

    public AjaxResult deptTree(SysDept dept)

    {

        return AjaxResult.success(deptService.selectDeptTreeList(dept));

    }

}