修改菜单

This commit is contained in:
TinyAnts 2022-04-18 17:24:40 +08:00
parent 53ab7c692f
commit 10c8f3a910
5 changed files with 37 additions and 5 deletions

View File

@ -8,7 +8,6 @@ import com.hxkj.admin.config.AdminConfig;
import com.hxkj.admin.service.ISystemMenuService;
import com.hxkj.admin.service.ISystemRoleMenuService;
import com.hxkj.admin.validate.system.SystemMenuParam;
import com.hxkj.admin.vo.system.SystemAuthVo;
import com.hxkj.admin.vo.system.SystemMenuVo;
import com.hxkj.common.entity.system.SystemMenu;
import com.hxkj.common.mapper.system.SystemMenuMapper;
@ -20,7 +19,6 @@ import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@Service
public class SystemMenuServiceImpl implements ISystemMenuService {
@ -45,12 +43,14 @@ public class SystemMenuServiceImpl implements ISystemMenuService {
QueryWrapper<SystemMenu> queryWrapper = new QueryWrapper<>();
queryWrapper.in("menu_type", Arrays.asList("M", "C"));
queryWrapper.eq("is_show", 1);
queryWrapper.orderByAsc(Arrays.asList("menu_sort", "id"));
if (adminId != 1 && menuIds.size() > 0) {
queryWrapper.in("id", menuIds);
}
List<SystemMenu> systemMenus = systemMenuMapper.selectList(queryWrapper);
List<SystemMenuVo> lists = new ArrayList<>();
for (SystemMenu systemMenu : systemMenus) {
SystemMenuVo vo = new SystemMenuVo();
@ -129,6 +129,10 @@ public class SystemMenuServiceImpl implements ISystemMenuService {
model.setPerms(systemMenuParam.getPerms());
model.setPaths(systemMenuParam.getPaths());
model.setComponent(systemMenuParam.getComponent());
model.setSelected(systemMenuParam.getSelected());
model.setParams(systemMenuParam.getParams());
model.setIsCache(systemMenuParam.getIsCache());
model.setIsShow(systemMenuParam.getIsShow());
model.setIsDisable(systemMenuParam.getIsDisable());
model.setCreateTime(System.currentTimeMillis() / 1000);
model.setUpdateTime(System.currentTimeMillis() / 1000);
@ -154,6 +158,10 @@ public class SystemMenuServiceImpl implements ISystemMenuService {
model.setPerms(systemMenuParam.getPerms());
model.setComponent(systemMenuParam.getComponent());
model.setPid(systemMenuParam.getPid());
model.setSelected(systemMenuParam.getSelected());
model.setParams(systemMenuParam.getParams());
model.setIsCache(systemMenuParam.getIsCache());
model.setIsShow(systemMenuParam.getIsShow());
model.setIsDisable(systemMenuParam.getIsDisable());
model.setUpdateTime(System.currentTimeMillis() / 1000);
systemMenuMapper.updateById(model);

View File

@ -109,7 +109,7 @@ public class SystemRoleMenuServiceImpl implements ISystemRoleMenuService {
if (menuIds.size() > 0) {
List<SystemMenu> systemMenus = systemMenuMapper.selectList(new QueryWrapper<SystemMenu>()
.select("id,perms")
.eq("is_disable", 0)
.eq("is_show", 0)
.in("id", menuIds)
.in("menu_type", Arrays.asList("C", "A"))
.orderByAsc(Arrays.asList("menu_sort", "id")));

View File

@ -1,6 +1,7 @@
package com.hxkj.admin.validate.system;
import com.hxkj.common.validator.annotation.IDMust;
import com.hxkj.common.validator.annotation.IntegerContains;
import com.hxkj.common.validator.annotation.StringContains;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -52,10 +53,25 @@ public class SystemMenuParam implements Serializable {
@Length(max = 200, message = "路由地址不能超过200个字符", groups = {create.class, update.class})
private String paths;
@Length(max = 100, message = "前端组件不能超过200个字符", groups = {create.class, update.class})
@Length(max = 200, message = "前端组件不能超过200个字符", groups = {create.class, update.class})
private String component;
@NotNull(message = "请选择状态", groups = {create.class, update.class})
@Length(max = 200, message = "选中菜单路径不能超过200个字符", groups = {create.class, update.class})
private String selected;
@Length(max = 200, message = "路由参数不能超过200个字符", groups = {create.class, update.class})
private String params;
@NotNull(message = "请选择缓存状态", groups = {create.class, update.class})
@IntegerContains(values = {0, 1}, groups = {create.class, update.class})
private Integer isCache;
@NotNull(message = "请选择显示状态", groups = {create.class, update.class})
@IntegerContains(values = {0, 1}, groups = {create.class, update.class})
private Integer isShow;
@NotNull(message = "请选择菜单状态", groups = {create.class, update.class})
@IntegerContains(values = {0, 1}, groups = {create.class, update.class})
private Integer isDisable;
}

View File

@ -21,6 +21,10 @@ public class SystemMenuVo implements Serializable {
private String perms;
private String paths;
private String component;
private String selected;
private String params;
private Integer isCache;
private Integer isShow;
private Integer isDisable;
private String createTime;
private String updateTime;

View File

@ -24,6 +24,10 @@ public class SystemMenu implements Serializable {
private String perms;
private String paths;
private String component;
private String selected;
private String params;
private Integer isCache;
private Integer isShow;
private Integer isDisable;
private Long createTime;
private Long updateTime;