From abfd32608966243794c4fa8834cacec7f0fec489 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 22 二月 2024 14:07:04 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/RoleController.java | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/RoleController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/RoleController.java
index 574cdd7..7907f50 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/RoleController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/RoleController.java
@@ -4,22 +4,23 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
+import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wcs.common.annotation.OperationLog;
import com.zy.asrs.wcs.common.domain.BaseParam;
import com.zy.asrs.wcs.common.domain.KeyValVo;
import com.zy.asrs.wcs.common.domain.PageParam;
import com.zy.asrs.wcs.system.entity.Role;
+import com.zy.asrs.wcs.system.entity.RoleMenu;
+import com.zy.asrs.wcs.system.service.RoleMenuService;
import com.zy.asrs.wcs.system.service.RoleService;
import com.zy.asrs.wcs.utils.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* Created by vincent on 2/13/2024
@@ -30,6 +31,8 @@
@Autowired
private RoleService roleService;
+ @Autowired
+ private RoleMenuService roleMenuService;
@PreAuthorize("hasAuthority('system:role:list')")
@PostMapping("/role/page")
@@ -63,6 +66,8 @@
&& roleService.count(new LambdaQueryWrapper<Role>().eq(Role::getCode, role.getCode())) > 0) {
return R.error("瑙掕壊鏍囪瘑宸插瓨鍦�");
}
+ role.setCreateTime(new Date());
+ role.setUpdateTime(new Date());
if (!roleService.save(role)) {
return R.error("娣诲姞澶辫触");
}
@@ -83,6 +88,7 @@
.ne(Role::getId, role.getId())) > 0) {
return R.error("瑙掕壊鍚嶇О宸插瓨鍦�");
}
+ role.setUpdateTime(new Date());
if (!roleService.updateById(role)) {
return R.error("淇敼澶辫触");
}
@@ -92,9 +98,15 @@
@PreAuthorize("hasAuthority('system:role:remove')")
@OperationLog("鍒犻櫎瑙掕壊")
@PostMapping("/role/remove/{ids}")
+ @Transactional
public R remove(@PathVariable Long[] ids) {
- if (!roleService.removeByIds(Arrays.asList(ids))) {
- return R.error("鍒犻櫎澶辫触");
+ for (Long roleId : ids) {
+ if (!roleService.removeById(roleId)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
+ }
+ if (!roleMenuService.remove(new LambdaQueryWrapper<RoleMenu>().eq(RoleMenu::getRoleId, roleId))) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
+ }
}
return R.ok("鍒犻櫎鎴愬姛");
}
@@ -119,4 +131,14 @@
ExcelUtil.build(ExcelUtil.create(roleService.list(), Role.class), response);
}
+ @PreAuthorize("hasAuthority('system:role:update')")
+ @OperationLog("鍒嗛厤鏉冮檺")
+ @PostMapping("/role/scope")
+ public R scope(@RequestBody Role role) {
+
+
+
+ return R.ok("鍒嗛厤鎴愬姛");
+ }
+
}
--
Gitblit v1.9.1