Commit e5d9ec93 by fsn

更改menu的结构增加一个是否是菜单字段

parent 35a5f278
......@@ -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);
}
}
......
......@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
* </p>
*
* @author stylefeng
* @since 2017-05-23
* @since 2017-06-01
*/
public interface DeptMapper extends BaseMapper<Dept> {
......
......@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
* </p>
*
* @author stylefeng
* @since 2017-05-23
* @since 2017-06-01
*/
public interface DictMapper extends BaseMapper<Dict> {
......
......@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
* </p>
*
* @author stylefeng
* @since 2017-05-23
* @since 2017-06-01
*/
public interface LoginLogMapper extends BaseMapper<LoginLog> {
......
......@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
* </p>
*
* @author stylefeng
* @since 2017-05-23
* @since 2017-06-01
*/
public interface MenuMapper extends BaseMapper<Menu> {
......
......@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
* </p>
*
* @author stylefeng
* @since 2017-05-23
* @since 2017-06-01
*/
public interface NoticeMapper extends BaseMapper<Notice> {
......
......@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
* </p>
*
* @author stylefeng
* @since 2017-05-23
* @since 2017-06-01
*/
public interface OperationLogMapper extends BaseMapper<OperationLog> {
......
......@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
* </p>
*
* @author stylefeng
* @since 2017-05-23
* @since 2017-06-01
*/
public interface RelationMapper extends BaseMapper<Relation> {
......
......@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
* </p>
*
* @author stylefeng
* @since 2017-05-23
* @since 2017-06-01
*/
public interface RoleMapper extends BaseMapper<Role> {
......
......@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
* </p>
*
* @author stylefeng
* @since 2017-05-23
* @since 2017-06-01
*/
public interface UserMapper extends BaseMapper<User> {
......
......@@ -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" />
......
......@@ -11,7 +11,7 @@ import java.io.Serializable;
* </p>
*
* @author stylefeng
* @since 2017-05-23
* @since 2017-06-01
*/
public class Dept extends Model<Dept> {
......
......@@ -11,7 +11,7 @@ import java.io.Serializable;
* </p>
*
* @author stylefeng
* @since 2017-05-23
* @since 2017-06-01
*/
public class Dict extends Model<Dict> {
......
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-05-23
* @since 2017-06-01
*/
@TableName("login_log")
public class LoginLog extends Model<LoginLog> {
......
......@@ -11,7 +11,7 @@ import java.io.Serializable;
* </p>
*
* @author stylefeng
* @since 2017-05-23
* @since 2017-06-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;
}
......
......@@ -13,7 +13,7 @@ import java.util.Date;
* </p>
*
* @author stylefeng
* @since 2017-05-23
* @since 2017-06-01
*/
public class Notice extends Model<Notice> {
......
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-05-23
* @since 2017-06-01
*/
@TableName("operation_log")
public class OperationLog extends Model<OperationLog> {
......
......@@ -11,7 +11,7 @@ import java.io.Serializable;
* </p>
*
* @author stylefeng
* @since 2017-05-23
* @since 2017-06-01
*/
public class Relation extends Model<Relation> {
......
......@@ -11,7 +11,7 @@ import java.io.Serializable;
* </p>
*
* @author stylefeng
* @since 2017-05-23
* @since 2017-06-01
*/
public class Role extends Model<Role> {
......
......@@ -12,7 +12,7 @@ import java.io.Serializable;
* </p>
*
* @author stylefeng
* @since 2017-05-23
* @since 2017-06-01
*/
public class User extends Model<User> {
......
......@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment