From cca719d0cb879a650c743ada280de846a8dfeb6f Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 18 六月 2024 16:34:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/SmFunctionController.java | 14 +++++-
/dev/null | 51 -------------------------
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/SmOperationController.java | 2
3 files changed, 12 insertions(+), 55 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/SmFunctionController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/SmFunctionController.java
index a2272a4..49a5d1e 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/SmFunctionController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/SmFunctionController.java
@@ -92,7 +92,15 @@
return new DataGrid<>();
}
-
-
-
+ /**
+ * 鑾峰彇褰撳墠鐢ㄦ埛鐨勮彍鍗�
+ * @param treeQueryObject 鏍戞煡璇㈠璞�
+ * @return 鏍戣妭鐐癸紝鍑虹幇閿欒浼氬湪寮傚父澶勭悊鍣ㄤ腑缁熶竴杩斿洖Json
+ */
+ @VciUnCheckRight
+ @GetMapping("/getTreeMyMenu")
+ @ResponseBody
+ public List<MenuVO> getTreeMyMenu(TreeQueryObject treeQueryObject) throws PLException {
+ return functionQueryService.treeCurrentUserMenu(treeQueryObject, ResourceControlTypeEnum.BS);
+ }
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/SmMenuController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/SmOperationController.java
similarity index 96%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/SmMenuController.java
rename to Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/SmOperationController.java
index 198fc7f..c3c8c7d 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/SmMenuController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/SmOperationController.java
@@ -16,7 +16,7 @@
*/
@RestController
@RequestMapping("/webMenuController")
-public class SmMenuController {
+public class SmOperationController {
/**
* 鎿嶄綔鎸夐挳鐨勬湇鍔�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/StmFunctionController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/StmFunctionController.java
deleted file mode 100644
index b10a17a..0000000
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/StmFunctionController.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.vci.web.controller;
-
-import com.vci.corba.common.PLException;
-import com.vci.frameworkcore.compatibility.ISmFunctionQueryService;
-import com.vci.frameworkcore.enumpck.ResourceControlTypeEnum;
-import com.vci.frameworkcore.pagemodel.MenuVO;
-import com.vci.starter.web.annotation.controller.VciUnCheckRight;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.TreeQueryObject;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.util.List;
-
-/**
- * 鐧诲綍鎺у埗鍣�
- * @author weidy
- * @date 2021-1-28
- */
-@Controller
-@RequestMapping("/stmFunctionController")
-public class StmFunctionController {
-
- /**
- * 鍔熻兘鏌ヨ鏈嶅姟
- */
- @Autowired
- private ISmFunctionQueryService functionQueryService;
- @VciUnCheckRight
- @PostMapping("/test")
- @ResponseBody
- public BaseResult logout(){
- System.out.printf("hhhh");
- return BaseResult.success();
- }
- /**
- * 鑾峰彇褰撳墠鐢ㄦ埛鐨勮彍鍗�
- * @param treeQueryObject 鏍戞煡璇㈠璞�
- * @return 鏍戣妭鐐癸紝鍑虹幇閿欒浼氬湪寮傚父澶勭悊鍣ㄤ腑缁熶竴杩斿洖Json
- */
- @VciUnCheckRight
- @GetMapping("/getTreeMyMenu")
- @ResponseBody
- public List<MenuVO> getTreeMyMenu(TreeQueryObject treeQueryObject) throws PLException {
- return functionQueryService.treeCurrentUserMenu(treeQueryObject, ResourceControlTypeEnum.BS);
- }
-}
--
Gitblit v1.9.3