From f386cde7f06d6148595b9c07b5bb37433c9c5b87 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 16 二月 2024 22:07:36 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java | 43 +++++++++++++++++++++++++++++++++----------
1 files changed, 33 insertions(+), 10 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 e64ed8a..84dc46c 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,10 +1,12 @@
package com.zy.asrs.wcs.sys.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.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.sys.entity.Role;
import com.zy.asrs.wcs.sys.service.RoleService;
@@ -12,7 +14,10 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
+import java.util.Map;
/**
* Created by vincent on 2/13/2024
@@ -25,22 +30,20 @@
private RoleService roleService;
@PreAuthorize("hasAuthority('sys:role:list')")
- @OperationLog
@PostMapping("/role/page")
- public R page(@RequestBody BaseParam param) {
- PageParam<Role, BaseParam> page = new PageParam<>(param);
- return R.ok().add(roleService.page(page, page.getWrapper()));
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<Role, BaseParam> pageParam = new PageParam<>(baseParam, Role.class);
+ return R.ok().add(roleService.page(pageParam, pageParam.buildWrapper()));
}
@PreAuthorize("hasAuthority('sys:role:list')")
- @OperationLog
@PostMapping("/role/list")
- public R list(@RequestBody BaseParam param) {
+ public R list(@RequestBody Map<String, Object> map) {
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));
@@ -86,12 +89,32 @@
@PreAuthorize("hasAuthority('sys:role:remove')")
@OperationLog("鍒犻櫎瑙掕壊")
- @PostMapping("/role/remove")
- public R remove(@RequestBody List<Long> ids) {
- if (!roleService.removeByIds(ids)) {
+ @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/query")
+ public R query(@RequestParam(required = false) String condition) {
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<Role> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(Role::getName, condition);
+ }
+ roleService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
+ item -> vos.add(new KeyValVo(item.getId(), item.getName()))
+ );
+ return R.ok().add(vos);
+ }
+
+ @PreAuthorize("hasAuthority('sys:role:list')")
+ @PostMapping("/role/export")
+ public R export(@RequestBody Role role) {
+ return R.ok("瀵煎嚭鎴愬姛");
+ }
+
}
--
Gitblit v1.9.1