Merge remote-tracking branch 'origin/master'

oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysMenuRest.java

@@ -162,4 +162,14 @@ public class SysMenuRest {
     public ResultBean<List<SysMenuTreeVo>> listAllVoForSourceG(@RequestBody PagerQuery<SysMenuQuery> query){
         return sysMenuService.listAllVoForSourceG(query);
     }
+    @ApiOperation("根据角色sid条件查询所有数据列表")
+    @PostMapping("/listAllByRoleSidG")
+    public ResultBean<List<SysMenuVo>> listAllByRoleSidG(@RequestBody SysMenuQuery query){
+        return sysMenuService.listAllByRoleSidG(query);
+    }
+    @ApiOperation("查询按钮的权限")
+    @PostMapping("/getButtonPermissions")
+    public ResultBean<List<ButtonPermissionVo>> getButtonPermissions(@RequestBody ButtonPermissionQuery query){
+        return sysMenuService.getButtonPermissions(query);
+    }
 }

oms/src/main/java/com/yxt/oms/biz/func/sysmenu/ButtonPermissionQuery.java

@@ -0,0 +1,22 @@
+package com.yxt.oms.biz.func.sysmenu;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 查询按钮的权限的表单参数
+ */
+@ApiModel(value = "查询按钮的权限的表单参数", description = "查询按钮的权限的表单参数")
+@Data
+public class ButtonPermissionQuery {
+    @ApiModelProperty("userSid")
+    private String userSid;
+    @ApiModelProperty("url")
+    private String url;
+    @ApiModelProperty("type")
+    private String type;
+    private String sourceSid;
+    private String orgSid;
+
+}

oms/src/main/java/com/yxt/oms/biz/func/sysmenu/ButtonPermissionVo.java

@@ -0,0 +1,12 @@
+package com.yxt.oms.biz.func.sysmenu;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value = "返回查询的按钮权限集合", description = "返回查询的按钮权限集合")
+@Data
+public class ButtonPermissionVo {
+    @ApiModelProperty("buttonId")
+    private String buttonId;
+}

oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenu.java

@@ -49,4 +49,5 @@ public class SysMenu extends BaseEntity {
 	@ApiModelProperty("菜单类型（0左侧当行菜单，1页面中功能）")
     private String menuType;
     private String cid;
+    private String btnKey;
 }

oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuDto.java

@@ -28,7 +28,7 @@ public class SysMenuDto implements Dto {
 
     private static final long serialVersionUID = -8143707488992909267L;
     @ApiModelProperty(value = "菜单名称", required = true)
-    @NotBlank(message = "菜单名称不能为空")
+//    @NotBlank(message = "菜单名称不能为空")
     private String name;
 
     @ApiModelProperty("菜单路由路径(VUE)")
@@ -70,4 +70,5 @@ public class SysMenuDto implements Dto {
     @ApiModelProperty(value = "备注")
     private String remarks;
     private String cid;
+    private String btnKey;
 }

oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuService.java

@@ -13,6 +13,7 @@ import com.yxt.oms.feign.portal.sysmenu.SysMenuFeign;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
@@ -108,8 +109,13 @@ public class SysMenuService extends MybatisBaseService<SysMenuMapper, SysMenu> {
             return sysMenuVos;
         }*/
     public ResultBean<List<SysMenuTreeVo>>  listAllVoForSource(PagerQuery<SysMenuQuery> query) {
+
         return sysMenuFeign.listAllVoForSource(query.getParams());
     }
+    public ResultBean<List<SysMenuTreeVo>>  listAllVoForSourceG(PagerQuery<SysMenuQuery> query) {
+
+        return sysMenuFeign.listAllVoForSourceG(query.getParams());
+    }
     public ResultBean<List<Map<String,String>>>  getMenusForFunction(SysMenuFunctionQuery sysMenuFunctionQuery) {
         return sysMenuFeign.getMenusForFunction(sysMenuFunctionQuery);
     }
@@ -389,8 +395,11 @@ 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());
+    public ResultBean<List<SysMenuVo>> listAllByRoleSidG(@RequestBody SysMenuQuery query){
+        return sysMenuFeign.listAllByRoleSidG(query);
+    }
+    public ResultBean<List<ButtonPermissionVo>> getButtonPermissions(ButtonPermissionQuery query) {
+        return sysMenuFeign.getButtonPermissions(query);
     }
 }

oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuTreeVo.java

@@ -60,4 +60,5 @@ public class SysMenuTreeVo implements Vo {
     private String isShow;
     private String menuTypeValue;
     private String cid;
+    private String btnKey;
 }

oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuVo.java

@@ -72,4 +72,5 @@ public class SysMenuVo implements Vo {
     @ApiModelProperty("资源名称")
     private String sourceName;
     private String cid;
+    private String btnKey;
 }

oms/src/main/java/com/yxt/oms/biz/func/sysuser/SysUserService.java

@@ -1,20 +1,16 @@
 package com.yxt.oms.biz.func.sysuser;
 
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.oms.feign.portal.sysuser.SysUserDto;
 import com.yxt.oms.feign.portal.sysuser.SysUserFeign;
 import com.yxt.oms.feign.portal.sysuser.SysUserQuery;
 import com.yxt.oms.feign.portal.sysuser.SysUserVo;
-import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
 

oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleService.java

@@ -12,13 +12,12 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 @Service
 public class SysUserRoleService extends MybatisBaseService<SysUserRoleMapper, SysUserRole> {
 
-	@Resource
+	@Autowired
 	SysUserRoleFeign sysUserRoleFeign;
 
 

oms/src/main/java/com/yxt/oms/feign/portal/sysmenu/SysMenuFeign.java

@@ -54,6 +54,11 @@ public interface SysMenuFeign {
     @ApiOperation("菜单列表：根据资源归类")
     @PostMapping("/listAllVoForSource")
     public ResultBean<List<SysMenuTreeVo>> listAllVoForSource(@RequestBody SysMenuQuery query);
+
+
+    @ApiOperation("菜单列表：根据资源归类")
+    @PostMapping("/listAllVoForSourceG")
+    public ResultBean<List<SysMenuTreeVo>> listAllVoForSourceG(@RequestBody SysMenuQuery query);
     /**
      * 菜单列表：根据资源归类 设置功能的url用
      * @return
@@ -121,7 +126,10 @@ 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);
+   @ApiOperation("根据角色sid条件查询所有数据列表")
+   @PostMapping("/listAllByRoleSidG")
+   public ResultBean<List<SysMenuVo>> listAllByRoleSidG(@RequestBody SysMenuQuery query);
+    @ApiOperation("查询按钮的权限")
+    @PostMapping("/getButtonPermissions")
+    public ResultBean<List<ButtonPermissionVo>> getButtonPermissions(@RequestBody ButtonPermissionQuery query);
 }

oms/src/main/java/com/yxt/oms/feign/portal/sysmenu/SysMenuFeignFallback.java

@@ -36,6 +36,11 @@ public class SysMenuFeignFallback implements SysMenuFeign {
 		return null;
 	}
 
+	@Override
+	public ResultBean<List<SysMenuTreeVo>> listAllVoForSourceG(SysMenuQuery query) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<List<Map<String, String>>> getMenusForFunction(SysMenuFunctionQuery sysMenuFunctionQuery) {
 		return null;
@@ -82,7 +87,12 @@ public class SysMenuFeignFallback implements SysMenuFeign {
 	}
 
 	@Override
-	public ResultBean<List<SysMenuTreeVo>> listAllVoForSourceG(SysMenuQuery query) {
+	public ResultBean<List<SysMenuVo>> listAllByRoleSidG(SysMenuQuery query) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<ButtonPermissionVo>> getButtonPermissions(ButtonPermissionQuery query) {
 		return null;
 	}
 }