From 6c12bcfde3b2d5c910ed1b11112442237021ac09 Mon Sep 17 00:00:00 2001
From: qirong <2032486488@qq.com>
Date: 星期日, 16 七月 2023 10:01:38 +0800
Subject: [PATCH] 随机试卷修改
---
src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java b/src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java
index 19959f4..807a2e5 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java
@@ -5,16 +5,18 @@
import com.mindskip.xzs.base.RestResponse;
import com.mindskip.xzs.domain.Department;
import com.mindskip.xzs.domain.User;
+import com.mindskip.xzs.domain.vo.DepartmentVO;
import com.mindskip.xzs.service.DepartmentService;
+import com.mindskip.xzs.service.UserService;
import com.mindskip.xzs.utility.PageInfoHelper;
import com.mindskip.xzs.viewmodel.admin.department.DepartmentResponseVM;
-import com.mindskip.xzs.viewmodel.admin.user.UserPageRequestVM;
-import com.mindskip.xzs.viewmodel.admin.user.UserResponseVM;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
@RestController("AdminDepartmentController")
@@ -23,10 +25,12 @@
private final DepartmentService departmentService;
+ private final UserService userService;
@Autowired
- public DepartmentController(DepartmentService departmentService) {
+ public DepartmentController(DepartmentService departmentService, UserService userService) {
this.departmentService = departmentService;
+ this.userService = userService;
}
@RequestMapping(value = "/list", method = RequestMethod.POST)
@@ -60,4 +64,21 @@
public RestResponse update(@PathVariable Integer id) {
return RestResponse.ok(departmentService.getById(id));
}
+
+ @RequestMapping(value = "/getUserByDepartment/{id}", method = RequestMethod.POST)
+ public RestResponse<List<User>> getUserByDepartment(@PathVariable Integer id){
+ return RestResponse.ok(userService.getUserByLevel(id));
+ }
+
+ @RequestMapping(value = "/getDepartmentUser", method = RequestMethod.POST)
+ public RestResponse<List<DepartmentVO>> getUserDepartment(){
+ List<DepartmentVO> res = departmentService.gets()
+ .stream().map(e->{
+ DepartmentVO departmentVO = new DepartmentVO();
+ departmentVO.setUserList(userService.getUserByLevel(e.getId()));
+ departmentVO.setDepartment(e);
+ return departmentVO;
+ }).collect(Collectors.toList());
+ return RestResponse.ok(res);
+ }
}
--
Gitblit v1.8.0