From fee66fde68610850d4c8c52df022b9d53a0cd3f7 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期三, 21 九月 2022 14:40:34 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf
---
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/MenuController.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/MenuController.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/MenuController.java
index 07fc726..ac7892f 100644
--- a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/MenuController.java
+++ b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/MenuController.java
@@ -1,11 +1,14 @@
package com.gkhy.safePlatform.accountController;
+import com.alibaba.fastjson.JSONObject;
import com.gkhy.safePlatform.account.rpc.apimodel.AccountMenuService;
import com.gkhy.safePlatform.account.rpc.apimodel.model.req.MenuAddRPCReqDTO;
import com.gkhy.safePlatform.account.rpc.apimodel.model.resp.MenuModRPCReqDTO;
+import com.gkhy.safePlatform.commons.co.ContextCacheUser;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import org.apache.dubbo.config.annotation.DubboReference;
+import org.springframework.security.core.Authentication;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -25,9 +28,9 @@
* @Description: 新增菜单
*/
@RequestMapping(value = "/add",method = RequestMethod.POST)
- public ResultVO<String> addMenu(Principal principal, @RequestBody MenuAddRPCReqDTO menuAddDto) {
- String userId = principal.getName();
- return accountMenuService.addMenu(Long.valueOf(userId), menuAddDto);
+ public ResultVO<String> addMenu(Authentication authentication, @RequestBody MenuAddRPCReqDTO menuAddDto) {
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+ return accountMenuService.addMenu(currentUser, menuAddDto);
}
@@ -35,9 +38,20 @@
* @Description: 新增菜单
*/
@RequestMapping(value = "/mod",method = RequestMethod.POST)
- public ResultVO<String> addMenu(Principal principal, @RequestBody MenuModRPCReqDTO menuModDto) {
- String userId = principal.getName();
- return accountMenuService.modMenu(Long.valueOf(userId), menuModDto);
+ public ResultVO<String> addMenu(Authentication authentication, @RequestBody MenuModRPCReqDTO menuModDto) {
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+ return accountMenuService.modMenu(currentUser, menuModDto);
+ }
+
+
+ /**
+ * @Description: 新增菜单
+ */
+ @RequestMapping(value = "/del",method = RequestMethod.POST)
+ public ResultVO<String> delMenu(Authentication authentication,@RequestBody JSONObject json ) {
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+ Long id = json.getLong("id");
+ return accountMenuService.delMenu(currentUser, id);
}
}
--
Gitblit v1.9.2