From 75ef59813ad1f15293d8e3937c3b8b85ca561703 Mon Sep 17 00:00:00 2001
From: chenjiantian <214228265@qq.com>
Date: 星期一, 17 一月 2022 18:52:19 +0800
Subject: [PATCH] token优化

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MenuController.java |   52 ++++++++++++++++++++++++++++------------------------
 1 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MenuController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MenuController.java
index b632fca..abc710a 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MenuController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MenuController.java
@@ -1,13 +1,12 @@
 package com.sandu.ximon.admin.controller;
 
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.sandu.common.domain.ResponseVO;
 import com.sandu.common.util.ResponseUtil;
+import com.sandu.ximon.admin.param.MenuParam;
 import com.sandu.ximon.admin.service.MenuService;
 import com.sandu.ximon.dao.bo.MenuNode;
-import com.sandu.ximon.dao.domain.Menu;
 import lombok.AllArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -30,27 +29,32 @@
 //        List<MenuNode> menuTrees = menuService.buildTree(list);
 //        return ResponseUtil.success(menuTrees);
 //    }
-//
-//    @GetMapping("treeList")
-//    public ResponseVO<Object> treeList() {
-//        List<Menu> list = menuService.list(Wrappers.lambdaQuery(Menu.class));
-//        List<MenuNode> menuTrees = menuService.buildTree(list);
-//        return ResponseUtil.success(menuTrees);
-//    }
-//
-//    @PutMapping
-//    @PreAuthorize("@el.check('menu:edit')")
-//    public ResponseVO<Object> update(@RequestBody Menu resources) {
-//
-//        boolean b = menuService.updateMenu(resources);
-//        return ResponseUtil.success("");
-//    }
 
-//    @PostMapping
-//    public ResponseVO<Object> addMenu(@RequestBody Menu resources) {
-//
-//        boolean b = menuService.updateMenu(resources);
-//        return ResponseUtil.success("");
-//    }
+    @GetMapping("/treeList")
+    public ResponseVO<Object> treeList() {
+        List<MenuNode> menuTrees = menuService.treeList();
+        return ResponseUtil.success(menuTrees);
+    }
 
+    @PostMapping("/update/{menuId}")
+    public ResponseVO<Object> update(@PathVariable Long menuId, @Validated @RequestBody MenuParam param) {
+
+        boolean result = menuService.updateMenu(menuId,param);
+        if (result) {
+            return ResponseUtil.success("娣诲姞鎴愬姛");
+        } else {
+            return ResponseUtil.fail("娣诲姞澶辫触");
+        }
+    }
+
+    @PostMapping
+    public ResponseVO<Object> addMenu(@Validated @RequestBody MenuParam param) {
+
+        boolean result = menuService.addMenu(param);
+        if (result) {
+            return ResponseUtil.success("娣诲姞鎴愬姛");
+        } else {
+            return ResponseUtil.fail("娣诲姞澶辫触");
+        }
+    }
 }

--
Gitblit v1.9.3