From fc6c9e4d74bcba3836b684a7a73927d9aeca3927 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 14 二月 2024 19:25:52 +0800
Subject: [PATCH] #

---
 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java |   73 ++++++++++++++++++++++++++++++++++--
 1 files changed, 69 insertions(+), 4 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 00bfda1..e64ed8a 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,8 +1,11 @@
 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;
@@ -24,9 +27,71 @@
     @PreAuthorize("hasAuthority('sys:role:list')")
     @OperationLog
     @PostMapping("/role/page")
-    public R updateInfo(@RequestBody PageParam param) {
-        List<Role> list = roleService.list();
-        return R.ok().add(list);
+    public R page(@RequestBody BaseParam param) {
+        PageParam<Role, BaseParam> page = new PageParam<>(param);
+        return R.ok().add(roleService.page(page, page.getWrapper()));
+    }
+
+    @PreAuthorize("hasAuthority('sys:role:list')")
+    @OperationLog
+    @PostMapping("/role/list")
+    public R list(@RequestBody BaseParam param) {
+        return R.ok().add(roleService.list());
+    }
+
+    @PreAuthorize("hasAuthority('sys:role:list')")
+    @OperationLog
+    @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")
+    public R remove(@RequestBody List<Long> ids) {
+        if (!roleService.removeByIds(ids)) {
+            return R.error("鍒犻櫎澶辫触");
+        }
+        return R.ok("鍒犻櫎鎴愬姛");
     }
 
 }

--
Gitblit v1.9.1