suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复角色菜单临时接口

Browse Source
This commit is contained in:
zhangchenbiao
2023-08-01 14:49:05 +08:00
parent d3a8e2d40e
commit cd46416a3c
8 changed files with 6 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-dao/src/main/java/com/cool/store/dao/SysMenuDAO.java
View File

@@ -38,7 +38,7 @@ public class SysMenuDAO {
* @return
*/
public Integer batchDeleteMenu(List<Long> idList){
if(CollectionUtils.isNotEmpty(idList)){
if(CollectionUtils.isEmpty(idList)){
return CommonConstants.ZERO;
}
return sysMenuMapper.batchDeleteMenu(idList);

93
coolstore-partner-dao/src/main/resources/mapper/SysMenuMapper.xml
View File

@@ -6,27 +6,17 @@
<result column="parent_id" jdbcType="BIGINT" property="parentId"/>
<result column="code" jdbcType="VARCHAR" property="code"/>
<result column="name" jdbcType="VARCHAR" property="name"/>
<result column="alias" jdbcType="VARCHAR" property="alias"/>
<result column="path" jdbcType="VARCHAR" property="path"/>
<result column="perms" jdbcType="VARCHAR" property="perms"/>
<result column="source" jdbcType="VARCHAR" property="source"/>
<result column="sort" jdbcType="INTEGER" property="sort"/>
<result column="category" jdbcType="INTEGER" property="category"/>
<result column="action" jdbcType="INTEGER" property="action"/>
<result column="remark" jdbcType="VARCHAR" property="remark"/>
<result column="platform" jdbcType="VARCHAR" property="platform"/>
<result column="is_deleted" jdbcType="INTEGER" property="isDeleted"/>
<result column="type" jdbcType="VARCHAR" property="type"/>
<result column="target" jdbcType="VARCHAR" property="target"/>
<result column="component" jdbcType="VARCHAR" property="component"/>
<result column="icon" jdbcType="VARCHAR" property="icon"/>
<result column="menu_type" jdbcType="TINYINT" property="menuType"/>
<result column="env" jdbcType="VARCHAR" property="env"/>
<result column="common_functions_icon" jdbcType="VARCHAR" property="commonFunctionsIcon"/>
</resultMap>
<sql id="Base_Column_List">
id, parent_id, code, name, alias, path, perms, source, sort, category, action, remark,
platform, is_deleted, type, target, component, icon, menu_type, env, common_functions_icon
id, parent_id, code, name, path, sort, remark, is_deleted, type, icon, menu_type, env
</sql>
<insert id="insertSelective" keyColumn="id" keyProperty="id" useGeneratedKeys="true">
insert into sys_menu
@@ -40,45 +30,21 @@
<if test="name != null">
name,
</if>
<if test="alias != null">
alias,
</if>
<if test="path != null">
path,
</if>
<if test="perms != null">
perms,
</if>
<if test="source != null">
source,
</if>
<if test="sort != null">
sort,
</if>
<if test="category != null">
category,
</if>
<if test="action != null">
action,
</if>
<if test="remark != null">
remark,
</if>
<if test="platform != null">
platform,
</if>
<if test="isDeleted != null">
is_deleted,
</if>
<if test="type != null">
type,
</if>
<if test="target != null">
target,
</if>
<if test="component != null">
component,
</if>
<if test="icon != null">
icon,
</if>
@@ -88,9 +54,6 @@
<if test="env != null">
env,
</if>
<if test="commonFunctionsIcon != null">
common_functions_icon,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="parentId != null">
@@ -102,45 +65,21 @@
<if test="name != null">
#{name},
</if>
<if test="alias != null">
#{alias},
</if>
<if test="path != null">
#{path},
</if>
<if test="perms != null">
#{perms},
</if>
<if test="source != null">
#{source},
</if>
<if test="sort != null">
#{sort},
</if>
<if test="category != null">
#{category},
</if>
<if test="action != null">
#{action},
</if>
<if test="remark != null">
#{remark},
</if>
<if test="platform != null">
#{platform},
</if>
<if test="isDeleted != null">
#{isDeleted},
</if>
<if test="type != null">
#{type},
</if>
<if test="target != null">
#{target},
</if>
<if test="component != null">
#{component},
</if>
<if test="icon != null">
#{icon},
</if>
@@ -150,9 +89,6 @@
<if test="env != null">
#{env},
</if>
<if test="commonFunctionsIcon != null">
#{commonFunctionsIcon},
</if>
</trim>
</insert>
<update id="batchUpdateMenu">
@@ -168,45 +104,21 @@
<if test="record.name != null">
name = #{record.name},
</if>
<if test="record.alias != null">
alias = #{record.alias},
</if>
<if test="record.path != null">
path = #{record.path},
</if>
<if test="record.perms != null">
perms = #{record.perms},
</if>
<if test="record.source != null">
source = #{record.source},
</if>
<if test="record.sort != null">
sort = #{record.sort},
</if>
<if test="record.category != null">
category = #{record.category},
</if>
<if test="record.action != null">
action = #{record.action},
</if>
<if test="record.remark != null">
remark = #{record.remark},
</if>
<if test="record.platform != null">
platform = #{record.platform},
</if>
<if test="record.isDeleted != null">
is_deleted = #{record.isDeleted},
</if>
<if test="record.type != null">
type = #{record.type},
</if>
<if test="record.target != null">
target = #{record.target},
</if>
<if test="record.component != null">
component = #{record.component},
</if>
<if test="record.icon != null">
icon = #{record.icon},
</if>
@@ -216,9 +128,6 @@
<if test="record.env != null">
env = #{record.env},
</if>
<if test="record.commonFunctionsIcon != null">
common_functions_icon = #{record.commonFunctionsIcon},
</if>
</set>
where id = #{record.id}
</foreach>

5
coolstore-partner-model/src/main/java/com/cool/store/dto/menu/AddMenuDTO.java
View File

@@ -42,11 +42,6 @@ public class AddMenuDTO {
sysMenuDO.setCode(param.getName());
sysMenuDO.setPath(param.getPath());
sysMenuDO.setType(param.getType());
sysMenuDO.setSource("menu");
sysMenuDO.setAction(1);
sysMenuDO.setPlatform("PC");
sysMenuDO.setComponent(param.getComponent());
sysMenuDO.setTarget(param.getTarget());
sysMenuDO.setIcon(param.getIcon());
sysMenuDO.setMenuType(menuTypeEnum.getCode());
return sysMenuDO;

27
coolstore-partner-model/src/main/java/com/cool/store/entity/SysMenuDO.java
View File

@@ -29,45 +29,21 @@ public class SysMenuDO implements Serializable {
@ApiModelProperty("菜单名称")
private String name;
@ApiModelProperty("菜单别名")
private String alias;
@ApiModelProperty("请求地址(前端路由)")
private String path;
@ApiModelProperty("后端权限标识")
private String perms;
@ApiModelProperty("菜单资源(图片)")
private String source;
@ApiModelProperty("排序")
private Integer sort;
@ApiModelProperty("菜单类型(菜单，按钮)")
private Integer category;
@ApiModelProperty("操作按钮类型(工具栏，操作栏，工具操作栏)")
private Integer action;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("所属项目（PC，小程序）")
private String platform;
@ApiModelProperty("是否已删除")
private Integer isDeleted;
@ApiModelProperty("操作类型")
private String type;
@ApiModelProperty("是否新开页面")
private String target;
@ApiModelProperty("组件")
private String component;
@ApiModelProperty("图标")
private String icon;
@@ -76,7 +52,4 @@ public class SysMenuDO implements Serializable {
@ApiModelProperty("环境")
private String env;
@ApiModelProperty("常用功能_图标")
private String commonFunctionsIcon;
}

14
coolstore-partner-model/src/main/java/com/cool/store/vo/menu/MenuAuthTreeVO.java
View File

@@ -35,18 +35,9 @@ public class MenuAuthTreeVO {
@ApiModelProperty("父级菜单")
private Long parentId;
@ApiModelProperty("是否新开页面")
private String target;
@ApiModelProperty("组件")
private String component;
@ApiModelProperty("图标'")
private String icon;
@ApiModelProperty("常用功能图标")
private String commonFunctionsIcon;
@ApiModelProperty("菜单类型 1菜单 2权限")
private Integer menuType;
@@ -83,11 +74,8 @@ public class MenuAuthTreeVO {
vo.setName(menu.getName());
vo.setCode(menu.getType());
vo.setPath(menu.getPath());
vo.setComponent(menu.getComponent());
vo.setTarget(menu.getTarget());
vo.setIcon(menu.getIcon());
vo.setMenuType(menu.getMenuType());
vo.setCommonFunctionsIcon(menu.getCommonFunctionsIcon());
resultList.add(vo);
}
return resultList;
@@ -100,8 +88,6 @@ public class MenuAuthTreeVO {
//属于菜单下时候
if (CollectionUtils.isNotEmpty(parentMenuList)) {
List<MenuAuthTreeVO> voList = convertVO(parentMenuList);
List<MenuAuthTreeVO> authorityList = convertVO(parentAuthList);
data.setAuthorityList(authorityList);
List<MenuAuthTreeVO> menuList = voList.stream().filter(vo -> MenuTypeEnum.MENU.getCode().equals(vo.getMenuType())).collect(Collectors.toList());
data.setChildren(menuList);
voList.forEach(child -> {

14
coolstore-partner-model/src/main/java/com/cool/store/vo/menu/MenuTreeVO.java
View File

@@ -35,18 +35,9 @@ public class MenuTreeVO {
@ApiModelProperty("父级菜单")
private Long parentId;
@ApiModelProperty("是否新开页面")
private String target;
@ApiModelProperty("组件")
private String component;
@ApiModelProperty("图标'")
private String icon;
@ApiModelProperty("常用功能图标")
private String commonFunctionsIcon;
@ApiModelProperty("菜单类型 1菜单 2权限")
private Integer menuType;
@@ -83,11 +74,8 @@ public class MenuTreeVO {
vo.setName(menu.getName());
vo.setCode(menu.getType());
vo.setPath(menu.getPath());
vo.setComponent(menu.getComponent());
vo.setTarget(menu.getTarget());
vo.setIcon(menu.getIcon());
vo.setMenuType(menu.getMenuType());
vo.setCommonFunctionsIcon(menu.getCommonFunctionsIcon());
resultList.add(vo);
}
return resultList;
@@ -100,8 +88,6 @@ public class MenuTreeVO {
//属于菜单下时候
if (CollectionUtils.isNotEmpty(parentMenuList)) {
List<MenuTreeVO> voList = convertVO(parentMenuList);
List<String> authList = parentMenuList.stream().map(SysMenuDO::getType).collect(Collectors.toList());
data.setAuthorityList(authList);
List<MenuTreeVO> menuList = voList.stream().filter(vo -> MenuTypeEnum.MENU.getCode().equals(vo.getMenuType())).collect(Collectors.toList());
data.setChildren(menuList);
voList.forEach(child -> {

12
coolstore-partner-service/src/main/java/com/cool/store/service/impl/MenuServiceImpl.java
View File

@@ -13,7 +13,6 @@ import com.cool.store.utils.CommonNodeUtils;
import com.cool.store.vo.menu.MenuAuthTreeVO;
import com.cool.store.vo.menu.MenuTreeVO;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.ListUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -68,14 +67,9 @@ public class MenuServiceImpl implements MenuService {
@Override
public Long deleteMenuAuth(Long id) {
List<SysMenuDO> sysMenuDOList = sysMenuDAO.selectMenuAll(null, PlatFormTypeEnum.PC.getCode());
List<Long> idList = ListUtils.emptyIfNull(sysMenuDOList)
.stream()
.map(SysMenuDO::getId)
.collect(Collectors.toList());
Map<Long, List<Long>> parentGroupMap = ListUtils.emptyIfNull(sysMenuDOList)
.stream()
.collect(Collectors.groupingBy(SysMenuDO::getParentId, Collectors.mapping(SysMenuDO::getId, Collectors.toList())));
List<SysMenuDO> menuList = sysMenuDAO.selectMenuAll(null, PlatFormTypeEnum.PC.getCode());
List<Long> idList = menuList.stream().map(SysMenuDO::getId).collect(Collectors.toList());
Map<Long, List<Long>> parentGroupMap = menuList.stream().collect(Collectors.groupingBy(SysMenuDO::getParentId, Collectors.mapping(SysMenuDO::getId, Collectors.toList())));
List<Long> allChildList = CommonNodeUtils.getAllChildListContainSelf(0L,id, idList, parentGroupMap);
sysMenuDAO.batchDeleteMenu(allChildList);
return null;

2
coolstore-partner-webb/src/main/java/com/cool/store/config/swagger/Swagger2Config.java
View File

@@ -52,7 +52,7 @@ public class Swagger2Config {
.groupName(groupName)
.select()
.apis(this.scanBasePackage(packages))
.paths(PathSelectors.regex(".*/menu/getAllMenus|.*/menu/add|.*/menu/auth/add|.*/role.*"))
//.paths(PathSelectors.regex(".*/menu/.*|.*/role.*"))
.build()
.globalOperationParameters(pars);
}