From fbdd6af3039a83cd4727a03cecb7c5914277371f Mon Sep 17 00:00:00 2001
From: qirong <2032486488@qq.com>
Date: 星期五, 28 七月 2023 14:44:08 +0800
Subject: [PATCH] 个人练习模板功能
---
src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java | 75 +++++++++++++++++++++++++++++++------
1 files changed, 62 insertions(+), 13 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 636fb12..807a2e5 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java
@@ -3,16 +3,21 @@
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.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.user.UserPageRequestVM;
-import com.mindskip.xzs.viewmodel.admin.user.UserResponseVM;
+import com.mindskip.xzs.viewmodel.admin.department.DepartmentResponseVM;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+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")
@RequestMapping("/api/admin/department")
@@ -20,16 +25,60 @@
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 = "/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));
-// return RestResponse.ok(page);
-// }
+ @RequestMapping(value = "/list", method = RequestMethod.POST)
+ public RestResponse<List<Department>> getAll(){
+ List<Department> res = departmentService.gets();
+ return RestResponse.ok(res);
+ }
+
+
+ @RequestMapping(value = "/page/list", method = RequestMethod.POST)
+ public RestResponse<PageInfo<DepartmentResponseVM>> pageList(@RequestBody DepartmentResponseVM model) {
+ PageInfo<Department> pageInfo = departmentService.gets(model);
+ PageInfo<DepartmentResponseVM> page = PageInfoHelper.copyMap(pageInfo, q -> {
+ DepartmentResponseVM vm = modelMapper.map(q,DepartmentResponseVM.class);
+ return vm;
+ });
+ return RestResponse.ok(page);
+ }
+
+ @RequestMapping(value = "/add", method = RequestMethod.POST)
+ public RestResponse add(@RequestBody @Valid String name) {
+ return RestResponse.ok(departmentService.add(name));
+ }
+
+ @RequestMapping(value = "/update", method = RequestMethod.POST)
+ public RestResponse update(@RequestBody @Valid Department model) {
+ return RestResponse.ok(departmentService.update(model));
+ }
+
+ @RequestMapping(value = "/get/{id}", method = RequestMethod.POST)
+ 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