diff --git a/ruoyi-system/src/main/java/com/ruoyi/official/domain/GwLable.java b/ruoyi-system/src/main/java/com/ruoyi/official/domain/GwLable.java index e8227c6..96e414e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/official/domain/GwLable.java +++ b/ruoyi-system/src/main/java/com/ruoyi/official/domain/GwLable.java @@ -39,7 +39,27 @@ public class GwLable extends BaseEntity { /** * 标签名称 */ - private String businessName; + private String menuName; + /** + * 父菜单ID + */ + private Long parentId; + /** + * 显示顺序 + */ + private Long orderNum; + /** + * 显示状态（0显示 1隐藏） + */ + private String visible; + /** + * 菜单类型（M目录 C菜单） + */ + private String menuType; + /** + * 是否为外链（0是 1否）1 + */ + private Long isFrame; /** * 创建者id */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/official/domain/bo/GwLableBo.java b/ruoyi-system/src/main/java/com/ruoyi/official/domain/bo/GwLableBo.java index 4d066c1..c3b92f3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/official/domain/bo/GwLableBo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/official/domain/bo/GwLableBo.java @@ -44,7 +44,37 @@ public class GwLableBo extends BaseEntity { * 标签名称 */ @NotBlank(message = "标签名称不能为空", groups = { AddGroup.class, EditGroup.class }) - private String businessName; + private String menuName; + + /** + * 父菜单ID + */ + @NotNull(message = "父菜单ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long parentId; + + /** + * 显示顺序 + */ + @NotNull(message = "显示顺序不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long orderNum; + + /** + * 显示状态（0显示 1隐藏） + */ + @NotBlank(message = "显示状态（0显示 1隐藏）不能为空", groups = { AddGroup.class, EditGroup.class }) + private String visible; + + /** + * 菜单类型（M目录 C菜单） + */ + @NotBlank(message = "菜单类型（M目录 C菜单）不能为空", groups = { AddGroup.class, EditGroup.class }) + private String menuType; + + /** + * 是否为外链（0是 1否）1 + */ + @NotNull(message = "是否为外链（0是 1否）1不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long isFrame; /** * 创建者id diff --git a/ruoyi-system/src/main/java/com/ruoyi/official/domain/vo/GwLableVo.java b/ruoyi-system/src/main/java/com/ruoyi/official/domain/vo/GwLableVo.java index 07bfc6e..9a50543 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/official/domain/vo/GwLableVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/official/domain/vo/GwLableVo.java @@ -44,7 +44,40 @@ public class GwLableVo { * 标签名称 */ @ExcelProperty(value = "标签名称") - private String businessName; + private String menuName; + + /** + * 父菜单ID + */ + @ExcelProperty(value = "父菜单ID") + private Long parentId; + + /** + * 显示顺序 + */ + @ExcelProperty(value = "显示顺序") + private Long orderNum; + + /** + * 显示状态（0显示 1隐藏） + */ + @ExcelProperty(value = "显示状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0=显示,1=隐藏") + private String visible; + + /** + * 菜单类型（M目录 C菜单） + */ + @ExcelProperty(value = "菜单类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "M=目录,C=菜单") + private String menuType; + + /** + * 是否为外链（0是 1否）1 + */ + @ExcelProperty(value = "是否为外链", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0=是,1=否") + private Long isFrame; /** * 创建者id @@ -59,4 +92,5 @@ public class GwLableVo { private Long updateUserId; + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/official/service/impl/GwLableServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/official/service/impl/GwLableServiceImpl.java index 051ad8e..9715b9b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/official/service/impl/GwLableServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/official/service/impl/GwLableServiceImpl.java @@ -43,7 +43,7 @@ public class GwLableServiceImpl implements IGwLableService { /** * 查询标签封面信息 -列表 + 列表 */ @Override public TableDataInfo queryPageList(GwLableBo bo, PageQuery pageQuery) { @@ -54,7 +54,7 @@ public class GwLableServiceImpl implements IGwLableService { /** * 查询标签封面信息 -列表 + 列表 */ @Override public List queryList(GwLableBo bo) { @@ -67,7 +67,12 @@ public class GwLableServiceImpl implements IGwLableService { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(StringUtils.isNotBlank(bo.getImageurl()), GwLable::getImageurl, bo.getImageurl()); lqw.eq(StringUtils.isNotBlank(bo.getFileType()), GwLable::getFileType, bo.getFileType()); - lqw.like(StringUtils.isNotBlank(bo.getBusinessName()), GwLable::getBusinessName, bo.getBusinessName()); + lqw.like(StringUtils.isNotBlank(bo.getMenuName()), GwLable::getMenuName, bo.getMenuName()); + lqw.eq(bo.getParentId() != null, GwLable::getParentId, bo.getParentId()); + lqw.eq(bo.getOrderNum() != null, GwLable::getOrderNum, bo.getOrderNum()); + lqw.eq(StringUtils.isNotBlank(bo.getVisible()), GwLable::getVisible, bo.getVisible()); + lqw.eq(StringUtils.isNotBlank(bo.getMenuType()), GwLable::getMenuType, bo.getMenuType()); + lqw.eq(bo.getIsFrame() != null, GwLable::getIsFrame, bo.getIsFrame()); lqw.eq(bo.getCreateUserId() != null, GwLable::getCreateUserId, bo.getCreateUserId()); lqw.eq(bo.getUpdateUserId() != null, GwLable::getUpdateUserId, bo.getUpdateUserId()); return lqw; diff --git a/ruoyi-ui/src/views/official/lable/index.vue b/ruoyi-ui/src/views/official/lable/index.vue index 446f244..d3fb5dc 100644 --- a/ruoyi-ui/src/views/official/lable/index.vue +++ b/ruoyi-ui/src/views/official/lable/index.vue @@ -9,14 +9,46 @@ @keyup.enter.native="handleQuery" /> - + + + + + + + + + + + + + - + + + + + + @@ -128,8 +165,20 @@ - - + + + + + + + + + + + + + + @@ -179,7 +228,12 @@ export default { pageSize: 10, imageurl: undefined, fileType: undefined, - businessName: undefined, + menuName: undefined, + parentId: undefined, + orderNum: undefined, + visible: undefined, + menuType: undefined, + isFrame: undefined, createUserId: undefined, updateUserId: undefined, }, @@ -196,9 +250,24 @@ export default { fileType: [ { required: true, message: "文件类型 0：图片 1：视频不能为空", trigger: "change" } ], - businessName: [ + menuName: [ { required: true, message: "标签名称不能为空", trigger: "blur" } ], + parentId: [ + { required: true, message: "父菜单ID不能为空", trigger: "blur" } + ], + orderNum: [ + { required: true, message: "显示顺序不能为空", trigger: "blur" } + ], + visible: [ + { required: true, message: "显示状态不能为空", trigger: "blur" } + ], + menuType: [ + { required: true, message: "菜单类型不能为空", trigger: "change" } + ], + isFrame: [ + { required: true, message: "是否为外链不能为空", trigger: "blur" } + ], createUserId: [ { required: true, message: "创建者id不能为空", trigger: "blur" } ], @@ -233,7 +302,12 @@ export default { id: undefined, imageurl: undefined, fileType: undefined, - businessName: undefined, + menuName: undefined, + parentId: undefined, + orderNum: undefined, + visible: undefined, + menuType: undefined, + isFrame: undefined, createBy: undefined, createUserId: undefined, createTime: undefined,