升级fastjson到最新版2.0.7

RuoYi

2022-06-17 78c356a9f305405dc18f908ec863aba7c610a9fc

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

@@ -1,6 +1,5 @@
package com.ruoyi.system.controller;



import java.io.IOException;

import java.util.List;

import javax.servlet.http.HttpServletResponse;

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

@@ -14,16 +13,19 @@
import org.springframework.web.bind.annotation.RequestMapping;

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

import com.ruoyi.common.core.constant.UserConstants;

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

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

import com.ruoyi.common.core.web.controller.BaseController;

import com.ruoyi.common.core.web.domain.AjaxResult;

import com.ruoyi.common.core.web.page.TableDataInfo;

import com.ruoyi.common.log.annotation.Log;

import com.ruoyi.common.log.enums.BusinessType;

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

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

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

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

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

import com.ruoyi.system.domain.SysUserRole;

import com.ruoyi.system.service.ISysRoleService;

import com.ruoyi.system.service.ISysUserService;



/**

 * 角色信息

@@ -37,7 +39,10 @@
    @Autowired

    private ISysRoleService roleService;



    @PreAuthorize(hasPermi = "system:role:list")

    @Autowired

    private ISysUserService userService;



    @RequiresPermissions("system:role:list")

    @GetMapping("/list")

    public TableDataInfo list(SysRole role)

    {

@@ -47,9 +52,9 @@
    }



    @Log(title = "角色管理", businessType = BusinessType.EXPORT)

    @PreAuthorize(hasPermi = "system:role:export")

    @RequiresPermissions("system:role:export")

    @PostMapping("/export")

    public void export(HttpServletResponse response, SysRole role) throws IOException

    public void export(HttpServletResponse response, SysRole role)

    {

        List<SysRole> list = roleService.selectRoleList(role);

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

@@ -59,17 +64,18 @@
    /**

     * 根据角色编号获取详细信息

     */

    @PreAuthorize(hasPermi = "system:role:query")

    @RequiresPermissions("system:role:query")

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

    public AjaxResult getInfo(@PathVariable Long roleId)

    {

        roleService.checkRoleDataScope(roleId);

        return AjaxResult.success(roleService.selectRoleById(roleId));

    }



    /**

     * 新增角色

     */

    @PreAuthorize(hasPermi = "system:role:add")

    @RequiresPermissions("system:role:add")

    @Log(title = "角色管理", businessType = BusinessType.INSERT)

    @PostMapping

    public AjaxResult add(@Validated @RequestBody SysRole role)

@@ -90,12 +96,13 @@
    /**

     * 修改保存角色

     */

    @PreAuthorize(hasPermi = "system:role:edit")

    @RequiresPermissions("system:role:edit")

    @Log(title = "角色管理", businessType = BusinessType.UPDATE)

    @PutMapping

    public AjaxResult edit(@Validated @RequestBody SysRole role)

    {

        roleService.checkRoleAllowed(role);

        roleService.checkRoleDataScope(role.getRoleId());

        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))

        {

            return AjaxResult.error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");

@@ -111,24 +118,26 @@
    /**

     * 修改保存数据权限

     */

    @PreAuthorize(hasPermi = "system:role:edit")

    @RequiresPermissions("system:role:edit")

    @Log(title = "角色管理", businessType = BusinessType.UPDATE)

    @PutMapping("/dataScope")

    public AjaxResult dataScope(@RequestBody SysRole role)

    {

        roleService.checkRoleAllowed(role);

        roleService.checkRoleDataScope(role.getRoleId());

        return toAjax(roleService.authDataScope(role));

    }



    /**

     * 状态修改

     */

    @PreAuthorize(hasPermi = "system:role:edit")

    @RequiresPermissions("system:role:edit")

    @Log(title = "角色管理", businessType = BusinessType.UPDATE)

    @PutMapping("/changeStatus")

    public AjaxResult changeStatus(@RequestBody SysRole role)

    {

        roleService.checkRoleAllowed(role);

        roleService.checkRoleDataScope(role.getRoleId());

        role.setUpdateBy(SecurityUtils.getUsername());

        return toAjax(roleService.updateRoleStatus(role));

    }

@@ -136,7 +145,7 @@
    /**

     * 删除角色

     */

    @PreAuthorize(hasPermi = "system:role:remove")

    @RequiresPermissions("system:role:remove")

    @Log(title = "角色管理", businessType = BusinessType.DELETE)

    @DeleteMapping("/{roleIds}")

    public AjaxResult remove(@PathVariable Long[] roleIds)

@@ -147,10 +156,67 @@
    /**

     * 获取角色选择框列表

     */

    @PreAuthorize(hasPermi = "system:role:query")

    @RequiresPermissions("system:role:query")

    @GetMapping("/optionselect")

    public AjaxResult optionselect()

    {

        return AjaxResult.success(roleService.selectRoleAll());

    }

    /**

     * 查询已分配用户角色列表

     */

    @RequiresPermissions("system:role:list")

    @GetMapping("/authUser/allocatedList")

    public TableDataInfo allocatedList(SysUser user)

    {

        startPage();

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

        return getDataTable(list);

    }



    /**

     * 查询未分配用户角色列表

     */

    @RequiresPermissions("system:role:list")

    @GetMapping("/authUser/unallocatedList")

    public TableDataInfo unallocatedList(SysUser user)

    {

        startPage();

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

        return getDataTable(list);

    }



    /**

     * 取消授权用户

     */

    @RequiresPermissions("system:role:edit")

    @Log(title = "角色管理", businessType = BusinessType.GRANT)

    @PutMapping("/authUser/cancel")

    public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole)

    {

        return toAjax(roleService.deleteAuthUser(userRole));

    }



    /**

     * 批量取消授权用户

     */

    @RequiresPermissions("system:role:edit")

    @Log(title = "角色管理", businessType = BusinessType.GRANT)

    @PutMapping("/authUser/cancelAll")

    public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds)

    {

        return toAjax(roleService.deleteAuthUsers(roleId, userIds));

    }



    /**

     * 批量选择用户授权

     */

    @RequiresPermissions("system:role:edit")

    @Log(title = "角色管理", businessType = BusinessType.GRANT)

    @PutMapping("/authUser/selectAll")

    public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds)

    {

        roleService.checkRoleDataScope(roleId);

        return toAjax(roleService.insertAuthUsers(roleId, userIds));

    }

}