From 1ab816e3c12c9c35bda6307c07f24e5677b87ab4 Mon Sep 17 00:00:00 2001
From: liyanqi <15181887205@163.com>
Date: 星期四, 15 九月 2022 12:48:45 +0800
Subject: [PATCH] 1
---
ycl-platform/src/main/java/com/ycl/controller/depart/DepartController.java | 48 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 38 insertions(+), 10 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/depart/DepartController.java b/ycl-platform/src/main/java/com/ycl/controller/depart/DepartController.java
index 4c8303e..4188a35 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/depart/DepartController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/depart/DepartController.java
@@ -1,11 +1,15 @@
package com.ycl.controller.depart;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ycl.api.BasePageDTO;
+import com.ycl.api.BasePageVO;
import com.ycl.api.CommonResult;
-import com.ycl.entity.depart.SccgDepart;
-import com.ycl.entity.user.UmsMenu;
-import com.ycl.service.depart.SccgDepartService;
-import com.ycl.service.user.UmsMenuService;
+import com.ycl.controller.BaseController;
+import com.ycl.entity.platform.depart.UmsDepart;
+import com.ycl.service.platform.depart.UmsDepartService;
+import com.ycl.service.platform.user.UmsDepartManageService;
+import com.ycl.utils.auth.UserAuthUtil;
import com.ycl.vo.depart.DepartVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -27,15 +31,26 @@
@RestController
@Api(tags = "閮ㄩ棬绠＄悊妯″潡")
@RequestMapping("/depart")
-public class DepartController {
+public class DepartController extends BaseController {
@Autowired
- private SccgDepartService departService;
+ private UmsDepartService departService;
+ @Resource
+ private UmsDepartManageService umsAdminDepartService;
+ @Resource
+ private UserAuthUtil userAuthUtil;
@ApiOperation("娣诲姞閮ㄩ棬")
@PostMapping(value = "/create")
public CommonResult<Void> create(@Validated @RequestBody DepartVO.AddDepartVO addDepartVO) {
departService.create(addDepartVO);
+ return CommonResult.success(null);
+ }
+
+ @ApiOperation("缂栬緫閮ㄩ棬")
+ @PostMapping(value = "/update")
+ public CommonResult<Void> create(@Validated @RequestBody DepartVO.UpdateDepartVO params) {
+ departService.update(params);
return CommonResult.success(null);
}
@@ -48,15 +63,15 @@
@ApiOperation("璇︽儏")
@PostMapping(value = "/detail")
- public CommonResult<SccgDepart> detail(@Validated @RequestBody DepartVO.IdDepartVO params) {
- SccgDepart sccgDepart = departService.loadDepartById(params.getId());
+ public CommonResult<UmsDepart> detail(@Validated @RequestBody DepartVO.IdDepartVO params) {
+ UmsDepart sccgDepart = departService.loadDepartById(params.getId());
return CommonResult.success(sccgDepart);
}
@ApiOperation("鏍戠粨鏋�")
@GetMapping(value = "/tree")
- public CommonResult<List<SccgDepart>> tree() {
- List<SccgDepart> tree = departService.tree();
+ public CommonResult<List<UmsDepart>> tree() {
+ List<UmsDepart> tree = departService.tree();
return CommonResult.success(tree);
}
@@ -67,5 +82,18 @@
return CommonResult.success(null);
}
+ @ApiOperation("鏌ヨ鍏ㄩ儴閮ㄩ棬")
+ @GetMapping(value = "/page")
+ public CommonResult<IPage<UmsDepart>> page(DepartVO.PageDepartVO params) {
+ IPage<UmsDepart> page = departService.pageDepart(params);
+ return CommonResult.success(page);
+ }
+
+ @ApiOperation("鏌ヨ鎴戠殑閮ㄩ棬")
+ @GetMapping(value = "/belongDepart")
+ public CommonResult<BasePageDTO> belongDepart(BasePageVO params) {
+ BasePageDTO basePageDTO= umsAdminDepartService.belongDepart(fetchOperator(request).getOperatorId(), params.getCurrent(), params.getPageSize());
+ return CommonResult.success(basePageDTO);
+ }
}
--
Gitblit v1.8.0