From 47cd9ecc0eff38ffe6b3b794b2bf197e958f4403 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 14 五月 2025 15:50:57 +0800
Subject: [PATCH] bug：学员有状态不能修改问题
---
src/main/java/com/mindskip/xzs/controller/admin/UserController.java | 131 +++++++++++++++++++++++++++++++++++++------
1 files changed, 113 insertions(+), 18 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..a645248 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
@@ -1,27 +1,28 @@
package com.mindskip.xzs.controller.admin;
+import com.github.pagehelper.PageInfo;
import com.mindskip.xzs.base.BaseApiController;
import com.mindskip.xzs.base.RestResponse;
-import com.mindskip.xzs.domain.other.KeyValue;
-import com.mindskip.xzs.domain.User;
-import com.mindskip.xzs.domain.UserEventLog;
+import com.mindskip.xzs.domain.*;
import com.mindskip.xzs.domain.enums.UserStatusEnum;
-import com.mindskip.xzs.service.AuthenticationService;
-import com.mindskip.xzs.service.UserEventLogService;
-import com.mindskip.xzs.service.UserService;
+import com.mindskip.xzs.domain.other.KeyValue;
+import com.mindskip.xzs.domain.vo.UserVO;
+import com.mindskip.xzs.repository.UserDepartmentMapper;
+import com.mindskip.xzs.service.*;
import com.mindskip.xzs.utility.DateTimeUtil;
-import com.mindskip.xzs.viewmodel.admin.user.*;
import com.mindskip.xzs.utility.PageInfoHelper;
-import com.github.pagehelper.PageInfo;
-
+import com.mindskip.xzs.utility.convert.UserClassConvert;
+import com.mindskip.xzs.utility.excel.ExcelUtils;
+import com.mindskip.xzs.viewmodel.admin.user.*;
+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.Date;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
+import java.util.stream.Collectors;
@RestController("AdminUserController")
@@ -31,19 +32,39 @@
private final UserService userService;
private final UserEventLogService userEventLogService;
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) {
+ 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;
}
@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));
+ model.setDepartmentId(ObjectUtils.isNotEmpty(model.getDepartmentId()) ? model.getDepartmentId() : getAdminDeptIds());
+ PageInfo<UserResponseVM> page = userService.userPage(model);
+ page.setList(page.getList().stream().map(e->{
+ List<UserDepartment> userDepartments = userDepartmentMapper.selectByUserId(e.getId());
+ List<Department> list = new ArrayList<>();
+ for (UserDepartment userDepartment : userDepartments) {
+ Department byId = departmentService.getById(userDepartment.getDepartmentId());
+ if (ObjectUtils.isNotEmpty(byId)) {
+ list.add(byId);
+ }
+ }
+ e.setDeptNames(StringUtils.join(list.stream().map(Department::getName).collect(Collectors.toList()), ","));
+ e.setDeptIdList(list.stream().map(Department::getId).collect(Collectors.toList()));
+ e.setTagNames(tagService.selectTagNamesByUserId(e.getId()));
+ return e;
+ }).collect(Collectors.toList()));
return RestResponse.ok(page);
}
@@ -61,8 +82,16 @@
@RequestMapping(value = "/select/{id}", method = RequestMethod.POST)
public RestResponse<UserResponseVM> select(@PathVariable Integer id) {
- User user = userService.getUserById(id);
+ User user = userService.getUserInfoById(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));
+ userVm.setTagIds(tagService.selectTagIdsByUserId(user.getId()));
+ userVm.setPassword(authenticationService.pwdDecode(user.getPassword()));
return RestResponse.ok(userVm);
}
@@ -107,6 +136,30 @@
user.setModifyTime(new Date());
userService.updateByIdFilter(user);
}
+ Map<Integer, UserDepartment> oldDeptUser = userDepartmentMapper.selectByUserId(user.getId()).stream().collect(Collectors.toMap(UserDepartment::getDepartmentId, userDept -> userDept));
+ userDepartmentMapper.removeByUserId(user.getId());
+ if (ObjectUtils.isNotEmpty(model.getDeptIds())) {
+ for (Integer s : model.getDeptIds()) {
+ UserDepartment userDepartment = new UserDepartment();
+ userDepartment.setUserId(user.getId());
+ userDepartment.setDepartmentId(s);
+ if (Objects.nonNull(oldDeptUser.get(s))) {
+ userDepartment.setDeptAdmin(oldDeptUser.get(s).getDeptAdmin());
+ } else {
+ userDepartment.setDeptAdmin("0");
+ }
+ userDepartmentMapper.insert(userDepartment);
+ }
+ }
+ tagService.removeUserTagByUserId(user.getId());
+ if (ObjectUtils.isNotEmpty(model.getTagIds())) {
+ tagService.saveBatchUserTag(model.getTagIds().stream().map(
+ tagId -> new UserTag() {{
+ setUserId(user.getId());
+ setTagId(tagId);
+ }}
+ ).collect(Collectors.toList()));
+ }
return RestResponse.ok(user);
}
@@ -123,7 +176,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);
@@ -135,7 +188,7 @@
@RequestMapping(value = "/delete/{id}", method = RequestMethod.POST)
public RestResponse delete(@PathVariable Integer id) {
- User user = userService.getUserById(id);
+ User user = userService.getUserInfoById(id);
user.setDeleted(true);
userService.updateByIdFilter(user);
return RestResponse.ok();
@@ -148,4 +201,46 @@
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();
+ }
+
+ @GetMapping("/getFailExamUser/{examPaperId}")
+ public RestResponse<List<User>> getFailExamUser(@PathVariable Integer examPaperId) {
+ return RestResponse.ok(userService.getFailExamUser(examPaperId));
+ }
+
+ @GetMapping("/getFailTemplateUser/{templateId}")
+ public RestResponse<List<User>> getFailTemplateUser(@PathVariable Integer templateId) {
+ return RestResponse.ok(userService.getFailTemplateUser(templateId));
+ }
+
}
--
Gitblit v1.8.0