From 7a99dc66a52651adffaa919fb03e73136986b775 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 29 七月 2025 13:44:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/system/controller/UserController.java | 46 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/system/controller/UserController.java b/src/main/java/com/zy/system/controller/UserController.java
index 33cefe4..1fc1f2d 100644
--- a/src/main/java/com/zy/system/controller/UserController.java
+++ b/src/main/java/com/zy/system/controller/UserController.java
@@ -63,14 +63,15 @@
return R.ok(userService.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);
}
}
}
@@ -82,6 +83,8 @@
return R.error();
}
if (null == user.getId()){
+ user.setStatus(1);
+ user.setCreateTime(new Date());
userService.insert(user);
} else {
userService.updateById(user);
@@ -92,6 +95,8 @@
@RequestMapping(value = "/user/add/auth")
@ManagerAuth(memo = "绯荤粺鐢ㄦ埛娣诲姞")
public R add(User user) {
+ user.setStatus(1);
+ user.setCreateTime(new Date());
userService.insert(user);
return R.ok();
}
@@ -112,17 +117,22 @@
if (user.getMobile()!=null) {
entity.setMobile(user.getMobile());
}
+ if(user.getRoleId() != null) {
+ entity.setRoleId(user.getRoleId());
+ }
+ if(user.getNickname()!=null) {
+ entity.setNickname(user.getNickname());
+ }
userService.updateById(entity);
return R.ok();
}
@RequestMapping(value = "/user/delete/auth")
@ManagerAuth(memo = "绯荤粺鐢ㄦ埛鍒犻櫎")
- public R delete(Integer[] ids){
- if (Cools.isEmpty(ids)){
- return R.error();
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ userService.deleteById(id);
}
- userService.deleteBatchIds(Arrays.asList(ids));
return R.ok();
}
@@ -153,4 +163,20 @@
return R.ok(result);
}
+ @RequestMapping(value = "/user/updateDefaultOutSta")
+ @ManagerAuth
+ public R updateDefaultOutSta(@RequestBody JSONObject param) {
+ User user = getUser();
+ user.setDefaultOutSta(param.getInteger("defaultOutSta"));
+ userService.updateById(user);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/user/getDefaultOutSta")
+ @ManagerAuth
+ public R getDefaultOutSta() {
+ User user = getUser();
+ return R.ok().add(user.getDefaultOutSta());
+ }
+
}
--
Gitblit v1.9.1