From 247cb86585a1d1894596ed18a6c93efecb992946 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期四, 14 十一月 2024 10:34:27 +0800
Subject: [PATCH] 班级成绩图表分析
---
src/main/java/com/ycl/jxkg/controller/admin/UserController.java | 206 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 143 insertions(+), 63 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/controller/admin/UserController.java b/src/main/java/com/ycl/jxkg/controller/admin/UserController.java
index 3a3b012..5090210 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/UserController.java
+++ b/src/main/java/com/ycl/jxkg/controller/admin/UserController.java
@@ -1,29 +1,37 @@
package com.ycl.jxkg.controller.admin;
-import com.ycl.jxkg.base.BaseApiController;
-import com.ycl.jxkg.base.RestResponse;
-import com.ycl.jxkg.domain.other.KeyValue;
-import com.ycl.jxkg.domain.User;
-import com.ycl.jxkg.domain.UserEventLog;
-import com.ycl.jxkg.domain.enums.UserStatusEnum;
-import com.ycl.jxkg.service.AuthenticationService;
-import com.ycl.jxkg.service.UserEventLogService;
-import com.ycl.jxkg.service.UserService;
-import com.ycl.jxkg.utility.DateTimeUtil;
-import com.ycl.jxkg.viewmodel.admin.user.*;
-import com.ycl.jxkg.utility.PageInfoHelper;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.github.pagehelper.PageInfo;
-
+import com.ycl.jxkg.base.BaseApiController;
+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;
+import com.ycl.jxkg.domain.vo.StudentVO;
+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.*;
+import com.ycl.jxkg.utils.DateTimeUtil;
+import com.ycl.jxkg.utils.PageInfoHelper;
+import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.Date;
import java.util.List;
import java.util.UUID;
+import java.util.stream.Collectors;
-
+@RequiredArgsConstructor
@RestController("AdminUserController")
@RequestMapping(value = "/api/admin/user")
public class UserController extends BaseApiController {
@@ -31,65 +39,112 @@
private final UserService userService;
private final UserEventLogService userEventLogService;
private final AuthenticationService authenticationService;
-
- @Autowired
- public UserController(UserService userService, UserEventLogService userEventLogService, AuthenticationService authenticationService) {
- this.userService = userService;
- this.userEventLogService = userEventLogService;
- this.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 RestResponse<PageInfo<UserResponseVM>> pageList(@RequestBody UserPageRequestVM model) {
+ public Result<PageInfo<UserResponseVO>> pageList(@RequestBody UserPageRequestVO model) {
+ if(!student.equals(model.getRole())) {
+ User currentUser = webContext.getCurrentUser();
+ if (teacher.equals(currentUser.getRole())) {
+ return Result.fail(SystemCode.InnerError.getCode(), "鎮ㄦ病鏈夎闂潈闄�");
+ }
+ }
PageInfo<User> pageInfo = userService.userPage(model);
- PageInfo<UserResponseVM> page = PageInfoHelper.copyMap(pageInfo, d -> UserResponseVM.from(d));
- return RestResponse.ok(page);
+ 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);
}
+ @RequestMapping(value = "/student/list", method = RequestMethod.GET)
+ public Result<com.ycl.jxkg.domain.vo.student.user.UserResponseVO> studentList() {
+ List<User> studentList = new LambdaQueryChainWrapper<>(userService.getBaseMapper())
+ .eq(User::getRole, RoleEnum.STUDENT.getCode())
+ .orderByDesc(User::getCreateTime)
+ .list();
+ List<StudentVO> studentVOS = studentList.stream().map(item -> {
+ StudentVO student = new StudentVO();
+ BeanUtils.copyProperties(item, student);
+ 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)
+ public Result<com.ycl.jxkg.domain.vo.student.user.UserResponseVO> classesStudent(@RequestParam Integer classesId) {
+ List<StudentVO> studentList = userService.classesStudent(classesId);
+ return Result.ok().data(studentList);
+ }
@RequestMapping(value = "/event/page/list", method = RequestMethod.POST)
- public RestResponse<PageInfo<UserEventLogVM>> eventPageList(@RequestBody UserEventPageRequestVM model) {
+ public Result<PageInfo<UserEventLogVO>> eventPageList(@RequestBody UserEventPageRequestVO model) {
PageInfo<UserEventLog> pageInfo = userEventLogService.page(model);
- PageInfo<UserEventLogVM> page = PageInfoHelper.copyMap(pageInfo, d -> {
- UserEventLogVM vm = modelMapper.map(d, UserEventLogVM.class);
- vm.setCreateTime(DateTimeUtil.dateFormat(d.getCreateTime()));
- return vm;
+ PageInfo<UserEventLogVO> page = PageInfoHelper.copyMap(pageInfo, d -> {
+ UserEventLogVO vo = new UserEventLogVO();
+ BeanUtils.copyProperties(d, vo);
+ vo.setCreateTime(DateTimeUtil.dateFormat(d.getCreateTime()));
+ return vo;
});
- return RestResponse.ok(page);
+ return Result.ok(page);
}
@RequestMapping(value = "/select/{id}", method = RequestMethod.POST)
- public RestResponse<UserResponseVM> select(@PathVariable Integer id) {
+ public Result<UserResponseVO> select(@PathVariable Integer id) {
User user = userService.getUserById(id);
- UserResponseVM userVm = UserResponseVM.from(user);
- return RestResponse.ok(userVm);
+ UserResponseVO userVm = UserResponseVO.from(user);
+ return Result.ok(userVm);
}
@RequestMapping(value = "/current", method = RequestMethod.POST)
- public RestResponse<UserResponseVM> current() {
+ public Result<UserResponseVO> current() {
User user = getCurrentUser();
- UserResponseVM userVm = UserResponseVM.from(user);
- return RestResponse.ok(userVm);
+ UserResponseVO userVm = UserResponseVO.from(user);
+ return Result.ok(userVm);
}
@RequestMapping(value = "/edit", method = RequestMethod.POST)
- public RestResponse<User> edit(@RequestBody @Valid UserCreateVM model) {
+ public Result<User> edit(@RequestBody @Valid UserCreateVO model) {
if (model.getId() == null) { //create
User existUser = userService.getUserByUserName(model.getUserName());
if (null != existUser) {
- return new RestResponse<>(2, "鐢ㄦ埛宸插瓨鍦�");
+ return new Result<>(2, "鐢ㄦ埛宸插瓨鍦�");
}
if (StringUtils.isBlank(model.getPassword())) {
- return new RestResponse<>(3, "瀵嗙爜涓嶈兘涓虹┖");
+ return new Result<>(3, "瀵嗙爜涓嶈兘涓虹┖");
}
}
- if (StringUtils.isBlank(model.getBirthDay())) {
- model.setBirthDay(null);
- }
- User user = modelMapper.map(model, User.class);
+ User user = new User();
+ BeanUtils.copyProperties(model, user);
+ user.setAge(model.getAge());
if (model.getId() == null) {
String encodePwd = authenticationService.pwdEncode(model.getPassword());
@@ -97,55 +152,80 @@
user.setUserUuid(UUID.randomUUID().toString());
user.setCreateTime(new Date());
user.setLastActiveTime(new Date());
- user.setDeleted(false);
- userService.insertByFilter(user);
+ userService.insertUser(user);
} else {
if (!StringUtils.isBlank(model.getPassword())) {
String encodePwd = authenticationService.pwdEncode(model.getPassword());
user.setPassword(encodePwd);
}
user.setModifyTime(new Date());
- userService.updateByIdFilter(user);
+ userService.updateById(user);
}
- return RestResponse.ok(user);
+ return Result.ok(user);
}
@RequestMapping(value = "/update", method = RequestMethod.POST)
- public RestResponse update(@RequestBody @Valid UserUpdateVM model) {
- User user = userService.selectById(getCurrentUser().getId());
- modelMapper.map(model, user);
+ public Result update(@RequestBody @Valid UserUpdateVO model) {
+ User user = userService.getById(getCurrentUser().getId());
+ BeanUtils.copyProperties(model, user);
user.setModifyTime(new Date());
- userService.updateByIdFilter(user);
- return RestResponse.ok();
+ userService.updateById(user);
+ return Result.ok();
}
@RequestMapping(value = "/changeStatus/{id}", method = RequestMethod.POST)
- public RestResponse<Integer> changeStatus(@PathVariable Integer id) {
+ public Result<Integer> changeStatus(@PathVariable Integer id) {
User user = userService.getUserById(id);
UserStatusEnum userStatusEnum = UserStatusEnum.fromCode(user.getStatus());
Integer newStatus = userStatusEnum == UserStatusEnum.Enable ? UserStatusEnum.Disable.getCode() : UserStatusEnum.Enable.getCode();
user.setStatus(newStatus);
user.setModifyTime(new Date());
- userService.updateByIdFilter(user);
- return RestResponse.ok(newStatus);
+ userService.updateById(user);
+ return Result.ok(newStatus);
}
@RequestMapping(value = "/delete/{id}", method = RequestMethod.POST)
- public RestResponse delete(@PathVariable Integer id) {
+ public Result delete(@PathVariable Integer id) {
User user = userService.getUserById(id);
- user.setDeleted(true);
- userService.updateByIdFilter(user);
- return RestResponse.ok();
+ userService.removeById(user.getId());
+ return Result.ok();
}
@RequestMapping(value = "/selectByUserName", method = RequestMethod.POST)
- public RestResponse<List<KeyValue>> selectByUserName(@RequestBody String userName) {
+ public Result<List<KeyValue>> selectByUserName(@RequestBody String userName) {
List<KeyValue> keyValues = userService.selectByUserName(userName);
- return RestResponse.ok(keyValues);
+ return Result.ok(keyValues);
}
+ @GetMapping("importTemplate")
+ public void importTemplate(HttpServletResponse response) {
+ userService.importTemplate(response);
+ }
+
+ @PostMapping("import")
+ public Result<String> importExcel(MultipartFile file) {
+ 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();
+ }
+
+ @PostMapping("/edit/password")
+ public Result<String> editPassword(@RequestBody UserEditPasswordVO model) {
+ User user = userService.getUserById(model.getId());
+ String newPassword = authenticationService.pwdEncode(model.getNewPassword());
+ user.setPassword(newPassword);
+ userService.updateById(user);
+ return Result.ok();
+ }
}
--
Gitblit v1.8.0