From f1f506172a3edff8d31e4db77b8940f115660919 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 20 九月 2022 16:25:43 +0800
Subject: [PATCH] fix
---
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/MenuController.java | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 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 ccc7f7d..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.gkhy.safePlatform.account.rpc.apimodel.UserAccountService;
+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;
@@ -18,17 +21,16 @@
public class MenuController {
@DubboReference(check = false)
- private UserAccountService userAccountService;
+ private AccountMenuService accountMenuService;
/**
* @Description: 新增菜单
*/
@RequestMapping(value = "/add",method = RequestMethod.POST)
- public ResultVO<String> addMenu(Principal principal, @RequestBody MenuAddRPCReqDTO menuAddDto) {
- String userId = principal.getName();
- userAccountService.addMenu(Long.valueOf(userId), menuAddDto);
- return new ResultVO<>(ResultCodes.OK);
+ public ResultVO<String> addMenu(Authentication authentication, @RequestBody MenuAddRPCReqDTO menuAddDto) {
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+ return accountMenuService.addMenu(currentUser, menuAddDto);
}
@@ -36,10 +38,20 @@
* @Description: 新增菜单
*/
@RequestMapping(value = "/mod",method = RequestMethod.POST)
- public ResultVO<String> addMenu(Principal principal, @RequestBody MenuModRPCReqDTO menuModDto) {
- String userId = principal.getName();
- userAccountService.modMenu(Long.valueOf(userId), menuModDto);
- return new ResultVO<>(ResultCodes.OK);
+ 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