From d907a822a940c7ec0fb7de0ca845472bda52229b Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 03 二月 2026 14:33:12 +0800
Subject: [PATCH] #pda料箱组托和换码
---
src/main/java/com/zy/system/controller/RoleController.java | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 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..2e5b5f4 100644
--- a/src/main/java/com/zy/system/controller/RoleController.java
+++ b/src/main/java/com/zy/system/controller/RoleController.java
@@ -61,25 +61,27 @@
return R.ok(roleService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> 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())));
+ 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);
}
}
}
@RequestMapping(value = "/role/edit/auth")
- @ManagerAuth(memo = "瑙掕壊缂栬緫")
+ @ManagerAuth(memo = "response.role_edit")
public R edit(Role role) {
if (Cools.isEmpty(role)){
- return R.error();
+ return R.error("response.param_error");
}
if (null == role.getId()){
+ role.setCreateTime(new Date());
roleService.insert(role);
} else {
roleService.updateById(role);
@@ -88,34 +90,34 @@
}
@RequestMapping(value = "/role/add/auth")
- @ManagerAuth(memo = "瑙掕壊娣诲姞")
+ @ManagerAuth(memo = "response.role_add")
public R add(Role role) {
+ role.setCreateTime(new Date());
roleService.insert(role);
return R.ok();
}
@RequestMapping(value = "/role/update/auth")
- @ManagerAuth(memo = "瑙掕壊淇敼")
+ @ManagerAuth(memo = "response.role_update")
public R update(Role role){
if (Cools.isEmpty(role) || null==role.getId()){
- return R.error();
+ return R.error("response.param_error");
}
roleService.updateById(role);
return R.ok();
}
@RequestMapping(value = "/role/delete/auth")
- @ManagerAuth(memo = "瑙掕壊鍒犻櫎")
- public R delete(Integer[] ids){
- if (Cools.isEmpty(ids)){
- return R.error();
+ @ManagerAuth(memo = "response.role_delete")
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ roleService.deleteById(id);
}
- roleService.deleteBatchIds(Arrays.asList(ids));
return R.ok();
}
@RequestMapping(value = "/role/export/auth")
- @ManagerAuth(memo = "瑙掕壊瀵煎嚭")
+ @ManagerAuth(memo = "response.role_export")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<Role> wrapper = new EntityWrapper<>();
--
Gitblit v1.9.1