From 91e4ba507f9806c975a4273154d79f1a43b836c4 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 29 四月 2024 13:42:29 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/controller/SysRoleController.java | 134 +++++++++++---------------------------------
1 files changed, 34 insertions(+), 100 deletions(-)
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/controller/SysRoleController.java b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/controller/SysRoleController.java
index 18ee6a6..cb6da80 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/controller/SysRoleController.java
+++ b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/controller/SysRoleController.java
@@ -1,129 +1,63 @@
package com.mes.role.controller;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mes.entity.request.GeneralRequest;
import com.mes.role.entity.SysRole;
-import com.mes.role.entity.SysRoleMenu;
-import com.mes.userinfo.entity.SysUserRole;
+import com.mes.role.entity.vo.SysRoleVO;
+import com.mes.role.service.SysRoleService;
import com.mes.utils.Result;
-import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
-import java.util.stream.Collectors;
/**
- * <p>
- * 瑙掕壊琛� 鍓嶇鎺у埗鍣�
- * </p>
- *
* @author zhoush
* @since 2024-04-11
*/
+@Api(description = "瑙掕壊绠＄悊")
@RestController
-@RequestMapping("/role/sys-role")
+@RequestMapping("/sys/role")
public class SysRoleController {
- @PreAuthorize("hasAuthority('sys:role:list')")
- @GetMapping("/info/{id}")
- public Result info(@PathVariable("id") Long id) {
- SysRole sysRole = sysRoleService.getById(id);
+ @Autowired
+ private SysRoleService sysRoleService;
- // 鑾峰彇瑙掕壊鐩稿叧鑱旂殑鑿滃崟id
- List<SysRoleMenu> roleMenus = sysRoleMenuService.list(new QueryWrapper<SysRoleMenu>().eq("role_id", id));
- List<Long> menuIds = roleMenus.stream().map(p -> p.getMenuId()).collect(Collectors.toList());
-
- sysRole.setMenuIds(menuIds);
- return Result.success(sysRole);
+ @ApiOperation("鏂板瑙掕壊鍙婅鑹蹭笅鐨勬潈闄愪俊鎭�")
+ @PostMapping("/saveRole")
+// @PreAuthorize("hasAuthority('sys:role:save')")
+ public Result<SysRole> saveRole(@Validated @RequestBody SysRoleVO sysRoleVO) {
+ return Result.success(sysRoleService.saveRole(sysRoleVO));
}
- @PreAuthorize("hasAuthority('sys:role:list')")
- @GetMapping("/list")
- public Result list(String name) {
-
- Page<SysRole> pageData = sysRoleService.page(getPage(),
- new QueryWrapper<SysRole>()
- .like(StrUtil.isNotBlank(name), "name", name)
- );
-
- return Result.success(pageData);
+ @ApiOperation("缂栬緫瑙掕壊鍙婅鑹蹭笅鐨勬潈闄愪俊鎭�")
+ @PostMapping("/updateRole")
+// @PreAuthorize("hasAuthority('sys:role:save')")
+ public Result<String> updateRole(@Validated @RequestBody SysRoleVO sysRoleVO) {
+ return Result.success(sysRoleService.updateRole(sysRoleVO));
}
- @PostMapping("/save")
- @PreAuthorize("hasAuthority('sys:role:save')")
- public Result save(@Validated @RequestBody SysRole sysRole) {
-
- sysRole.setCreated(LocalDateTime.now());
- sysRole.setStatu(Const.STATUS_ON);
-
- sysRoleService.save(sysRole);
- return Result.success(sysRole);
+ @ApiOperation("鏌ヨ瑙掕壊鍙婅鑹蹭笅鐨勬潈闄愪俊鎭�")
+ @PostMapping("/queryRole")
+// @PreAuthorize("hasAuthority('sys:role:save')")
+ public Result<List<SysRoleVO>> queryRole(@Validated @RequestBody GeneralRequest request) {
+ return Result.success(sysRoleService.queryRole(request));
}
- @PostMapping("/update")
- @PreAuthorize("hasAuthority('sys:role:update')")
- public Result update(@Validated @RequestBody SysRole sysRole) {
- sysRole.setUpdated(LocalDateTime.now());
-
- sysRoleService.updateById(sysRole);
-
- // 鏇存柊缂撳瓨
- sysUserService.clearUserAuthorityInfoByRoleId(sysRole.getId());
-
- return Result.success(sysRole);
- }
-
+ @ApiOperation("鍒犻櫎瑙掕壊鍙婅鑹蹭笅鐨勬潈闄愪俊鎭�")
@PostMapping("/delete")
- @PreAuthorize("hasAuthority('sys:role:delete')")
+// @PreAuthorize("hasAuthority('sys:role:delete')")
@Transactional
- public Result info(@RequestBody Long[] ids) {
-
- sysRoleService.removeByIds(Arrays.asList(ids));
-
- // 鍒犻櫎涓棿琛�
- sysUserRoleService.remove(new QueryWrapper<SysUserRole>().in("role_id", ids));
- sysRoleMenuService.remove(new QueryWrapper<SysRoleMenu>().in("role_id", ids));
-
- // 缂撳瓨鍚屾鍒犻櫎
- Arrays.stream(ids).forEach(id -> {
- // 鏇存柊缂撳瓨
- sysUserService.clearUserAuthorityInfoByRoleId(id);
- });
-
- return Result.success("");
+ public Result<String> deleteRole(@RequestBody List<Long> ids) {
+ return Result.success(sysRoleService.deleteRole(ids));
}
- @Transactional
- @PostMapping("/perm/{roleId}")
- @PreAuthorize("hasAuthority('sys:role:perm')")
- public Result info(@PathVariable("roleId") Long roleId, @RequestBody Long[] menuIds) {
-
- List<SysRoleMenu> sysRoleMenus = new ArrayList<>();
-
- Arrays.stream(menuIds).forEach(menuId -> {
- SysRoleMenu roleMenu = new SysRoleMenu();
- roleMenu.setMenuId(menuId);
- roleMenu.setRoleId(roleId);
-
- sysRoleMenus.add(roleMenu);
- });
-
- // 鍏堝垹闄ゅ師鏉ョ殑璁板綍锛屽啀淇濆瓨鏂扮殑
- sysRoleMenuService.remove(new QueryWrapper<SysRoleMenu>().eq("role_id", roleId));
- sysRoleMenuService.saveBatch(sysRoleMenus);
-
- // 鍒犻櫎缂撳瓨
- sysUserService.clearUserAuthorityInfoByRoleId(roleId);
-
- return Result.success(menuIds);
- }
-}
-
+}
\ No newline at end of file
--
Gitblit v1.8.0