From 881df985ccdd0b43392c1a91fd415d82b2ce823e Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Tue, 30 Jul 2024 09:22:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yxt/oms/apiadmin/aggregation/SysMenuRest.java  | 6 ++++++
 .../java/com/yxt/oms/biz/func/sysmenu/SysMenuMapper.java    | 4 ++++
 .../java/com/yxt/oms/biz/func/sysmenu/SysMenuService.java   | 3 +++
 .../java/com/yxt/oms/feign/portal/sysmenu/SysMenuFeign.java | 3 +++
 .../yxt/oms/feign/portal/sysmenu/SysMenuFeignFallback.java  | 5 +++++
 .../java/com/yxt/oms/feign/portal/sysuser/SysUserDto.java   | 1 +
 6 files changed, 22 insertions(+)

diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysMenuRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysMenuRest.java
index a563352..6446c4f 100644
--- a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysMenuRest.java
+++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysMenuRest.java
@@ -156,4 +156,10 @@ public class SysMenuRest {
         BeanUtil.copyProperties(sysMenu, vo);
         return rb.success().setData(vo);
     }*/
+
+    @ApiOperation("菜单列表：根据资源归类")
+    @PostMapping("/listAllVoForSourceG")
+    public ResultBean<List<SysMenuTreeVo>> listAllVoForSourceG(@RequestBody PagerQuery<SysMenuQuery> query){
+        return sysMenuService.listAllVoForSourceG(query);
+    }
 }
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuMapper.java
index beec550..5cdbf7b 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuMapper.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuMapper.java
@@ -5,9 +5,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.ApiOperation;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuService.java b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuService.java
index 6a13e4e..a5cd084 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuService.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuService.java
@@ -389,5 +389,8 @@ public class SysMenuService extends MybatisBaseService<SysMenuMapper, SysMenu> {
     public List<SysMenuTreeVo> fetchRootMenuBySourceSid(String sid) {
         return baseMapper.fetchRootMenuBySourceSid(sid);
     }
+    public ResultBean<List<SysMenuTreeVo>>  listAllVoForSourceG(PagerQuery<SysMenuQuery> query) {
 
+        return sysMenuFeign.listAllVoForSourceG(query.getParams());
+    }
 }
\ No newline at end of file
diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysmenu/SysMenuFeign.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysmenu/SysMenuFeign.java
index 45f3179..e5631d2 100644
--- a/oms/src/main/java/com/yxt/oms/feign/portal/sysmenu/SysMenuFeign.java
+++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysmenu/SysMenuFeign.java
@@ -121,4 +121,7 @@ public interface SysMenuFeign {
     @ApiOperation("获取一条记录 根据sid")
     @GetMapping("/fetchBySid/{sid}")
     public ResultBean<SysMenuVo> fetchBySid(@PathVariable("sid") String sid);*/
+   @ApiOperation("菜单列表：根据资源归类")
+   @PostMapping("/listAllVoForSourceG")
+   public ResultBean<List<SysMenuTreeVo>> listAllVoForSourceG(@RequestBody SysMenuQuery query);
 }
\ No newline at end of file
diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysmenu/SysMenuFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysmenu/SysMenuFeignFallback.java
index 6c153c5..6d48400 100644
--- a/oms/src/main/java/com/yxt/oms/feign/portal/sysmenu/SysMenuFeignFallback.java
+++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysmenu/SysMenuFeignFallback.java
@@ -80,4 +80,9 @@ public class SysMenuFeignFallback implements SysMenuFeign {
 	public ResultBean delBySids(String sid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<List<SysMenuTreeVo>> listAllVoForSourceG(SysMenuQuery query) {
+		return null;
+	}
 }
\ No newline at end of file
diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserDto.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserDto.java
index 46227d9..8f9c5ed 100644
--- a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserDto.java
+++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserDto.java
@@ -44,5 +44,6 @@ public class SysUserDto implements Dto {
     private String userSid;
     private String password;
     private String orgSid;
+    private String sourceSid;
 
 }
\ No newline at end of file