From d015cc0b48ca51a2b93b6c60c91dc352a104b1e7 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 23 九月 2024 10:41:50 +0800
Subject: [PATCH] 删除密码加密

---
 safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/accountController/MenuController.java |   30 ++++++++++++++++++++++--------
 1 files changed, 22 insertions(+), 8 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 6bd9dd2..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,16 +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();
-        return userAccountService.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 userAccountService.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