From 02eb9d41eb2f201ce18d8481f56d82fb89641d42 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 16 二月 2024 20:54:15 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java | 83 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 76 insertions(+), 7 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java
index ac71c19..36bba78 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java
@@ -1,15 +1,19 @@
package com.zy.asrs.wcs.sys.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.wcs.common.annotation.OperationLog;
-import com.zy.asrs.wcs.sys.controller.param.PageParam;
+import com.zy.asrs.wcs.common.domain.BaseParam;
+import com.zy.asrs.wcs.common.domain.PageParam;
import com.zy.asrs.wcs.sys.entity.Role;
import com.zy.asrs.wcs.sys.service.RoleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import java.util.List;
+import java.util.Arrays;
+import java.util.Map;
/**
* Created by vincent on 2/13/2024
@@ -22,12 +26,77 @@
private RoleService roleService;
@PreAuthorize("hasAuthority('sys:role:list')")
- @OperationLog
@PostMapping("/role/page")
- public R updateInfo(@RequestBody PageParam param) {
- System.out.println(param.get("condition"));
- List<Role> list = roleService.list();
- return R.ok().add(list);
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<Role, BaseParam> pageParam = new PageParam<>(baseParam);
+ return R.ok().add(roleService.page(pageParam, pageParam.buildWrapper()));
+ }
+
+ @PreAuthorize("hasAuthority('sys:role:list')")
+ @PostMapping("/role/list")
+ public R list(@RequestBody BaseParam param) {
+ return R.ok().add(roleService.list());
+ }
+
+ @PreAuthorize("hasAuthority('sys:role:list')")
+ @GetMapping("/role/{id}")
+ public R get(@PathVariable("id") Long id) {
+ return R.ok().add(roleService.getById(id));
+ }
+
+ @PreAuthorize("hasAuthority('sys:role:save')")
+ @OperationLog("娣诲姞瑙掕壊")
+ @PostMapping("/role/save")
+ public R save(@RequestBody Role role) {
+ if (!Cools.isEmpty(role.getName())
+ && roleService.count(new LambdaQueryWrapper<Role>().eq(Role::getName, role.getName())) > 0) {
+ return R.error("瑙掕壊鍚嶇О宸插瓨鍦�");
+ }
+ if (!Cools.isEmpty(role.getCode())
+ && roleService.count(new LambdaQueryWrapper<Role>().eq(Role::getCode, role.getCode())) > 0) {
+ return R.error("瑙掕壊鏍囪瘑宸插瓨鍦�");
+ }
+ if (!roleService.save(role)) {
+ return R.error("娣诲姞澶辫触");
+ }
+ return R.ok("娣诲姞鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('sys:role:update')")
+ @OperationLog("淇敼瑙掕壊")
+ @PostMapping("/role/update")
+ public R update(@RequestBody Role role) {
+ if (!Cools.isEmpty(role.getCode()) && roleService.count(new LambdaQueryWrapper<Role>()
+ .eq(Role::getCode, role.getCode())
+ .ne(Role::getId, role.getId())) > 0) {
+ return R.error("瑙掕壊鏍囪瘑宸插瓨鍦�");
+ }
+ if (!Cools.isEmpty(role.getName()) && roleService.count(new LambdaQueryWrapper<Role>()
+ .eq(Role::getName, role.getName())
+ .ne(Role::getId, role.getId())) > 0) {
+ return R.error("瑙掕壊鍚嶇О宸插瓨鍦�");
+ }
+ if (!roleService.updateById(role)) {
+ return R.error("淇敼澶辫触");
+ }
+ return R.ok("淇敼鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('sys:role:remove')")
+ @OperationLog("鍒犻櫎瑙掕壊")
+ @PostMapping("/role/remove/{ids}")
+ public R remove(@PathVariable Long[] ids) {
+ if (!roleService.removeByIds(Arrays.asList(ids))) {
+ return R.error("鍒犻櫎澶辫触");
+ }
+ return R.ok("鍒犻櫎鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('sys:role:list')")
+ @PostMapping("/role/export")
+ public R export(@RequestBody Role role) {
+ return R.ok("瀵煎嚭鎴愬姛");
}
}
--
Gitblit v1.9.1