From ccca8c65b3c76a9021a471a3667d61d965a4f2cb Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 11 五月 2024 18:04:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mindskip/xzs/controller/admin/UserController.java | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/controller/admin/UserController.java b/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
index cb8aad7..623b48d 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
@@ -2,18 +2,12 @@
import com.mindskip.xzs.base.BaseApiController;
import com.mindskip.xzs.base.RestResponse;
-import com.mindskip.xzs.domain.Department;
-import com.mindskip.xzs.domain.UserDepartment;
+import com.mindskip.xzs.domain.*;
import com.mindskip.xzs.domain.other.KeyValue;
-import com.mindskip.xzs.domain.User;
-import com.mindskip.xzs.domain.UserEventLog;
import com.mindskip.xzs.domain.enums.UserStatusEnum;
import com.mindskip.xzs.domain.vo.UserVO;
import com.mindskip.xzs.repository.UserDepartmentMapper;
-import com.mindskip.xzs.service.AuthenticationService;
-import com.mindskip.xzs.service.DepartmentService;
-import com.mindskip.xzs.service.UserEventLogService;
-import com.mindskip.xzs.service.UserService;
+import com.mindskip.xzs.service.*;
import com.mindskip.xzs.utility.DateTimeUtil;
import com.mindskip.xzs.utility.convert.UserClassConvert;
import com.mindskip.xzs.utility.excel.ExcelUtils;
@@ -21,12 +15,14 @@
import com.mindskip.xzs.utility.PageInfoHelper;
import com.github.pagehelper.PageInfo;
+import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.validation.Valid;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.UUID;
@@ -42,14 +38,16 @@
private final AuthenticationService authenticationService;
private final DepartmentService departmentService;
private final UserDepartmentMapper userDepartmentMapper;
+ private final TagService tagService;
@Autowired
- public UserController(UserService userService, UserEventLogService userEventLogService, AuthenticationService authenticationService, DepartmentService departmentService, UserDepartmentMapper userDepartmentMapper) {
+ public UserController(UserService userService, UserEventLogService userEventLogService, AuthenticationService authenticationService, DepartmentService departmentService, UserDepartmentMapper userDepartmentMapper, TagService tagService) {
this.userService = userService;
this.userEventLogService = userEventLogService;
this.authenticationService = authenticationService;
this.departmentService = departmentService;
this.userDepartmentMapper = userDepartmentMapper;
+ this.tagService = tagService;
}
@@ -69,6 +67,7 @@
}
}
e.setDeptNames(deptIds);
+ e.setTagNames(tagService.selectTagNamesByUserId(e.getId()));
return e;
}).collect(Collectors.toList()));
return RestResponse.ok(page);
@@ -96,6 +95,7 @@
deptIds = deptIds + userDepartment.getDepartmentId().toString() + ",";
}
userVm.setDeptIds(deptIds.equals("") ? "" : deptIds.substring(0,deptIds.length()-1));
+ userVm.setTagIds(tagService.selectTagIdsByUserId(user.getId()));
return RestResponse.ok(userVm);
}
@@ -147,6 +147,15 @@
userDepartment.setDepartmentId(Integer.parseInt(s));
userDepartmentMapper.insert(userDepartment);
}
+ if (ObjectUtils.isNotEmpty(model.getTagIds())) {
+ tagService.removeUserTagByUserId(user.getId());
+ tagService.saveBatchUserTag(model.getTagIds().stream().map(
+ tagId -> new UserTag() {{
+ setUserId(user.getId());
+ setTagId(tagId);
+ }}
+ ).collect(Collectors.toList()));
+ }
user.setDeptIds(model.getDeptIds());
return RestResponse.ok(user);
}
@@ -164,7 +173,7 @@
@RequestMapping(value = "/changeStatus/{id}", method = RequestMethod.POST)
public RestResponse<Integer> changeStatus(@PathVariable Integer id) {
- User user = userService.getUserById(id);
+ User user = userService.selectById(id);
UserStatusEnum userStatusEnum = UserStatusEnum.fromCode(user.getStatus());
Integer newStatus = userStatusEnum == UserStatusEnum.Enable ? UserStatusEnum.Disable.getCode() : UserStatusEnum.Enable.getCode();
user.setStatus(newStatus);
@@ -221,4 +230,10 @@
return RestResponse.ok();
}
+ @RequestMapping(value = "/setStatus", method = RequestMethod.POST)
+ public RestResponse<String> setStatus(@RequestBody UserVO user) {
+ userService.setStatus(user);
+ return RestResponse.ok("鎿嶄綔鎴愬姛");
+ }
+
}
--
Gitblit v1.8.0