From 7c9e9ceddaa0afa45d0c651a063da317725592bf Mon Sep 17 00:00:00 2001 From: keyinghao Date: Fri, 26 Jul 2019 16:39:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/common/bean/qo/SysMenuQO.java | 115 ++++++++++-------- .../system/common/bean/vo/SysMenuVO.java | 6 +- .../service/biz/pc/PcApiSysMenuBiz.java | 6 + .../service/common/req/SysMenuSaveREQ.java | 6 +- .../service/common/req/SysMenuUpdateREQ.java | 6 +- .../service/common/resq/SysMenuRESQ.java | 6 +- .../service/common/resq/SysMenuUserRESQ.java | 2 +- .../service/common/resq/SysMenuViewRESQ.java | 6 +- .../dao/impl/mapper/entity/SysMenu.java | 12 +- .../impl/mapper/entity/SysMenuExample.java | 58 ++++----- .../main/resources/mybatis/SysMenuMapper.xml | 28 ++--- .../education/util/enums/HiddenTypeEnum.java | 22 ++++ 12 files changed, 149 insertions(+), 124 deletions(-) create mode 100644 roncoo-education-util/src/main/java/com/roncoo/education/util/enums/HiddenTypeEnum.java diff --git a/roncoo-education-system/roncoo-education-system-common/src/main/java/com/roncoo/education/system/common/bean/qo/SysMenuQO.java b/roncoo-education-system/roncoo-education-system-common/src/main/java/com/roncoo/education/system/common/bean/qo/SysMenuQO.java index 09648522..7e0f9863 100644 --- a/roncoo-education-system/roncoo-education-system-common/src/main/java/com/roncoo/education/system/common/bean/qo/SysMenuQO.java +++ b/roncoo-education-system/roncoo-education-system-common/src/main/java/com/roncoo/education/system/common/bean/qo/SysMenuQO.java @@ -3,6 +3,7 @@ package com.roncoo.education.system.common.bean.qo; import java.io.Serializable; import java.util.Date; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -15,58 +16,64 @@ import lombok.experimental.Accessors; @Accessors(chain = true) public class SysMenuQO implements Serializable { - private static final long serialVersionUID = 1L; - - /** - * 当前页 - */ - private int pageCurrent; - /** - * 每页记录数 - */ - private int pageSize; - /** - * 主键 - */ - private Long id; - /** - * 创建时间 - */ - private Date gmtCreate; - /** - * 修改时间 - */ - private Date gmtModified; - /** - * 状态(1:正常,0:禁用) - */ - private Integer statusId; - /** - * 排序 - */ - private Integer sort; - /** - * 父ID - */ - private Long parentId; - /** - * 菜单名称 - */ - private String menuName; - /** - * 菜单路径 - */ - private String menuUrl; - /** - * 菜单图标 - */ - private String menuIcon; - /** - * 目标名称 - */ - private String targetName; - /** - * 备注 - */ - private String remark; + private static final long serialVersionUID = 1L; + + /** + * 当前页 + */ + private int pageCurrent; + /** + * 每页记录数 + */ + private int pageSize; + /** + * 主键 + */ + private Long id; + /** + * 创建时间 + */ + private Date gmtCreate; + /** + * 修改时间 + */ + private Date gmtModified; + /** + * 状态(1:正常,0:禁用) + */ + private Integer statusId; + /** + * 排序 + */ + private Integer sort; + /** + * 父ID + */ + private Long parentId; + /** + * 菜单名称 + */ + private String menuName; + /** + * 菜单路径 + */ + private String menuUrl; + /** + * 接口URL + */ + @ApiModelProperty(value = "接口URL") + private String apiUrl; + /** + * 菜单图标 + */ + private String menuIcon; + /** + * 是否显示(1: 显示;0:不显示) + */ + @ApiModelProperty(value = "是否显示(1: 显示;0:不显示)") + private Integer hiddenType; + /** + * 备注 + */ + private String remark; } diff --git a/roncoo-education-system/roncoo-education-system-common/src/main/java/com/roncoo/education/system/common/bean/vo/SysMenuVO.java b/roncoo-education-system/roncoo-education-system-common/src/main/java/com/roncoo/education/system/common/bean/vo/SysMenuVO.java index bd45aca2..114b6fdf 100644 --- a/roncoo-education-system/roncoo-education-system-common/src/main/java/com/roncoo/education/system/common/bean/vo/SysMenuVO.java +++ b/roncoo-education-system/roncoo-education-system-common/src/main/java/com/roncoo/education/system/common/bean/vo/SysMenuVO.java @@ -65,10 +65,10 @@ public class SysMenuVO implements Serializable { */ private String remark; /** - * 是否显示(true: 显示;false:不显示) + * 是否显示(1: 显示;0:不显示) */ - @ApiModelProperty(value = "是否显示(true: 显示;false:不显示)") - private String hidden; + @ApiModelProperty(value = "是否显示(1: 显示;0:不显示)") + private Integer hiddenType; /** * 菜单集合 */ diff --git a/roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/biz/pc/PcApiSysMenuBiz.java b/roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/biz/pc/PcApiSysMenuBiz.java index ab06dad6..bc9f42b3 100644 --- a/roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/biz/pc/PcApiSysMenuBiz.java +++ b/roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/biz/pc/PcApiSysMenuBiz.java @@ -29,6 +29,7 @@ import com.roncoo.education.system.service.dao.impl.mapper.entity.SysMenuRole; import com.roncoo.education.system.service.dao.impl.mapper.entity.SysRoleUser; import com.roncoo.education.system.service.dao.impl.mapper.entity.SysUser; import com.roncoo.education.util.base.Result; +import com.roncoo.education.util.enums.HiddenTypeEnum; import com.roncoo.education.util.enums.ResultEnum; import com.roncoo.education.util.tools.BeanUtil; import com.xiaoleilu.hutool.util.CollectionUtil; @@ -206,6 +207,11 @@ public class PcApiSysMenuBiz { if (CollectionUtil.isNotEmpty(list)) { for (SysMenu m : list) { SysMenuUserRESQ resq = BeanUtil.copyProperties(m, SysMenuUserRESQ.class); + if (HiddenTypeEnum.YES.getCode().equals(m.getHiddenType())) { + resq.setHidden(false); + } else { + resq.setHidden(true); + } resq.setName(m.getMenuName()); resq.setPath(m.getMenuUrl()); resq.setIcon(m.getMenuIcon()); diff --git a/roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/common/req/SysMenuSaveREQ.java b/roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/common/req/SysMenuSaveREQ.java index 8e65a298..21157bf3 100644 --- a/roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/common/req/SysMenuSaveREQ.java +++ b/roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/common/req/SysMenuSaveREQ.java @@ -48,10 +48,10 @@ public class SysMenuSaveREQ implements Serializable { @ApiModelProperty(value = "备注") private String remark; /** - * 是否显示(true: 显示;false:不显示) + * 是否显示(1: 显示;0:不显示) */ - @ApiModelProperty(value = "是否显示(true: 显示;false:不显示)") - private String hidden; + @ApiModelProperty(value = "是否显示(1: 显示;0:不显示)") + private Integer hiddenType; /** * 排序 */ diff --git a/roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/common/req/SysMenuUpdateREQ.java b/roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/common/req/SysMenuUpdateREQ.java index 8909aaa5..b4a3f3c6 100644 --- a/roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/common/req/SysMenuUpdateREQ.java +++ b/roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/common/req/SysMenuUpdateREQ.java @@ -63,8 +63,8 @@ public class SysMenuUpdateREQ implements Serializable { @ApiModelProperty(value = "备注") private String remark; /** - * 是否显示(true: 显示;false:不显示) + * 是否显示(1: 显示;0:不显示) */ - @ApiModelProperty(value = "是否显示(true: 显示;false:不显示)") - private String hidden; + @ApiModelProperty(value = "是否显示(1: 显示;0:不显示)") + private Integer hiddenType; } diff --git a/roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/common/resq/SysMenuRESQ.java b/roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/common/resq/SysMenuRESQ.java index a1e35880..2479d85a 100644 --- a/roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/common/resq/SysMenuRESQ.java +++ b/roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/common/resq/SysMenuRESQ.java @@ -75,10 +75,10 @@ public class SysMenuRESQ implements Serializable { @ApiModelProperty(value = "备注") private String remark; /** - * 是否显示(true: 显示;false:不显示) + * 是否显示(1: 显示;0:不显示) */ - @ApiModelProperty(value = "是否显示(true: 显示;false:不显示)") - private String hidden; + @ApiModelProperty(value = "是否显示(1: 显示;0:不显示)") + private Integer hiddenType; /** * 下级菜单集合 */ diff --git a/roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/common/resq/SysMenuUserRESQ.java b/roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/common/resq/SysMenuUserRESQ.java index 24822407..b8007619 100644 --- a/roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/common/resq/SysMenuUserRESQ.java +++ b/roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/common/resq/SysMenuUserRESQ.java @@ -51,7 +51,7 @@ public class SysMenuUserRESQ implements Serializable { * 是否显示(true: 显示;false:不显示) */ @ApiModelProperty(value = "是否显示(true: 显示;false:不显示)") - private String hidden; + private boolean hidden; /** * 下级菜单集合 */ diff --git a/roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/common/resq/SysMenuViewRESQ.java b/roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/common/resq/SysMenuViewRESQ.java index 908a2fb8..389fc53d 100644 --- a/roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/common/resq/SysMenuViewRESQ.java +++ b/roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/common/resq/SysMenuViewRESQ.java @@ -68,8 +68,8 @@ public class SysMenuViewRESQ implements Serializable { @ApiModelProperty(value = "备注") private String remark; /** - * 是否显示(true: 显示;false:不显示) + * 是否显示(1: 显示;0:不显示) */ - @ApiModelProperty(value = "是否显示(true: 显示;false:不显示)") - private String hidden; + @ApiModelProperty(value = "是否显示(1: 显示;0:不显示)") + private Integer hiddenType; } diff --git a/roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/dao/impl/mapper/entity/SysMenu.java b/roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/dao/impl/mapper/entity/SysMenu.java index 6ff04f54..22361a36 100644 --- a/roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/dao/impl/mapper/entity/SysMenu.java +++ b/roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/dao/impl/mapper/entity/SysMenu.java @@ -26,7 +26,7 @@ public class SysMenu implements Serializable { private String remark; - private String hidden; + private Integer hiddenType; private static final long serialVersionUID = 1L; @@ -118,12 +118,12 @@ public class SysMenu implements Serializable { this.remark = remark == null ? null : remark.trim(); } - public String getHidden() { - return hidden; + public Integer getHiddenType() { + return hiddenType; } - public void setHidden(String hidden) { - this.hidden = hidden == null ? null : hidden.trim(); + public void setHiddenType(Integer hiddenType) { + this.hiddenType = hiddenType; } @Override @@ -143,7 +143,7 @@ public class SysMenu implements Serializable { sb.append(", apiUrl=").append(apiUrl); sb.append(", menuIcon=").append(menuIcon); sb.append(", remark=").append(remark); - sb.append(", hidden=").append(hidden); + sb.append(", hiddenType=").append(hiddenType); sb.append(", serialVersionUID=").append(serialVersionUID); sb.append("]"); return sb.toString(); diff --git a/roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/dao/impl/mapper/entity/SysMenuExample.java b/roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/dao/impl/mapper/entity/SysMenuExample.java index 2f507856..aa436bf3 100644 --- a/roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/dao/impl/mapper/entity/SysMenuExample.java +++ b/roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/dao/impl/mapper/entity/SysMenuExample.java @@ -835,73 +835,63 @@ public class SysMenuExample { return (Criteria) this; } - public Criteria andHiddenIsNull() { - addCriterion("hidden is null"); + public Criteria andHiddenTypeIsNull() { + addCriterion("hidden_type is null"); return (Criteria) this; } - public Criteria andHiddenIsNotNull() { - addCriterion("hidden is not null"); + public Criteria andHiddenTypeIsNotNull() { + addCriterion("hidden_type is not null"); return (Criteria) this; } - public Criteria andHiddenEqualTo(String value) { - addCriterion("hidden =", value, "hidden"); + public Criteria andHiddenTypeEqualTo(Integer value) { + addCriterion("hidden_type =", value, "hiddenType"); return (Criteria) this; } - public Criteria andHiddenNotEqualTo(String value) { - addCriterion("hidden <>", value, "hidden"); + public Criteria andHiddenTypeNotEqualTo(Integer value) { + addCriterion("hidden_type <>", value, "hiddenType"); return (Criteria) this; } - public Criteria andHiddenGreaterThan(String value) { - addCriterion("hidden >", value, "hidden"); + public Criteria andHiddenTypeGreaterThan(Integer value) { + addCriterion("hidden_type >", value, "hiddenType"); return (Criteria) this; } - public Criteria andHiddenGreaterThanOrEqualTo(String value) { - addCriterion("hidden >=", value, "hidden"); + public Criteria andHiddenTypeGreaterThanOrEqualTo(Integer value) { + addCriterion("hidden_type >=", value, "hiddenType"); return (Criteria) this; } - public Criteria andHiddenLessThan(String value) { - addCriterion("hidden <", value, "hidden"); + public Criteria andHiddenTypeLessThan(Integer value) { + addCriterion("hidden_type <", value, "hiddenType"); return (Criteria) this; } - public Criteria andHiddenLessThanOrEqualTo(String value) { - addCriterion("hidden <=", value, "hidden"); + public Criteria andHiddenTypeLessThanOrEqualTo(Integer value) { + addCriterion("hidden_type <=", value, "hiddenType"); return (Criteria) this; } - public Criteria andHiddenLike(String value) { - addCriterion("hidden like", value, "hidden"); + public Criteria andHiddenTypeIn(List values) { + addCriterion("hidden_type in", values, "hiddenType"); return (Criteria) this; } - public Criteria andHiddenNotLike(String value) { - addCriterion("hidden not like", value, "hidden"); + public Criteria andHiddenTypeNotIn(List values) { + addCriterion("hidden_type not in", values, "hiddenType"); return (Criteria) this; } - public Criteria andHiddenIn(List values) { - addCriterion("hidden in", values, "hidden"); + public Criteria andHiddenTypeBetween(Integer value1, Integer value2) { + addCriterion("hidden_type between", value1, value2, "hiddenType"); return (Criteria) this; } - public Criteria andHiddenNotIn(List values) { - addCriterion("hidden not in", values, "hidden"); - return (Criteria) this; - } - - public Criteria andHiddenBetween(String value1, String value2) { - addCriterion("hidden between", value1, value2, "hidden"); - return (Criteria) this; - } - - public Criteria andHiddenNotBetween(String value1, String value2) { - addCriterion("hidden not between", value1, value2, "hidden"); + public Criteria andHiddenTypeNotBetween(Integer value1, Integer value2) { + addCriterion("hidden_type not between", value1, value2, "hiddenType"); return (Criteria) this; } } diff --git a/roncoo-education-system/roncoo-education-system-service/src/main/resources/mybatis/SysMenuMapper.xml b/roncoo-education-system/roncoo-education-system-service/src/main/resources/mybatis/SysMenuMapper.xml index b218a9bf..f6816cea 100644 --- a/roncoo-education-system/roncoo-education-system-service/src/main/resources/mybatis/SysMenuMapper.xml +++ b/roncoo-education-system/roncoo-education-system-service/src/main/resources/mybatis/SysMenuMapper.xml @@ -13,7 +13,7 @@ - + @@ -75,7 +75,7 @@ id, gmt_create, gmt_modified, status_id, sort, parent_id, menu_name, menu_url, api_url, - menu_icon, remark, hidden + menu_icon, remark, hidden_type