动态菜单web新增按钮返回

guoshilong

2023-04-25 35c9dae7372048f22208d70a8cefa91d6f7ee081

动态菜单web新增按钮返回

 skjcmanager/skjcmanager-service-api/skjcmanager-system-api/src/main/java/cn/gistack/system/entity/Menu.java

@@ -155,6 +155,12 @@
    private String remark;

    /**
     * 按钮备注
     */
    @ApiModelProperty(value = "按钮备注")
    private String buttonRemark;

    /**
     * 是否已删除
     */
    @TableLogic

 skjcmanager/skjcmanager-service-api/skjcmanager-system-api/src/main/java/cn/gistack/system/vo/WebMenuVO.java

@@ -20,4 +20,6 @@
    private String componentPath;

    private List<WebMenuVO> children;


}

 skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/MenuController.java

@@ -16,8 +16,7 @@
 */
package cn.gistack.system.controller;

import cn.gistack.system.vo.GrantTreeVO;
import cn.gistack.system.vo.WebMenuVO;
import cn.gistack.system.vo.*;
import cn.gistack.system.wrapper.MenuWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -38,8 +37,6 @@
import cn.gistack.system.entity.TopMenu;
import cn.gistack.system.service.IMenuService;
import cn.gistack.system.service.ITopMenuService;
import cn.gistack.system.vo.CheckedTreeVO;
import cn.gistack.system.vo.MenuVO;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;

@@ -194,7 +191,11 @@
    public R dynamicMenu(String roleId,String flag){
        if (flag.equals("web")){
            List<WebMenuVO> list = menuService.getWebMenu(roleId);
            return R.data(list);
            List<MenuVO> buttonList = menuService.getButtonList(roleId);
            WebPermissionVO webPermissionVO = new WebPermissionVO();
            webPermissionVO.setButtonList(buttonList);
            webPermissionVO.setWebMenuList(list);
            return R.data(webPermissionVO);
        }
        if (flag.equals("app")){
            List<MenuVO> list =  menuService.getAppMenu(roleId);

 skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/MenuMapper.java

@@ -188,4 +188,6 @@
    WebMenuVO selectWebTopMenu();

    List<WebMenuVO> getChildrenListById(@Param("id")String id,@Param("roleId") String roleId);

    List<MenuVO> getButtonList(@Param("roleIds") List<Long> roleIds);
}

 skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/MenuMapper.xml

@@ -511,5 +511,14 @@
         AND BRM.ROLE_ID = #{roleId}
         AND MENU.IS_DELETED = 0 ORDER BY MENU.SORT ASC
    </select>
    <select id="getButtonList" resultType="cn.gistack.system.vo.MenuVO">
        SELECT * FROM BLADE_MENU M
        LEFT JOIN BLADE_ROLE_MENU BRM ON M.ID = BRM.MENU_ID
        WHERE BRM.ROLE_ID  IN
        <foreach collection="roleIds" index="index" item="item" open="(" separator="," close=")">
          #{item}
        </foreach>
        AND M.CATEGORY = 2 AND M.IS_DELETED = 0 AND M.BUTTON_REMARK = 'WEB'
    </select>

</mapper>

 skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/IMenuService.java

@@ -167,4 +167,6 @@
    List<MenuVO> getAppMenu(String roleId);

    List<WebMenuVO> getWebMenu(String roleId);

    List<MenuVO> getButtonList(String roleId);
}

 skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/MenuServiceImpl.java

@@ -319,6 +319,11 @@

    }

    @Override
    public List<MenuVO> getButtonList(String roleId) {
        return baseMapper.getButtonList(Func.toLongList(roleId));
    }


    public WebMenuVO buildWebMenuVO(MenuVO menuVO){
        WebMenuVO webMenuVO = new WebMenuVO();