From a4047b6048ebfe09e66a765b58ea12b5bd0e2e6e Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 28 十一月 2022 16:18:10 +0800
Subject: [PATCH] 店铺管理优化
---
ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java | 45 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 38 insertions(+), 7 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java b/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java
index 893f3b4..fc07da8 100644
--- a/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java
+++ b/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.annotation.LogSave;
import com.ycl.api.BasePageDTO;
import com.ycl.api.BasePageVO;
@@ -45,7 +46,7 @@
@ApiOperation("娣诲姞閮ㄩ棬")
@PostMapping(value = "/create")
- @LogSave(operationType = "閮ㄩ棬绠＄悊",contain = "娣诲姞閮ㄩ棬")
+ @LogSave(operationType = "閮ㄩ棬绠＄悊", contain = "娣诲姞閮ㄩ棬")
public CommonResult<Void> create(@Validated @RequestBody DepartVO.AddDepartVO addDepartVO) {
departService.create(addDepartVO);
return CommonResult.success(null);
@@ -53,7 +54,7 @@
@ApiOperation("缂栬緫閮ㄩ棬")
@PostMapping(value = "/update")
- @LogSave(operationType = "閮ㄩ棬绠＄悊",contain = "缂栬緫閮ㄩ棬")
+ @LogSave(operationType = "閮ㄩ棬绠＄悊", contain = "缂栬緫閮ㄩ棬")
public CommonResult<Void> create(@Validated @RequestBody DepartVO.UpdateDepartVO params) {
departService.update(params);
return CommonResult.success(null);
@@ -61,7 +62,7 @@
@ApiOperation("鍒犻櫎")
@PostMapping(value = "/delete")
- @LogSave(operationType = "閮ㄩ棬绠＄悊",contain = "鍒犻櫎閮ㄩ棬")
+ @LogSave(operationType = "閮ㄩ棬绠＄悊", contain = "鍒犻櫎閮ㄩ棬")
public CommonResult<Void> delete(@Validated @RequestBody DepartVO.IdDepartVO params) {
departService.delete(params.getId());
return CommonResult.success(null);
@@ -74,7 +75,7 @@
**/
@ApiOperation("鎵瑰鐞�-鍒犻櫎")
@PostMapping(value = "/batch_deletion")
- @LogSave(operationType = "閮ㄩ棬绠＄悊",contain = "鎵归噺鍒犻櫎閮ㄩ棬")
+ @LogSave(operationType = "閮ㄩ棬绠＄悊", contain = "鎵归噺鍒犻櫎閮ㄩ棬")
public CommonResult delete(@RequestParam List<Long> ids) {
if (ids.isEmpty()) {
return CommonResult.failed("bad request parameter");
@@ -84,7 +85,7 @@
@ApiOperation("璇︽儏")
@PostMapping(value = "/detail")
- @LogSave(operationType = "閮ㄩ棬绠＄悊",contain = "鏌ョ湅閮ㄩ棬")
+ @LogSave(operationType = "閮ㄩ棬绠＄悊", contain = "鏌ョ湅閮ㄩ棬")
public CommonResult<UmsDepart> detail(@Validated @RequestBody DepartVO.IdDepartVO params) {
UmsDepart sccgDepart = departService.loadDepartById(params.getId());
return CommonResult.success(sccgDepart);
@@ -106,8 +107,10 @@
@ApiOperation("鏌ヨ鍏ㄩ儴閮ㄩ棬")
@GetMapping(value = "/page")
- public CommonResult<IPage<UmsDepartVO>> page(DepartVO.PageDepartVO params) {
- IPage<UmsDepartVO> page = departService.pageDepart(params);
+ public CommonResult<IPage<UmsDepartVO>> page(@RequestParam("currentPage") Integer currentPage, @RequestParam("pageSize") Integer pageSize,
+ @RequestParam(value = "departName", required = false) String departName) {
+ IPage<UmsDepartVO> page = new Page<>(currentPage, pageSize);
+ departService.pageDepart(departName, page);
return CommonResult.success(page);
}
@@ -118,6 +121,34 @@
return CommonResult.success(basePageDTO);
}
+ @ApiOperation("鐢ㄦ埛淇敼瑙掕壊")
+ @PutMapping(value = "/user_update_Role")
+ public CommonResult userUpdateRole(@RequestParam Long id,
+ @RequestParam List<Long> roles) {
+ umsAdminDepartService.userUpdateRoles(id, roles);
+ return CommonResult.success("update success");
+ }
+
+ @ApiOperation("鐢ㄦ埛淇敼閮ㄩ棬")
+ @PutMapping(value = "/user_update_depart")
+ public CommonResult userUpdateDepart(@RequestParam Long userId,
+ @RequestParam Long departId) {
+ umsAdminDepartService.userUpdateDepart(userId,departId);
+ return CommonResult.success("update success");
+ }
+
+ @ApiOperation("鏌ヨ涓嶅湪閮ㄩ棬鐨勫墿浣欎汉鍛�")
+ @GetMapping("/query_surplus_user")
+ public CommonResult searchSurplusUser() {
+ return CommonResult.success(departService.selectSurplusUser());
+ }
+
+ @ApiOperation("鏌ヨ涓嶅湪閮ㄩ棬鐨勫墿浣欎汉鍛樺拰宸插湪閮ㄩ棬鐨勪汉")
+ @GetMapping("/query_surplus_exist_user")
+ public CommonResult searchSurplusUser(@RequestParam Long id) {
+ return CommonResult.success(departService.selectSurplusUserAndExistUser(id));
+ }
+
@ApiOperation("鏌ヨ椤剁骇閮ㄩ棬")
@GetMapping(value = "/query_father")
public CommonResult search() {
--
Gitblit v1.8.0