青阳考试系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
龚焕茏
2024-05-22 c25d93c39975f84ca411da16b82ab556648a50e0 
 src/main/java/com/mindskip/xzs/controller/admin/UserController.java


@@ -1,32 +1,27 @@


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.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.*;


import com.mindskip.xzs.domain.enums.UserStatusEnum;


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.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.PageInfoHelper;


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;




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,33 +37,37 @@


    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;


    }






    @RequestMapping(value = "/page/list", method = RequestMethod.POST)


    public RestResponse<PageInfo<UserResponseVM>> pageList(@RequestBody UserPageRequestVM model) {


        model.setDepartmentId(ObjectUtils.isNotEmpty(model.getDepartmentId()) ? model.getDepartmentId() : getAdminDeptIds());


        PageInfo<User> pageInfo = userService.userPage(model);


        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 = "";


            List<Department> list = new ArrayList<>();


            for (UserDepartment userDepartment : userDepartments) {


                Department byId = departmentService.getById(userDepartment.getDepartmentId());


                if(byId != null){


                    deptIds = deptIds + byId.getName();


                    break;


                if (ObjectUtils.isNotEmpty(byId)) {


                    list.add(byId);


                }


            }


            e.setDeptNames(deptIds);


            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);


@@ -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);