luohairen
2024-10-29 b005f8a8669cdea0f1738172d7c13da57a1237e2
src/main/java/com/ycl/jxkg/controller/admin/UserController.java
@@ -6,6 +6,8 @@
import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.base.SystemCode;
import com.ycl.jxkg.context.WebContext;
import com.ycl.jxkg.domain.entity.Classes;
import com.ycl.jxkg.domain.entity.SysConfig;
import com.ycl.jxkg.domain.entity.User;
import com.ycl.jxkg.domain.entity.UserEventLog;
import com.ycl.jxkg.domain.other.KeyValue;
@@ -13,9 +15,7 @@
import com.ycl.jxkg.domain.vo.admin.user.*;
import com.ycl.jxkg.enums.RoleEnum;
import com.ycl.jxkg.enums.UserStatusEnum;
import com.ycl.jxkg.service.AuthenticationService;
import com.ycl.jxkg.service.UserEventLogService;
import com.ycl.jxkg.service.UserService;
import com.ycl.jxkg.service.*;
import com.ycl.jxkg.utils.DateTimeUtil;
import com.ycl.jxkg.utils.PageInfoHelper;
import lombok.RequiredArgsConstructor;
@@ -40,8 +40,11 @@
    private final UserEventLogService userEventLogService;
    private final AuthenticationService authenticationService;
    private final WebContext webContext;
    private final ClassesUserService classesUserService;
    private final ClassesService classesService;
    private final Integer teacher = 2;
    private final Integer student = 1;
    @RequestMapping(value = "/page/list", method = RequestMethod.POST)
    public Result<PageInfo<UserResponseVO>> pageList(@RequestBody UserPageRequestVO model) {
        if(!student.equals(model.getRole())) {
@@ -52,6 +55,17 @@
        }
        PageInfo<User> pageInfo = userService.userPage(model);
        PageInfo<UserResponseVO> page = PageInfoHelper.copyMap(pageInfo, d -> UserResponseVO.from(d));
        // 找到每个用户对应的班级
        List<UserResponseVO> list = page.getList();
        list.stream().peek(item -> {
            List<Integer> classesIds = classesUserService.getByUserId(item.getId());
            List<String> classNames = classesIds.stream().map(classesId -> {
                Classes classes = classesService.getById(classesId);
                return classes.getClassName();
            }).collect(Collectors.toList());
            item.setClassName(classNames);
        }).collect(Collectors.toList());
        page.setList(list);
        return Result.ok(page);
    }
@@ -67,6 +81,20 @@
            return student;
        }).collect(Collectors.toList());
        return Result.ok().data(studentVOS);
    }
    @RequestMapping(value = "/teacher/list", method = RequestMethod.GET)
    public Result<?> teacherList() {
        List<User> teacherList = new LambdaQueryChainWrapper<>(userService.getBaseMapper())
                .eq(User::getRole, RoleEnum.TEACHER.getCode())
                .orderByDesc(User::getCreateTime)
                .list();
        List<StudentVO> teachers = teacherList.stream().map(item -> {
            StudentVO student = new StudentVO();
            BeanUtils.copyProperties(item, student);
            return student;
        }).collect(Collectors.toList());
        return Result.ok().data(teachers);
    }
    @RequestMapping(value = "/classes/students", method = RequestMethod.GET)
@@ -114,11 +142,9 @@
                return new Result<>(3, "密码不能为空");
            }
        }
        if (StringUtils.isBlank(model.getBirthDay())) {
            model.setBirthDay(null);
        }
        User user = new User();
        BeanUtils.copyProperties(model, user);
        user.setAge(model.getAge());
        if (model.getId() == null) {
            String encodePwd = authenticationService.pwdEncode(model.getPassword());
@@ -164,7 +190,7 @@
    @RequestMapping(value = "/delete/{id}", method = RequestMethod.POST)
    public Result delete(@PathVariable Integer id) {
        User user = userService.getUserById(id);
        userService.updateById(user);
        userService.removeById(user.getId());
        return Result.ok();
    }
@@ -185,5 +211,12 @@
        return Result.ok(userService.importExcel(file));
    }
    @PostMapping("/reset/password/{id}")
    public Result<String> resetPassword(@PathVariable Integer id) {
        User user = userService.getUserById(id);
        String encodePwd = authenticationService.pwdEncode(new SysConfig().getPasswordDefault());
        user.setPassword(encodePwd);
        userService.updateById(user);
        return Result.ok();
    }
}