From c50e176c4a6b9331d2d1c0520bafb18f54f0dee6 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 08 三月 2024 17:35:10 +0800
Subject: [PATCH] 部门增加管理员
---
src/main/java/com/mindskip/xzs/controller/admin/UserController.java | 77 +++++++++++++++++++++++++++++++++++++-
1 files changed, 75 insertions(+), 2 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 2c151d7..cb8aad7 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
@@ -2,14 +2,21 @@
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.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.utility.DateTimeUtil;
+import com.mindskip.xzs.utility.convert.UserClassConvert;
+import com.mindskip.xzs.utility.excel.ExcelUtils;
import com.mindskip.xzs.viewmodel.admin.user.*;
import com.mindskip.xzs.utility.PageInfoHelper;
import com.github.pagehelper.PageInfo;
@@ -17,11 +24,13 @@
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.Date;
import java.util.List;
import java.util.UUID;
+import java.util.stream.Collectors;
@RestController("AdminUserController")
@@ -31,19 +40,37 @@
private final UserService userService;
private final UserEventLogService userEventLogService;
private final AuthenticationService authenticationService;
+ private final DepartmentService departmentService;
+ private final UserDepartmentMapper userDepartmentMapper;
@Autowired
- public UserController(UserService userService, UserEventLogService userEventLogService, AuthenticationService authenticationService) {
+ public UserController(UserService userService, UserEventLogService userEventLogService, AuthenticationService authenticationService, DepartmentService departmentService, UserDepartmentMapper userDepartmentMapper) {
this.userService = userService;
this.userEventLogService = userEventLogService;
this.authenticationService = authenticationService;
+ this.departmentService = departmentService;
+ this.userDepartmentMapper = userDepartmentMapper;
}
@RequestMapping(value = "/page/list", method = RequestMethod.POST)
public RestResponse<PageInfo<UserResponseVM>> pageList(@RequestBody UserPageRequestVM model) {
PageInfo<User> pageInfo = userService.userPage(model);
- PageInfo<UserResponseVM> page = PageInfoHelper.copyMap(pageInfo, d -> UserResponseVM.from(d));
+ PageInfo<UserResponseVM> page = PageInfoHelper.copyMap(pageInfo, d ->
+ UserResponseVM.from(d));
+ page.setList(page.getList().stream().map(e->{
+ List<UserDepartment> userDepartments = userDepartmentMapper.selectByUserId(e.getId());
+ String deptIds = "";
+ for (UserDepartment userDepartment : userDepartments) {
+ Department byId = departmentService.getById(userDepartment.getDepartmentId());
+ if(byId != null){
+ deptIds = deptIds + byId.getName();
+ break;
+ }
+ }
+ e.setDeptNames(deptIds);
+ return e;
+ }).collect(Collectors.toList()));
return RestResponse.ok(page);
}
@@ -63,6 +90,12 @@
public RestResponse<UserResponseVM> select(@PathVariable Integer id) {
User user = userService.getUserById(id);
UserResponseVM userVm = UserResponseVM.from(user);
+ List<UserDepartment> userDepartments = userDepartmentMapper.selectByUserId(user.getId());
+ String deptIds = "";
+ for (UserDepartment userDepartment : userDepartments) {
+ deptIds = deptIds + userDepartment.getDepartmentId().toString() + ",";
+ }
+ userVm.setDeptIds(deptIds.equals("") ? "" : deptIds.substring(0,deptIds.length()-1));
return RestResponse.ok(userVm);
}
@@ -107,6 +140,14 @@
user.setModifyTime(new Date());
userService.updateByIdFilter(user);
}
+ userDepartmentMapper.removeByUserId(user.getId());
+ for (String s : model.getDeptIds().split(",")) {
+ UserDepartment userDepartment = new UserDepartment();
+ userDepartment.setUserId(user.getId());
+ userDepartment.setDepartmentId(Integer.parseInt(s));
+ userDepartmentMapper.insert(userDepartment);
+ }
+ user.setDeptIds(model.getDeptIds());
return RestResponse.ok(user);
}
@@ -148,4 +189,36 @@
return RestResponse.ok(keyValues);
}
+ @PostMapping("/import")
+ public RestResponse importUser(@RequestPart("file") MultipartFile file) throws Exception {
+ List<UserVO> userVOS = ExcelUtils.readMultipartFile(file, UserVO.class)
+ .stream().map(e -> {
+ e.setUserLevel(departmentService.getName(e.getDepartment()).getId());
+ String encodePwd = authenticationService.pwdEncode(e.getPassword());
+ e.setPassword(encodePwd);
+ e.setUserUuid(UUID.randomUUID().toString());
+ e.setCreateTime(new Date());
+ e.setLastActiveTime(new Date());
+ e.setDeleted(false);
+ e.setAge(null);
+ return e;
+ }).collect(Collectors.toList());
+ List<User> users = UserClassConvert.INSTANCE.UserVOListToUserList(userVOS);
+ userService.insertUsers(users);
+ return RestResponse.ok();
+ }
+
+ @RequestMapping(value = "/conversion", method = RequestMethod.GET)
+ public RestResponse conversion() {
+ List<User> users = userService.getUsers();
+ for (User user : users) {
+ UserDepartment userDepartment = new UserDepartment();
+ userDepartment.setUserId(user.getId());
+ userDepartment.setDepartmentId(user.getUserLevel());
+ userDepartmentMapper.insert(userDepartment);
+ }
+
+ return RestResponse.ok();
+ }
+
}
--
Gitblit v1.8.0