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/user/UmsAdminController.java | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java b/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
index 7f227c1..a7516b2 100644
--- a/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
+++ b/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
+import com.ycl.bo.AdminUserDetails;
import com.ycl.controller.BaseController;
import com.ycl.dto.UmsAdminLoginParam;
import com.ycl.dto.UmsAdminParam;
@@ -12,7 +13,7 @@
import com.ycl.entity.user.UmsRole;
import com.ycl.service.redis.RedisService;
import com.ycl.service.user.UmsAdminService;
-import com.ycl.service.user.UmsRoleService;
+import com.ycl.service.user.UmsMenuService;
import com.ycl.utils.redis.RedisKey;
import com.ycl.vo.user.UserVO;
import io.swagger.annotations.Api;
@@ -21,6 +22,7 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Controller;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -47,14 +49,14 @@
@Autowired
private UmsAdminService adminService;
@Autowired
- private UmsRoleService roleService;
+ UmsMenuService umsMenuService;
@Resource
private RedisService redisService;
@ApiOperation(value = "鐢ㄦ埛娉ㄥ唽")
@RequestMapping(value = "/register", method = RequestMethod.POST)
@ResponseBody
- @LogSave(operationType = "鐢ㄦ埛绠＄悊",contain = "娣诲姞鐢ㄦ埛")
+ @LogSave(operationType = "鐢ㄦ埛绠＄悊", contain = "娣诲姞鐢ㄦ埛")
public CommonResult<UmsAdmin> register(@Validated @RequestBody UmsAdminParam umsAdminParam) {
UmsAdmin umsAdmin = adminService.register(umsAdminParam);
if (umsAdmin == null) {
@@ -101,10 +103,10 @@
}
String username = principal.getName();
UmsAdmin umsAdmin = adminService.getAdminByUsername(username);
+ AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
Map<String, Object> data = new HashMap<>();
- data.put("username", umsAdmin.getUsername());
- data.put("menus", roleService.getMenuList(umsAdmin.getId()));
- data.put("icon", umsAdmin.getIcon());
+ data.put("user", umsAdmin);
+ data.put("menus", umsMenuService.ListTreeMyself(user.getUserId()));
List<UmsRole> roleList = adminService.getRoleList(umsAdmin.getId());
if (CollUtil.isNotEmpty(roleList)) {
List<String> roles = roleList.stream().map(UmsRole::getName).collect(Collectors.toList());
@@ -141,7 +143,7 @@
@ApiOperation("淇敼鎸囧畾鐢ㄦ埛淇℃伅")
@RequestMapping(value = "/update/{id}", method = RequestMethod.POST)
@ResponseBody
- @LogSave(operationType = "鐢ㄦ埛绠＄悊",contain = "淇敼鐢ㄦ埛")
+ @LogSave(operationType = "鐢ㄦ埛绠＄悊", contain = "淇敼鐢ㄦ埛")
public CommonResult update(@PathVariable Long id, @RequestBody UmsAdmin admin) {
boolean success = adminService.update(id, admin);
if (success) {
@@ -153,7 +155,7 @@
@ApiOperation("淇敼鎸囧畾鐢ㄦ埛瀵嗙爜")
@RequestMapping(value = "/updatePassword", method = RequestMethod.POST)
@ResponseBody
- @LogSave(operationType = "鐢ㄦ埛绠＄悊",contain = "淇敼鐢ㄦ埛瀵嗙爜")
+ @LogSave(operationType = "鐢ㄦ埛绠＄悊", contain = "淇敼鐢ㄦ埛瀵嗙爜")
public CommonResult updatePassword(@Validated @RequestBody UpdateAdminPasswordParam updatePasswordParam) {
int status = adminService.updatePassword(updatePasswordParam);
if (status > 0) {
@@ -172,7 +174,7 @@
@ApiOperation("鍒犻櫎鎸囧畾鐢ㄦ埛淇℃伅")
@RequestMapping(value = "/delete/{id}", method = RequestMethod.POST)
@ResponseBody
- @LogSave(operationType = "鐢ㄦ埛绠＄悊",contain = "鍒犻櫎鐢ㄦ埛")
+ @LogSave(operationType = "鐢ㄦ埛绠＄悊", contain = "鍒犻櫎鐢ㄦ埛")
public CommonResult delete(@PathVariable Long id) {
boolean success = adminService.delete(id);
if (success) {
@@ -184,7 +186,7 @@
@ApiOperation("淇敼甯愬彿鐘舵��")
@RequestMapping(value = "/updateStatus/{id}", method = RequestMethod.POST)
@ResponseBody
- @LogSave(operationType = "鐢ㄦ埛绠＄悊",contain = "鐢ㄦ埛璐﹀彿鍚敤/绂佺敤")
+ @LogSave(operationType = "鐢ㄦ埛绠＄悊", contain = "鐢ㄦ埛璐﹀彿鍚敤/绂佺敤")
public CommonResult updateStatus(@PathVariable Long id, @RequestParam(value = "status") Integer status) {
UmsAdmin umsAdmin = new UmsAdmin();
umsAdmin.setStatus(status);
@@ -218,10 +220,10 @@
@ApiOperation("鎵归噺鍒犻櫎鐢ㄦ埛")
@RequestMapping(value = "/deleteBatch", method = RequestMethod.POST)
@ApiImplicitParams({
- @ApiImplicitParam(name = "ids", value = "鐢ㄦ埛Ids",required = true, dataType = "Array")
+ @ApiImplicitParam(name = "ids", value = "鐢ㄦ埛Ids", required = true, dataType = "Array")
})
@ResponseBody
- @LogSave(operationType = "鐢ㄦ埛绠＄悊",contain = "鎵归噺鍒犻櫎鐢ㄦ埛")
+ @LogSave(operationType = "鐢ㄦ埛绠＄悊", contain = "鎵归噺鍒犻櫎鐢ㄦ埛")
public CommonResult deleteBatch(@RequestParam("ids") List<Long> ids) {
boolean success = adminService.deleteBatch(ids);
if (success) {
@@ -233,11 +235,11 @@
@ApiOperation("鎵归噺淇敼鐢ㄦ埛鐘舵��")
@RequestMapping(value = "/updateStatusBatch", method = RequestMethod.POST)
@ApiImplicitParams({
- @ApiImplicitParam(name = "ids", value = "鐢ㄦ埛Ids",required = true, dataType = "Array"),
- @ApiImplicitParam(name = "status", value = "鐘舵��0->绂佺敤锛�1->鍚敤",required = true, dataType = "Integer")
+ @ApiImplicitParam(name = "ids", value = "鐢ㄦ埛Ids", required = true, dataType = "Array"),
+ @ApiImplicitParam(name = "status", value = "鐘舵��0->绂佺敤锛�1->鍚敤", required = true, dataType = "Integer")
})
@ResponseBody
- @LogSave(operationType = "鐢ㄦ埛绠＄悊",contain = "鐢ㄦ埛璐﹀彿鎵归噺鍚敤/绂佺敤")
+ @LogSave(operationType = "鐢ㄦ埛绠＄悊", contain = "鐢ㄦ埛璐﹀彿鎵归噺鍚敤/绂佺敤")
public CommonResult updateStatusBatch(@RequestParam("ids") List<Long> ids, @RequestParam(value = "status") Integer status) {
boolean success = adminService.updateStatusBatch(ids, status);
if (success) {
@@ -246,12 +248,10 @@
return CommonResult.failed();
}
-
@ApiOperation("鑾峰彇閮ㄩ棬浜哄憳")
@RequestMapping(value = "/getDepartUser/{departId}", method = RequestMethod.GET)
@ResponseBody
public CommonResult<List<UmsAdmin>> getDepartUser(@PathVariable Long departId) {
return CommonResult.success(adminService.getDepartUser(departId));
}
-
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0