From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java | 322 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 322 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
new file mode 100644
index 0000000..494ff97
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
@@ -0,0 +1,322 @@
+package com.ruoyi.web.controller.system;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.entity.SysMenu;
+import com.ruoyi.system.dto.SysRoleDTO;
+import com.ruoyi.system.query.SysRoleQuery;
+import com.ruoyi.system.service.ISysMenuService;
+import com.ruoyi.system.vo.RoleInfoVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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.*;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.web.service.SysPermissionService;
+import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.system.domain.SysUserRole;
+import com.ruoyi.system.service.ISysDeptService;
+import com.ruoyi.system.service.ISysRoleService;
+import com.ruoyi.system.service.ISysUserService;
+
+/**
+ * 角色信息
+ *
+ * @author ruoyi
+ */
+@Api(tags = "角色信息")
+@RestController
+@RequestMapping("/system/role")
+public class SysRoleController extends BaseController
+{
+ @Autowired
+ private ISysRoleService roleService;
+
+ @Autowired
+ private TokenService tokenService;
+
+ @Autowired
+ private SysPermissionService permissionService;
+
+ @Autowired
+ private ISysUserService userService;
+
+ @Autowired
+ private ISysDeptService deptService;
+ @Autowired
+ private ISysMenuService menuService;
+
+ @PreAuthorize("@ss.hasPermi('system:role:list')")
+ @ApiOperation(value = "角色列表")
+ @PostMapping("/list")
+ public AjaxResult list(@RequestBody SysRoleQuery query)
+ {
+ PageInfo<SysRole> list = roleService.selectPageList(query);
+ return AjaxResult.success(list);
+ }
+
+ @PreAuthorize("@ss.hasPermi('system:role:list')")
+ @ApiOperation(value = "角色列表不分页")
+ @PostMapping("/listNotPage")
+ public AjaxResult list()
+ {
+ List<SysRole> list = roleService.selectRoleList(new SysRole());
+ return AjaxResult.success(list);
+ }
+ @PreAuthorize("@ss.hasPermi('system:role:count')")
+ @ApiOperation(value = "角色数量统计")
+ @PostMapping("/roleCount")
+ public AjaxResult roleCount()
+ {
+ int all = roleService.selectCount(null);
+ int normal = roleService.selectCount(0);
+ int stop = roleService.selectCount(1);
+
+ Map<String,Integer> map = new HashMap<>();
+ map.put("all",all);
+ map.put("normal",normal);
+ map.put("stop",stop);
+ return AjaxResult.success(map);
+ }
+
+// @Log(title = "角色管理", businessType = BusinessType.EXPORT)
+// // @PreAuthorize("@ss.hasPermi('system:role:export')")
+// @PostMapping("/export")
+// public void export(HttpServletResponse response, SysRole role)
+// {
+// List<SysRole> list = roleService.selectRoleList(role);
+// ExcelUtil<SysRole> util = new ExcelUtil<SysRole>(SysRole.class);
+// util.exportExcel(response, list, "角色数据");
+// }
+
+ /**
+ * 根据角色编号获取详细信息
+ */
+ @PreAuthorize("@ss.hasPermi('system:role:query')")
+ @GetMapping(value = "/{roleId}")
+ public AjaxResult getInfo(@PathVariable Long roleId)
+ {
+ roleService.checkRoleDataScope(roleId);
+ return AjaxResult.success(roleService.selectRoleById(roleId));
+ }
+
+// @PreAuthorize("@ss.hasPermi('system:role:detail')")
+ @ApiOperation("角色详情")
+ @GetMapping("/roleInfo")
+ public AjaxResult roleInfo(@RequestParam Long roleId)
+ {
+ SysRole role = roleService.selectRoleById(roleId);
+ RoleInfoVO roleInfoVo = new RoleInfoVO();
+ roleInfoVo.setRoleId(role.getRoleId());
+ roleInfoVo.setRoleName(role.getRoleName());
+
+ // 获取当前角色的菜单列表
+ List<SysMenu> menus = menuService.selectListByRoleId(roleId);
+ if(menus.size()==0){
+ return AjaxResult.success(new ArrayList<>());
+ }
+ List<Long> menusId = menus.stream().map(SysMenu::getMenuId).collect(Collectors.toList());
+
+ // 获取当前的权限菜单(有层级)
+ List<SysMenu> levelMenus = roleService.getMenuLevelList(menusId);
+
+ roleInfoVo.setMenus(menusId);
+ return AjaxResult.success(roleInfoVo);
+ }
+
+
+ @ApiOperation("用户获取权限菜单")
+ @GetMapping("/roleInfoFromUserId")
+ public AjaxResult roleInfoFromUserId(@RequestParam Long userId)
+ {
+ return AjaxResult.success(roleService.roleInfoFromUserId(userId));
+ }
+
+
+ /**
+ * 新增角色
+ */
+ @PreAuthorize("@ss.hasPermi('system:role:add')")
+ @ApiOperation(value = "新增角色")
+ @Log(title = "角色信息-新增角色", businessType = BusinessType.INSERT)
+ @PostMapping("/add")
+ public AjaxResult add(@Validated @RequestBody SysRoleDTO dto)
+ {
+ Boolean flag= roleService.isExit(dto.getRoleId(),dto.getRoleName());
+ if(flag){
+ return error("新增角色'" + dto.getRoleName() + "'失败，角色名称已存在");
+ }
+ roleService.saveRole(dto);
+ return AjaxResult.success();
+
+ }
+
+ /**
+ * 修改保存角色
+ */
+ @PreAuthorize("@ss.hasPermi('system:role:edit')")
+ @ApiOperation(value = "编辑角色")
+ @Log(title = "角色信息-编辑角色", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@Validated @RequestBody SysRoleDTO dto)
+ {
+ Boolean flag= roleService.isExit(dto.getRoleId(),dto.getRoleName());
+ if (flag){
+ return error("修改角色'" + dto.getRoleName() + "'失败，角色名称已存在");
+ }
+ if (roleService.editRole(dto) > 0)
+ {
+ // 更新缓存用户权限
+ LoginUser loginUser = getLoginUser();
+ if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin())
+ {
+ loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
+ loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
+ tokenService.setLoginUser(loginUser);
+ }
+ return AjaxResult.success();
+ }
+ return error("修改角色'" + dto.getRoleName() + "'失败，请联系管理员");
+ }
+
+ /**
+ * 修改保存数据权限
+ */
+ // @PreAuthorize("@ss.hasPermi('system:role:edit')")
+ @Log(title = "角色管理", businessType = BusinessType.UPDATE)
+ @PutMapping("/dataScope")
+ public AjaxResult dataScope(@RequestBody SysRole role)
+ {
+ roleService.checkRoleAllowed(role);
+ roleService.checkRoleDataScope(role.getRoleId());
+ return AjaxResult.success(roleService.authDataScope(role));
+ }
+
+ /**
+ * 状态修改
+ */
+ // @PreAuthorize("@ss.hasPermi('system:role:edit')")
+ @ApiOperation(value = "状态修改")
+ @Log(title = "角色信息-角色状态修改", businessType = BusinessType.UPDATE)
+ @PutMapping("/changeStatus")
+ public AjaxResult changeStatus(@RequestBody SysRole role)
+ {
+ role.setUpdateBy(getUsername());
+ roleService.updateStatus(role);
+ return AjaxResult.success();
+ }
+
+ /**
+ * 删除角色
+ */
+ // @PreAuthorize("@ss.hasPermi('system:role:remove')")
+ @ApiOperation(value = "删除角色")
+ @Log(title = "角色信息-角色删除角色", businessType = BusinessType.DELETE)
+ @DeleteMapping("/deleteById/{ids}")
+ public AjaxResult remove(@PathVariable String ids)
+ {
+ String[] split = ids.split(",");
+ List<Long> id = new ArrayList<>();
+ for (String s : split) {
+ id.add(Long.valueOf(s));
+ }
+ return AjaxResult.success(roleService.deleteRoleByIds(id));
+ }
+
+ /**
+ * 获取角色选择框列表
+ */
+ // @PreAuthorize("@ss.hasPermi('system:role:query')")
+ @GetMapping("/optionselect")
+ public AjaxResult optionselect()
+ {
+ return AjaxResult.success(roleService.selectRoleAll());
+ }
+
+ /**
+ * 查询已分配用户角色列表
+ */
+ // @PreAuthorize("@ss.hasPermi('system:role:list')")
+ @GetMapping("/authUser/allocatedList")
+ public TableDataInfo allocatedList(SysUser user)
+ {
+// startPage();
+ List<SysUser> list = userService.selectAllocatedList(user);
+ return getDataTable(list);
+ }
+
+ /**
+ * 查询未分配用户角色列表
+ */
+ // @PreAuthorize("@ss.hasPermi('system:role:list')")
+ @GetMapping("/authUser/unallocatedList")
+ public TableDataInfo unallocatedList(SysUser user)
+ {
+// startPage();
+ List<SysUser> list = userService.selectUnallocatedList(user);
+ return getDataTable(list);
+ }
+
+ /**
+ * 取消授权用户
+ */
+ // @PreAuthorize("@ss.hasPermi('system:role:edit')")
+ @Log(title = "角色管理", businessType = BusinessType.GRANT)
+ @PutMapping("/authUser/cancel")
+ public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole)
+ {
+ return AjaxResult.success(roleService.deleteAuthUser(userRole));
+ }
+
+ /**
+ * 批量取消授权用户
+ */
+ // @PreAuthorize("@ss.hasPermi('system:role:edit')")
+ @Log(title = "角色管理", businessType = BusinessType.GRANT)
+ @PutMapping("/authUser/cancelAll")
+ public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds)
+ {
+ return AjaxResult.success(roleService.deleteAuthUsers(roleId, userIds));
+ }
+
+ /**
+ * 批量选择用户授权
+ */
+ // @PreAuthorize("@ss.hasPermi('system:role:edit')")
+ @Log(title = "角色管理", businessType = BusinessType.GRANT)
+ @PutMapping("/authUser/selectAll")
+ public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds)
+ {
+ roleService.checkRoleDataScope(roleId);
+ return AjaxResult.success(roleService.insertAuthUsers(roleId, userIds));
+ }
+
+ /**
+ * 获取对应角色部门树列表
+ */
+ // @PreAuthorize("@ss.hasPermi('system:role:query')")
+ @GetMapping(value = "/deptTree/{roleId}")
+ public AjaxResult deptTree(@PathVariable("roleId") Long roleId)
+ {
+ AjaxResult ajax = AjaxResult.success();
+ ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
+ ajax.put("depts", deptService.selectDeptTreeList(new SysDept()));
+ return ajax;
+ }
+}
--
Gitblit v1.7.1