From 10c8f3a910cb18653b18195eefdd41cbd1517f6b Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Mon, 18 Apr 2022 17:24:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SystemMenuServiceImpl.java | 12 +++++++++-- .../impl/SystemRoleMenuServiceImpl.java | 2 +- .../validate/system/SystemMenuParam.java | 20 +++++++++++++++++-- .../hxkj/admin/vo/system/SystemMenuVo.java | 4 ++++ .../hxkj/common/entity/system/SystemMenu.java | 4 ++++ 5 files changed, 37 insertions(+), 5 deletions(-) diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemMenuServiceImpl.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemMenuServiceImpl.java index 8d3b1851..73ccc78a 100644 --- a/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemMenuServiceImpl.java +++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemMenuServiceImpl.java @@ -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 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 systemMenus = systemMenuMapper.selectList(queryWrapper); + List 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); diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleMenuServiceImpl.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleMenuServiceImpl.java index de55fc11..80c83792 100644 --- a/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleMenuServiceImpl.java +++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleMenuServiceImpl.java @@ -109,7 +109,7 @@ public class SystemRoleMenuServiceImpl implements ISystemRoleMenuService { if (menuIds.size() > 0) { List systemMenus = systemMenuMapper.selectList(new QueryWrapper() .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"))); diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemMenuParam.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemMenuParam.java index 967e3863..c29b8cf3 100644 --- a/like-framework/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemMenuParam.java +++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemMenuParam.java @@ -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; } diff --git a/like-framework/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemMenuVo.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemMenuVo.java index 0d3bdfe7..6c1ca055 100644 --- a/like-framework/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemMenuVo.java +++ b/like-framework/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemMenuVo.java @@ -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; diff --git a/like-framework/like-common/src/main/java/com/hxkj/common/entity/system/SystemMenu.java b/like-framework/like-common/src/main/java/com/hxkj/common/entity/system/SystemMenu.java index ab983671..dabc656f 100644 --- a/like-framework/like-common/src/main/java/com/hxkj/common/entity/system/SystemMenu.java +++ b/like-framework/like-common/src/main/java/com/hxkj/common/entity/system/SystemMenu.java @@ -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;