Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
guns-vip
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chenjunxiong
guns-vip
Commits
e5d9ec93
Commit
e5d9ec93
authored
Jun 01, 2017
by
fsn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更改menu的结构增加一个是否是菜单字段
parent
35a5f278
Show whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
57 additions
and
29 deletions
+57
-29
src/main/java/com/stylefeng/guns/common/node/MenuNode.java
+16
-3
src/main/java/com/stylefeng/guns/common/persistence/dao/DeptMapper.java
+1
-1
src/main/java/com/stylefeng/guns/common/persistence/dao/DictMapper.java
+1
-1
src/main/java/com/stylefeng/guns/common/persistence/dao/LoginLogMapper.java
+1
-1
src/main/java/com/stylefeng/guns/common/persistence/dao/MenuMapper.java
+1
-1
src/main/java/com/stylefeng/guns/common/persistence/dao/NoticeMapper.java
+1
-1
src/main/java/com/stylefeng/guns/common/persistence/dao/OperationLogMapper.java
+1
-1
src/main/java/com/stylefeng/guns/common/persistence/dao/RelationMapper.java
+1
-1
src/main/java/com/stylefeng/guns/common/persistence/dao/RoleMapper.java
+1
-1
src/main/java/com/stylefeng/guns/common/persistence/dao/UserMapper.java
+1
-1
src/main/java/com/stylefeng/guns/common/persistence/dao/mapping/MenuMapper.xml
+1
-0
src/main/java/com/stylefeng/guns/common/persistence/model/Dept.java
+1
-1
src/main/java/com/stylefeng/guns/common/persistence/model/Dict.java
+1
-1
src/main/java/com/stylefeng/guns/common/persistence/model/LoginLog.java
+4
-5
src/main/java/com/stylefeng/guns/common/persistence/model/Menu.java
+13
-1
src/main/java/com/stylefeng/guns/common/persistence/model/Notice.java
+1
-1
src/main/java/com/stylefeng/guns/common/persistence/model/OperationLog.java
+5
-4
src/main/java/com/stylefeng/guns/common/persistence/model/Relation.java
+1
-1
src/main/java/com/stylefeng/guns/common/persistence/model/Role.java
+1
-1
src/main/java/com/stylefeng/guns/common/persistence/model/User.java
+1
-1
src/main/java/com/stylefeng/guns/modular/system/dao/mapping/MenuDao.xml
+3
-1
No files found.
src/main/java/com/stylefeng/guns/common/node/MenuNode.java
View file @
e5d9ec93
...
...
@@ -37,6 +37,11 @@ public class MenuNode implements Comparable {
private
Integer
levels
;
/**
* 按钮级别
*/
private
Integer
ismenu
;
/**
* 按钮的排序
*/
private
Integer
num
;
...
...
@@ -139,6 +144,14 @@ public class MenuNode implements Comparable {
this
.
num
=
num
;
}
public
Integer
getIsmenu
()
{
return
ismenu
;
}
public
void
setIsmenu
(
Integer
ismenu
)
{
this
.
ismenu
=
ismenu
;
}
@Override
public
String
toString
()
{
return
"MenuNode{"
+
...
...
@@ -289,12 +302,12 @@ public class MenuNode implements Comparable {
//如果关闭了接口文档,则不显示接口文档菜单
GunsProperties
gunsProperties
=
SpringContextHolder
.
getBean
(
GunsProperties
.
class
);
if
(!
gunsProperties
.
getSwaggerOpen
())
{
if
(!
gunsProperties
.
getSwaggerOpen
())
{
List
<
MenuNode
>
menuNodesCopy
=
new
ArrayList
<>();
for
(
MenuNode
menuNode
:
menuNodes
)
{
if
(
Const
.
API_MENU_NAME
.
equals
(
menuNode
.
getName
()))
{
if
(
Const
.
API_MENU_NAME
.
equals
(
menuNode
.
getName
()))
{
continue
;
}
else
{
}
else
{
menuNodesCopy
.
add
(
menuNode
);
}
}
...
...
src/main/java/com/stylefeng/guns/common/persistence/dao/DeptMapper.java
View file @
e5d9ec93
...
...
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
* </p>
*
* @author stylefeng
* @since 2017-0
5-23
* @since 2017-0
6-01
*/
public
interface
DeptMapper
extends
BaseMapper
<
Dept
>
{
...
...
src/main/java/com/stylefeng/guns/common/persistence/dao/DictMapper.java
View file @
e5d9ec93
...
...
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
* </p>
*
* @author stylefeng
* @since 2017-0
5-23
* @since 2017-0
6-01
*/
public
interface
DictMapper
extends
BaseMapper
<
Dict
>
{
...
...
src/main/java/com/stylefeng/guns/common/persistence/dao/LoginLogMapper.java
View file @
e5d9ec93
...
...
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
* </p>
*
* @author stylefeng
* @since 2017-0
5-23
* @since 2017-0
6-01
*/
public
interface
LoginLogMapper
extends
BaseMapper
<
LoginLog
>
{
...
...
src/main/java/com/stylefeng/guns/common/persistence/dao/MenuMapper.java
View file @
e5d9ec93
...
...
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
* </p>
*
* @author stylefeng
* @since 2017-0
5-23
* @since 2017-0
6-01
*/
public
interface
MenuMapper
extends
BaseMapper
<
Menu
>
{
...
...
src/main/java/com/stylefeng/guns/common/persistence/dao/NoticeMapper.java
View file @
e5d9ec93
...
...
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
* </p>
*
* @author stylefeng
* @since 2017-0
5-23
* @since 2017-0
6-01
*/
public
interface
NoticeMapper
extends
BaseMapper
<
Notice
>
{
...
...
src/main/java/com/stylefeng/guns/common/persistence/dao/OperationLogMapper.java
View file @
e5d9ec93
...
...
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
* </p>
*
* @author stylefeng
* @since 2017-0
5-23
* @since 2017-0
6-01
*/
public
interface
OperationLogMapper
extends
BaseMapper
<
OperationLog
>
{
...
...
src/main/java/com/stylefeng/guns/common/persistence/dao/RelationMapper.java
View file @
e5d9ec93
...
...
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
* </p>
*
* @author stylefeng
* @since 2017-0
5-23
* @since 2017-0
6-01
*/
public
interface
RelationMapper
extends
BaseMapper
<
Relation
>
{
...
...
src/main/java/com/stylefeng/guns/common/persistence/dao/RoleMapper.java
View file @
e5d9ec93
...
...
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
* </p>
*
* @author stylefeng
* @since 2017-0
5-23
* @since 2017-0
6-01
*/
public
interface
RoleMapper
extends
BaseMapper
<
Role
>
{
...
...
src/main/java/com/stylefeng/guns/common/persistence/dao/UserMapper.java
View file @
e5d9ec93
...
...
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
* </p>
*
* @author stylefeng
* @since 2017-0
5-23
* @since 2017-0
6-01
*/
public
interface
UserMapper
extends
BaseMapper
<
User
>
{
...
...
src/main/java/com/stylefeng/guns/common/persistence/dao/mapping/MenuMapper.xml
View file @
e5d9ec93
...
...
@@ -12,6 +12,7 @@
<result
column=
"url"
property=
"url"
/>
<result
column=
"num"
property=
"num"
/>
<result
column=
"levels"
property=
"levels"
/>
<result
column=
"ismenu"
property=
"ismenu"
/>
<result
column=
"tips"
property=
"tips"
/>
<result
column=
"status"
property=
"status"
/>
<result
column=
"isopen"
property=
"isopen"
/>
...
...
src/main/java/com/stylefeng/guns/common/persistence/model/Dept.java
View file @
e5d9ec93
...
...
@@ -11,7 +11,7 @@ import java.io.Serializable;
* </p>
*
* @author stylefeng
* @since 2017-0
5-23
* @since 2017-0
6-01
*/
public
class
Dept
extends
Model
<
Dept
>
{
...
...
src/main/java/com/stylefeng/guns/common/persistence/model/Dict.java
View file @
e5d9ec93
...
...
@@ -11,7 +11,7 @@ import java.io.Serializable;
* </p>
*
* @author stylefeng
* @since 2017-0
5-23
* @since 2017-0
6-01
*/
public
class
Dict
extends
Model
<
Dict
>
{
...
...
src/main/java/com/stylefeng/guns/common/persistence/model/LoginLog.java
View file @
e5d9ec93
package
com
.
stylefeng
.
guns
.
common
.
persistence
.
model
;
import
com.baomidou.mybatisplus.activerecord.Model
;
import
com.baomidou.mybatisplus.enums.IdType
;
import
java.util.Date
;
import
com.baomidou.mybatisplus.annotations.TableId
;
import
com.baomidou.mybatisplus.activerecord.Model
;
import
com.baomidou.mybatisplus.annotations.TableName
;
import
com.baomidou.mybatisplus.enums.IdType
;
import
java.io.Serializable
;
import
java.util.Date
;
/**
* <p>
...
...
@@ -14,7 +13,7 @@ import java.util.Date;
* </p>
*
* @author stylefeng
* @since 2017-0
5-23
* @since 2017-0
6-01
*/
@TableName
(
"login_log"
)
public
class
LoginLog
extends
Model
<
LoginLog
>
{
...
...
src/main/java/com/stylefeng/guns/common/persistence/model/Menu.java
View file @
e5d9ec93
...
...
@@ -11,7 +11,7 @@ import java.io.Serializable;
* </p>
*
* @author stylefeng
* @since 2017-0
5-23
* @since 2017-0
6-01
*/
public
class
Menu
extends
Model
<
Menu
>
{
...
...
@@ -48,6 +48,10 @@ public class Menu extends Model<Menu> {
*/
private
Integer
levels
;
/**
* 是否是菜单(1:是 0:不是(为按钮))
*/
private
Integer
ismenu
;
/**
* 备注
*/
private
String
tips
;
...
...
@@ -125,6 +129,14 @@ public class Menu extends Model<Menu> {
this
.
levels
=
levels
;
}
public
Integer
getIsmenu
()
{
return
ismenu
;
}
public
void
setIsmenu
(
Integer
ismenu
)
{
this
.
ismenu
=
ismenu
;
}
public
String
getTips
()
{
return
tips
;
}
...
...
src/main/java/com/stylefeng/guns/common/persistence/model/Notice.java
View file @
e5d9ec93
...
...
@@ -13,7 +13,7 @@ import java.util.Date;
* </p>
*
* @author stylefeng
* @since 2017-0
5-23
* @since 2017-0
6-01
*/
public
class
Notice
extends
Model
<
Notice
>
{
...
...
src/main/java/com/stylefeng/guns/common/persistence/model/OperationLog.java
View file @
e5d9ec93
package
com
.
stylefeng
.
guns
.
common
.
persistence
.
model
;
import
com.baomidou.mybatisplus.enums.IdType
;
import
java.util.Date
;
import
com.baomidou.mybatisplus.annotations.TableId
;
import
com.baomidou.mybatisplus.activerecord.Model
;
import
com.baomidou.mybatisplus.annotations.TableId
;
import
com.baomidou.mybatisplus.annotations.TableName
;
import
com.baomidou.mybatisplus.enums.IdType
;
import
java.io.Serializable
;
import
java.util.Date
;
/**
* <p>
...
...
@@ -13,7 +14,7 @@ import java.io.Serializable;
* </p>
*
* @author stylefeng
* @since 2017-0
5-23
* @since 2017-0
6-01
*/
@TableName
(
"operation_log"
)
public
class
OperationLog
extends
Model
<
OperationLog
>
{
...
...
src/main/java/com/stylefeng/guns/common/persistence/model/Relation.java
View file @
e5d9ec93
...
...
@@ -11,7 +11,7 @@ import java.io.Serializable;
* </p>
*
* @author stylefeng
* @since 2017-0
5-23
* @since 2017-0
6-01
*/
public
class
Relation
extends
Model
<
Relation
>
{
...
...
src/main/java/com/stylefeng/guns/common/persistence/model/Role.java
View file @
e5d9ec93
...
...
@@ -11,7 +11,7 @@ import java.io.Serializable;
* </p>
*
* @author stylefeng
* @since 2017-0
5-23
* @since 2017-0
6-01
*/
public
class
Role
extends
Model
<
Role
>
{
...
...
src/main/java/com/stylefeng/guns/common/persistence/model/User.java
View file @
e5d9ec93
...
...
@@ -12,7 +12,7 @@ import java.io.Serializable;
* </p>
*
* @author stylefeng
* @since 2017-0
5-23
* @since 2017-0
6-01
*/
public
class
User
extends
Model
<
User
>
{
...
...
src/main/java/com/stylefeng/guns/modular/system/dao/mapping/MenuDao.xml
View file @
e5d9ec93
...
...
@@ -5,7 +5,7 @@
<sql
id=
"Base_Column_List"
>
id, code, pcode, name, icon, url, num, levels,
tips, status,isopen
tips, status,isopen
,ismenu
</sql>
<select
id=
"selectMenus"
resultType=
"map"
>
...
...
@@ -131,6 +131,7 @@
m1.NAME as name,
m1.url as url,
m1.levels as levels,
m1.ismenu as ismenu,
m1.num as num
FROM
menu m1
...
...
@@ -153,6 +154,7 @@
</foreach>
)
) m3 ON m1.id = m3.id
where m1.ismenu = 1
order by levels,num asc
</select>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment