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/UserController.java | 54 +++++++++++++++++++++++-------------------------------
1 files changed, 23 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/zy/system/controller/UserController.java b/src/main/java/com/zy/system/controller/UserController.java
index 3367332..f312cce 100644
--- a/src/main/java/com/zy/system/controller/UserController.java
+++ b/src/main/java/com/zy/system/controller/UserController.java
@@ -63,53 +63,46 @@
return R.ok(userService.selectPage(new Page<>(curr, limit), wrapper));
}
- public static void main(String[] args) {
- String s = "2020-06-11 00:00:00 - 2020-07-15 00:00:00";
- if (s.contains(" - ")) {
- String[] split = s.split(" - ");
- for (String s1 : split) {
- System.out.println(s1);
- }
- }
- }
-
- 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())));
- } else if (String.valueOf(entry.getValue()).contains(RANGE_TIME_LINK)){
- wrapper.ge(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 = "/user/edit/auth")
- @ManagerAuth(memo = "绯荤粺鐢ㄦ埛缂栬緫")
+ @ManagerAuth(memo = "response.user_edit")
public R edit(User user) {
if (Cools.isEmpty(user)){
return R.error();
}
if (null == user.getId()){
+ user.setStatus(1);
+ user.setCreateTime(new Date());
userService.insert(user);
} else {
userService.updateById(user);
}
- return R.ok();
+ return R.ok("response.user_status_update_success");
}
@RequestMapping(value = "/user/add/auth")
- @ManagerAuth(memo = "绯荤粺鐢ㄦ埛娣诲姞")
+ @ManagerAuth(memo = "response.user_add")
public R add(User user) {
+ user.setStatus(1);
+ user.setCreateTime(new Date());
userService.insert(user);
- return R.ok();
+ return R.ok("response.user_add_success");
}
@RequestMapping(value = "/user/update/auth")
- @ManagerAuth(memo = "绯荤粺鐢ㄦ埛淇敼")
+ @ManagerAuth(memo = "response.user_update")
public R update(User user){
if (Cools.isEmpty(user) || null==user.getId()){
return R.error();
@@ -125,21 +118,20 @@
entity.setMobile(user.getMobile());
}
userService.updateById(entity);
- return R.ok();
+ return R.ok("response.user_update_success");
}
@RequestMapping(value = "/user/delete/auth")
- @ManagerAuth(memo = "绯荤粺鐢ㄦ埛鍒犻櫎")
- public R delete(Integer[] ids){
- if (Cools.isEmpty(ids)){
- return R.error();
+ @ManagerAuth(memo = "response.user_delete")
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ userService.deleteById(id);
}
- userService.deleteBatchIds(Arrays.asList(ids));
- return R.ok();
+ return R.ok("response.user_delete_success");
}
@RequestMapping(value = "/user/export/auth")
- @ManagerAuth(memo = "绯荤粺鐢ㄦ埛瀵煎嚭")
+ @ManagerAuth(memo = "response.user_export")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<User> wrapper = new EntityWrapper<>();
--
Gitblit v1.9.1