From 82de5a307466894bbb0258f8a63a26a7bb96d80d Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 16 十月 2025 09:55:35 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/system/controller/RoleController.java | 49 +++++++++++++++++++++++++------------------------
1 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/zy/system/controller/RoleController.java b/src/main/java/com/zy/system/controller/RoleController.java
index d47e3bf..4ec64ba 100644
--- a/src/main/java/com/zy/system/controller/RoleController.java
+++ b/src/main/java/com/zy/system/controller/RoleController.java
@@ -3,13 +3,13 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.zy.common.web.BaseController;
-import com.zy.system.entity.Role;
-import com.zy.system.service.RoleService;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.common.web.BaseController;
+import com.zy.system.entity.Role;
+import com.zy.system.service.RoleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -29,11 +29,11 @@
@RequestMapping(value = "/role/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<Role> wrapper = new EntityWrapper<>();
convert(param, wrapper);
@@ -61,14 +61,15 @@
return R.ok(roleService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
- if (entry.getKey().endsWith(">")) {
- wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
- } else if (entry.getKey().endsWith("<")) {
- wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)) {
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
+ wrapper.like(entry.getKey(), val);
}
}
}
@@ -76,10 +77,10 @@
@RequestMapping(value = "/role/edit/auth")
@ManagerAuth(memo = "瑙掕壊缂栬緫")
public R edit(Role role) {
- if (Cools.isEmpty(role)){
+ if (Cools.isEmpty(role)) {
return R.error();
}
- if (null == role.getId()){
+ if (null == role.getId()) {
roleService.insert(role);
} else {
roleService.updateById(role);
@@ -94,10 +95,10 @@
return R.ok();
}
- @RequestMapping(value = "/role/update/auth")
+ @RequestMapping(value = "/role/update/auth")
@ManagerAuth(memo = "瑙掕壊淇敼")
- public R update(Role role){
- if (Cools.isEmpty(role) || null==role.getId()){
+ public R update(Role role) {
+ if (Cools.isEmpty(role) || null == role.getId()) {
return R.error();
}
roleService.updateById(role);
@@ -106,8 +107,8 @@
@RequestMapping(value = "/role/delete/auth")
@ManagerAuth(memo = "瑙掕壊鍒犻櫎")
- public R delete(Integer[] ids){
- if (Cools.isEmpty(ids)){
+ public R delete(Integer[] ids) {
+ if (Cools.isEmpty(ids)) {
return R.error();
}
roleService.deleteBatchIds(Arrays.asList(ids));
@@ -116,7 +117,7 @@
@RequestMapping(value = "/role/export/auth")
@ManagerAuth(memo = "瑙掕壊瀵煎嚭")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<Role> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("role"));
@@ -151,7 +152,7 @@
Page<Role> page = roleService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (Role role : page.getRecords()){
+ for (Role role : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", role.getId());
map.put("value", role.getName());
--
Gitblit v1.9.1