Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
roncoo
roncoo-education
提交
7c9e9ced
R
roncoo-education
项目概览
roncoo
/
roncoo-education
大约 1 年 前同步成功
通知
146
Star
5
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
1
Wiki
分析
仓库
DevOps
项目成员
Pages
R
roncoo-education
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
1
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7c9e9ced
编写于
7月 26, 2019
作者:
K
keyinghao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
提交
上级
5f4909a9
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
149 addition
and
124 deletion
+149
-124
roncoo-education-system/roncoo-education-system-common/src/main/java/com/roncoo/education/system/common/bean/qo/SysMenuQO.java
...com/roncoo/education/system/common/bean/qo/SysMenuQO.java
+61
-54
roncoo-education-system/roncoo-education-system-common/src/main/java/com/roncoo/education/system/common/bean/vo/SysMenuVO.java
...com/roncoo/education/system/common/bean/vo/SysMenuVO.java
+3
-3
roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/biz/pc/PcApiSysMenuBiz.java
...ncoo/education/system/service/biz/pc/PcApiSysMenuBiz.java
+6
-0
roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/common/req/SysMenuSaveREQ.java
...o/education/system/service/common/req/SysMenuSaveREQ.java
+3
-3
roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/common/req/SysMenuUpdateREQ.java
...education/system/service/common/req/SysMenuUpdateREQ.java
+3
-3
roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/common/resq/SysMenuRESQ.java
...coo/education/system/service/common/resq/SysMenuRESQ.java
+3
-3
roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/common/resq/SysMenuUserRESQ.java
...education/system/service/common/resq/SysMenuUserRESQ.java
+1
-1
roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/common/resq/SysMenuViewRESQ.java
...education/system/service/common/resq/SysMenuViewRESQ.java
+3
-3
roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/dao/impl/mapper/entity/SysMenu.java
...cation/system/service/dao/impl/mapper/entity/SysMenu.java
+6
-6
roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/dao/impl/mapper/entity/SysMenuExample.java
...system/service/dao/impl/mapper/entity/SysMenuExample.java
+24
-34
roncoo-education-system/roncoo-education-system-service/src/main/resources/mybatis/SysMenuMapper.xml
...stem-service/src/main/resources/mybatis/SysMenuMapper.xml
+14
-14
roncoo-education-util/src/main/java/com/roncoo/education/util/enums/HiddenTypeEnum.java
.../java/com/roncoo/education/util/enums/HiddenTypeEnum.java
+22
-0
未找到文件。
roncoo-education-system/roncoo-education-system-common/src/main/java/com/roncoo/education/system/common/bean/qo/SysMenuQO.java
浏览文件 @
7c9e9ced
...
...
@@ -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
;
}
roncoo-education-system/roncoo-education-system-common/src/main/java/com/roncoo/education/system/common/bean/vo/SysMenuVO.java
浏览文件 @
7c9e9ced
...
...
@@ -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
;
/**
* 菜单集合
*/
...
...
roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/biz/pc/PcApiSysMenuBiz.java
浏览文件 @
7c9e9ced
...
...
@@ -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
());
...
...
roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/common/req/SysMenuSaveREQ.java
浏览文件 @
7c9e9ced
...
...
@@ -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
;
/**
* 排序
*/
...
...
roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/common/req/SysMenuUpdateREQ.java
浏览文件 @
7c9e9ced
...
...
@@ -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
;
}
roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/common/resq/SysMenuRESQ.java
浏览文件 @
7c9e9ced
...
...
@@ -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
;
/**
* 下级菜单集合
*/
...
...
roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/common/resq/SysMenuUserRESQ.java
浏览文件 @
7c9e9ced
...
...
@@ -51,7 +51,7 @@ public class SysMenuUserRESQ implements Serializable {
* 是否显示(true: 显示;false:不显示)
*/
@ApiModelProperty
(
value
=
"是否显示(true: 显示;false:不显示)"
)
private
String
hidden
;
private
boolean
hidden
;
/**
* 下级菜单集合
*/
...
...
roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/common/resq/SysMenuViewRESQ.java
浏览文件 @
7c9e9ced
...
...
@@ -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
;
}
roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/dao/impl/mapper/entity/SysMenu.java
浏览文件 @
7c9e9ced
...
...
@@ -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
hidden
Type
;
}
public
void
setHidden
(
String
hidden
)
{
this
.
hidden
=
hidden
==
null
?
null
:
hidden
.
trim
()
;
public
void
setHidden
Type
(
Integer
hiddenType
)
{
this
.
hidden
Type
=
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
(
", hidden
Type="
).
append
(
hiddenType
);
sb
.
append
(
", serialVersionUID="
).
append
(
serialVersionUID
);
sb
.
append
(
"]"
);
return
sb
.
toString
();
...
...
roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/dao/impl/mapper/entity/SysMenuExample.java
浏览文件 @
7c9e9ced
...
...
@@ -835,73 +835,63 @@ public class SysMenuExample {
return
(
Criteria
)
this
;
}
public
Criteria
andHiddenIsNull
()
{
addCriterion
(
"hidden is null"
);
public
Criteria
andHidden
Type
IsNull
()
{
addCriterion
(
"hidden
_type
is null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andHiddenIsNotNull
()
{
addCriterion
(
"hidden is not null"
);
public
Criteria
andHidden
Type
IsNotNull
()
{
addCriterion
(
"hidden
_type
is not null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andHidden
EqualTo
(
String
value
)
{
addCriterion
(
"hidden
="
,
value
,
"hidden
"
);
public
Criteria
andHidden
TypeEqualTo
(
Integer
value
)
{
addCriterion
(
"hidden
_type ="
,
value
,
"hiddenType
"
);
return
(
Criteria
)
this
;
}
public
Criteria
andHidden
NotEqualTo
(
String
value
)
{
addCriterion
(
"hidden
<>"
,
value
,
"hidden
"
);
public
Criteria
andHidden
TypeNotEqualTo
(
Integer
value
)
{
addCriterion
(
"hidden
_type <>"
,
value
,
"hiddenType
"
);
return
(
Criteria
)
this
;
}
public
Criteria
andHidden
GreaterThan
(
String
value
)
{
addCriterion
(
"hidden
>"
,
value
,
"hidden
"
);
public
Criteria
andHidden
TypeGreaterThan
(
Integer
value
)
{
addCriterion
(
"hidden
_type >"
,
value
,
"hiddenType
"
);
return
(
Criteria
)
this
;
}
public
Criteria
andHidden
GreaterThanOrEqualTo
(
String
value
)
{
addCriterion
(
"hidden
>="
,
value
,
"hidden
"
);
public
Criteria
andHidden
TypeGreaterThanOrEqualTo
(
Integer
value
)
{
addCriterion
(
"hidden
_type >="
,
value
,
"hiddenType
"
);
return
(
Criteria
)
this
;
}
public
Criteria
andHidden
LessThan
(
String
value
)
{
addCriterion
(
"hidden
<"
,
value
,
"hidden
"
);
public
Criteria
andHidden
TypeLessThan
(
Integer
value
)
{
addCriterion
(
"hidden
_type <"
,
value
,
"hiddenType
"
);
return
(
Criteria
)
this
;
}
public
Criteria
andHidden
LessThanOrEqualTo
(
String
value
)
{
addCriterion
(
"hidden
<="
,
value
,
"hidden
"
);
public
Criteria
andHidden
TypeLessThanOrEqualTo
(
Integer
value
)
{
addCriterion
(
"hidden
_type <="
,
value
,
"hiddenType
"
);
return
(
Criteria
)
this
;
}
public
Criteria
andHidden
Like
(
String
value
)
{
addCriterion
(
"hidden
like"
,
value
,
"hidden
"
);
public
Criteria
andHidden
TypeIn
(
List
<
Integer
>
values
)
{
addCriterion
(
"hidden
_type in"
,
values
,
"hiddenType
"
);
return
(
Criteria
)
this
;
}
public
Criteria
andHidden
NotLike
(
String
value
)
{
addCriterion
(
"hidden
not like"
,
value
,
"hidden
"
);
public
Criteria
andHidden
TypeNotIn
(
List
<
Integer
>
values
)
{
addCriterion
(
"hidden
_type not in"
,
values
,
"hiddenType
"
);
return
(
Criteria
)
this
;
}
public
Criteria
andHidden
In
(
List
<
String
>
values
)
{
addCriterion
(
"hidden
in"
,
values
,
"hidden
"
);
public
Criteria
andHidden
TypeBetween
(
Integer
value1
,
Integer
value2
)
{
addCriterion
(
"hidden
_type between"
,
value1
,
value2
,
"hiddenType
"
);
return
(
Criteria
)
this
;
}
public
Criteria
andHiddenNotIn
(
List
<
String
>
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
;
}
}
...
...
roncoo-education-system/roncoo-education-system-service/src/main/resources/mybatis/SysMenuMapper.xml
浏览文件 @
7c9e9ced
...
...
@@ -13,7 +13,7 @@
<result
column=
"api_url"
property=
"apiUrl"
jdbcType=
"VARCHAR"
/>
<result
column=
"menu_icon"
property=
"menuIcon"
jdbcType=
"VARCHAR"
/>
<result
column=
"remark"
property=
"remark"
jdbcType=
"VARCHAR"
/>
<result
column=
"hidden
"
property=
"hidden"
jdbcType=
"VARCHAR
"
/>
<result
column=
"hidden
_type"
property=
"hiddenType"
jdbcType=
"TINYINT
"
/>
</resultMap>
<sql
id=
"Example_Where_Clause"
>
<where
>
...
...
@@ -75,7 +75,7 @@
</sql>
<sql
id=
"Base_Column_List"
>
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
</sql>
<select
id=
"selectByExample"
resultMap=
"BaseResultMap"
parameterType=
"com.roncoo.education.system.service.dao.impl.mapper.entity.SysMenuExample"
>
select
...
...
@@ -114,12 +114,12 @@
insert into sys_menu (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
)
values (#{id,jdbcType=BIGINT}, #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtModified,jdbcType=TIMESTAMP},
#{statusId,jdbcType=TINYINT}, #{sort,jdbcType=INTEGER}, #{parentId,jdbcType=BIGINT},
#{menuName,jdbcType=VARCHAR}, #{menuUrl,jdbcType=VARCHAR}, #{apiUrl,jdbcType=VARCHAR},
#{menuIcon,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{hidden
,jdbcType=VARCHAR
}
#{menuIcon,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{hidden
Type,jdbcType=TINYINT
}
)
</insert>
<insert
id=
"insertSelective"
parameterType=
"com.roncoo.education.system.service.dao.impl.mapper.entity.SysMenu"
>
...
...
@@ -158,8 +158,8 @@
<if
test=
"remark != null"
>
remark,
</if>
<if
test=
"hidden != null"
>
hidden,
<if
test=
"hidden
Type
!= null"
>
hidden
_type
,
</if>
</trim>
<trim
prefix=
"values ("
suffix=
")"
suffixOverrides=
","
>
...
...
@@ -196,8 +196,8 @@
<if
test=
"remark != null"
>
#{remark,jdbcType=VARCHAR},
</if>
<if
test=
"hidden != null"
>
#{hidden
,jdbcType=VARCHAR
},
<if
test=
"hidden
Type
!= null"
>
#{hidden
Type,jdbcType=TINYINT
},
</if>
</trim>
</insert>
...
...
@@ -243,8 +243,8 @@
<if
test=
"record.remark != null"
>
remark = #{record.remark,jdbcType=VARCHAR},
</if>
<if
test=
"record.hidden != null"
>
hidden
= #{record.hidden,jdbcType=VARCHAR
},
<if
test=
"record.hidden
Type
!= null"
>
hidden
_type = #{record.hiddenType,jdbcType=TINYINT
},
</if>
</set>
<if
test=
"_parameter != null"
>
...
...
@@ -264,7 +264,7 @@
api_url = #{record.apiUrl,jdbcType=VARCHAR},
menu_icon = #{record.menuIcon,jdbcType=VARCHAR},
remark = #{record.remark,jdbcType=VARCHAR},
hidden
= #{record.hidden,jdbcType=VARCHAR
}
hidden
_type = #{record.hiddenType,jdbcType=TINYINT
}
<if
test=
"_parameter != null"
>
<include
refid=
"Update_By_Example_Where_Clause"
/>
</if>
...
...
@@ -302,8 +302,8 @@
<if
test=
"remark != null"
>
remark = #{remark,jdbcType=VARCHAR},
</if>
<if
test=
"hidden != null"
>
hidden
= #{hidden,jdbcType=VARCHAR
},
<if
test=
"hidden
Type
!= null"
>
hidden
_type = #{hiddenType,jdbcType=TINYINT
},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
...
...
@@ -320,7 +320,7 @@
api_url = #{apiUrl,jdbcType=VARCHAR},
menu_icon = #{menuIcon,jdbcType=VARCHAR},
remark = #{remark,jdbcType=VARCHAR},
hidden
= #{hidden,jdbcType=VARCHAR
}
hidden
_type = #{hiddenType,jdbcType=TINYINT
}
where id = #{id,jdbcType=BIGINT}
</update>
</mapper>
\ No newline at end of file
roncoo-education-util/src/main/java/com/roncoo/education/util/enums/HiddenTypeEnum.java
0 → 100644
浏览文件 @
7c9e9ced
/**
* Copyright 2015-现在 广州市领课网络科技有限公司
*/
package
com.roncoo.education.util.enums
;
import
lombok.AllArgsConstructor
;
import
lombok.Getter
;
/**
* 是否显示(1: 显示;0:不显示)
*/
@Getter
@AllArgsConstructor
public
enum
HiddenTypeEnum
{
YES
(
1
,
"显示"
),
NO
(
0
,
"不显示"
);
private
Integer
code
;
private
String
desc
;
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录