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

src/main/java/com/stylefeng/guns/common/node/MenuNode.java

@@ -37,6 +37,11 @@ public class MenuNode implements Comparable {
     private Integer levels;
     private Integer levels;
 
 
     /**
     /**
+     * 按钮级别
+     */
+    private Integer ismenu;
+
+    /**
      * 按钮的排序
      * 按钮的排序
      */
      */
     private Integer num;
     private Integer num;
@@ -139,6 +144,14 @@ public class MenuNode implements Comparable {
         this.num = num;
         this.num = num;
     }
     }
 
 
+    public Integer getIsmenu() {
+        return ismenu;
+    }
+
+    public void setIsmenu(Integer ismenu) {
+        this.ismenu = ismenu;
+    }
+
     @Override
     @Override
     public String toString() {
     public String toString() {
         return "MenuNode{" +
         return "MenuNode{" +
@@ -289,12 +302,12 @@ public class MenuNode implements Comparable {
 
 
         //如果关闭了接口文档,则不显示接口文档菜单
         //如果关闭了接口文档,则不显示接口文档菜单
         GunsProperties gunsProperties = SpringContextHolder.getBean(GunsProperties.class);
         GunsProperties gunsProperties = SpringContextHolder.getBean(GunsProperties.class);
-        if(!gunsProperties.getSwaggerOpen()){
+        if (!gunsProperties.getSwaggerOpen()) {
             List<MenuNode> menuNodesCopy = new ArrayList<>();
             List<MenuNode> menuNodesCopy = new ArrayList<>();
             for (MenuNode menuNode : menuNodes) {
             for (MenuNode menuNode : menuNodes) {
-                if(Const.API_MENU_NAME.equals(menuNode.getName())){
+                if (Const.API_MENU_NAME.equals(menuNode.getName())) {
                     continue;
                     continue;
-                }else{
+                } else {
                     menuNodesCopy.add(menuNode);
                     menuNodesCopy.add(menuNode);
                 }
                 }
             }
             }

src/main/java/com/stylefeng/guns/common/persistence/dao/DeptMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-05-23
+ * @since 2017-06-01
  */
  */
 public interface DeptMapper extends BaseMapper<Dept> {
 public interface DeptMapper extends BaseMapper<Dept> {
 
 

src/main/java/com/stylefeng/guns/common/persistence/dao/DictMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-05-23
+ * @since 2017-06-01
  */
  */
 public interface DictMapper extends BaseMapper<Dict> {
 public interface DictMapper extends BaseMapper<Dict> {
 
 

src/main/java/com/stylefeng/guns/common/persistence/dao/LoginLogMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-05-23
+ * @since 2017-06-01
  */
  */
 public interface LoginLogMapper extends BaseMapper<LoginLog> {
 public interface LoginLogMapper extends BaseMapper<LoginLog> {
 
 

src/main/java/com/stylefeng/guns/common/persistence/dao/MenuMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-05-23
+ * @since 2017-06-01
  */
  */
 public interface MenuMapper extends BaseMapper<Menu> {
 public interface MenuMapper extends BaseMapper<Menu> {
 
 

src/main/java/com/stylefeng/guns/common/persistence/dao/NoticeMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-05-23
+ * @since 2017-06-01
  */
  */
 public interface NoticeMapper extends BaseMapper<Notice> {
 public interface NoticeMapper extends BaseMapper<Notice> {
 
 

src/main/java/com/stylefeng/guns/common/persistence/dao/OperationLogMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-05-23
+ * @since 2017-06-01
  */
  */
 public interface OperationLogMapper extends BaseMapper<OperationLog> {
 public interface OperationLogMapper extends BaseMapper<OperationLog> {
 
 

src/main/java/com/stylefeng/guns/common/persistence/dao/RelationMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-05-23
+ * @since 2017-06-01
  */
  */
 public interface RelationMapper extends BaseMapper<Relation> {
 public interface RelationMapper extends BaseMapper<Relation> {
 
 

src/main/java/com/stylefeng/guns/common/persistence/dao/RoleMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-05-23
+ * @since 2017-06-01
  */
  */
 public interface RoleMapper extends BaseMapper<Role> {
 public interface RoleMapper extends BaseMapper<Role> {
 
 

src/main/java/com/stylefeng/guns/common/persistence/dao/UserMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-05-23
+ * @since 2017-06-01
  */
  */
 public interface UserMapper extends BaseMapper<User> {
 public interface UserMapper extends BaseMapper<User> {
 
 

src/main/java/com/stylefeng/guns/common/persistence/dao/mapping/MenuMapper.xml

@@ -12,6 +12,7 @@
 		<result column="url" property="url" />
 		<result column="url" property="url" />
 		<result column="num" property="num" />
 		<result column="num" property="num" />
 		<result column="levels" property="levels" />
 		<result column="levels" property="levels" />
+		<result column="ismenu" property="ismenu" />
 		<result column="tips" property="tips" />
 		<result column="tips" property="tips" />
 		<result column="status" property="status" />
 		<result column="status" property="status" />
 		<result column="isopen" property="isopen" />
 		<result column="isopen" property="isopen" />

src/main/java/com/stylefeng/guns/common/persistence/model/Dept.java

@@ -11,7 +11,7 @@ import java.io.Serializable;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-05-23
+ * @since 2017-06-01
  */
  */
 public class Dept extends Model<Dept> {
 public class Dept extends Model<Dept> {
 
 

src/main/java/com/stylefeng/guns/common/persistence/model/Dict.java

@@ -11,7 +11,7 @@ import java.io.Serializable;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-05-23
+ * @since 2017-06-01
  */
  */
 public class Dict extends Model<Dict> {
 public class Dict extends Model<Dict> {
 
 

src/main/java/com/stylefeng/guns/common/persistence/model/LoginLog.java

 package com.stylefeng.guns.common.persistence.model;
 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.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
-
 import java.io.Serializable;
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**
 /**
  * <p>
  * <p>
@@ -14,7 +13,7 @@ import java.util.Date;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-05-23
+ * @since 2017-06-01
  */
  */
 @TableName("login_log")
 @TableName("login_log")
 public class LoginLog extends Model<LoginLog> {
 public class LoginLog extends Model<LoginLog> {

src/main/java/com/stylefeng/guns/common/persistence/model/Menu.java

@@ -11,7 +11,7 @@ import java.io.Serializable;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-05-23
+ * @since 2017-06-01
  */
  */
 public class Menu extends Model<Menu> {
 public class Menu extends Model<Menu> {
 
 
@@ -48,6 +48,10 @@ public class Menu extends Model<Menu> {
      */
      */
 	private Integer levels;
 	private Integer levels;
     /**
     /**
+     * 是否是菜单(1:是  0:不是(为按钮))
+     */
+	private Integer ismenu;
+    /**
      * 备注
      * 备注
      */
      */
 	private String tips;
 	private String tips;
@@ -125,6 +129,14 @@ public class Menu extends Model<Menu> {
 		this.levels = levels;
 		this.levels = levels;
 	}
 	}
 
 
+	public Integer getIsmenu() {
+		return ismenu;
+	}
+
+	public void setIsmenu(Integer ismenu) {
+		this.ismenu = ismenu;
+	}
+
 	public String getTips() {
 	public String getTips() {
 		return tips;
 		return tips;
 	}
 	}

src/main/java/com/stylefeng/guns/common/persistence/model/Notice.java

@@ -13,7 +13,7 @@ import java.util.Date;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-05-23
+ * @since 2017-06-01
  */
  */
 public class Notice extends Model<Notice> {
 public class Notice extends Model<Notice> {
 
 

src/main/java/com/stylefeng/guns/common/persistence/model/OperationLog.java

 package com.stylefeng.guns.common.persistence.model;
 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.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+
 import java.io.Serializable;
 import java.io.Serializable;
+import java.util.Date;
 
 
 /**
 /**
  * <p>
  * <p>
@@ -13,7 +14,7 @@ import java.io.Serializable;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-05-23
+ * @since 2017-06-01
  */
  */
 @TableName("operation_log")
 @TableName("operation_log")
 public class OperationLog extends Model<OperationLog> {
 public class OperationLog extends Model<OperationLog> {

src/main/java/com/stylefeng/guns/common/persistence/model/Relation.java

@@ -11,7 +11,7 @@ import java.io.Serializable;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-05-23
+ * @since 2017-06-01
  */
  */
 public class Relation extends Model<Relation> {
 public class Relation extends Model<Relation> {
 
 

src/main/java/com/stylefeng/guns/common/persistence/model/Role.java

@@ -11,7 +11,7 @@ import java.io.Serializable;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-05-23
+ * @since 2017-06-01
  */
  */
 public class Role extends Model<Role> {
 public class Role extends Model<Role> {
 
 

src/main/java/com/stylefeng/guns/common/persistence/model/User.java

@@ -12,7 +12,7 @@ import java.io.Serializable;
  * </p>
  * </p>
  *
  *
  * @author stylefeng
  * @author stylefeng
- * @since 2017-05-23
+ * @since 2017-06-01
  */
  */
 public class User extends Model<User> {
 public class User extends Model<User> {
 
 

src/main/java/com/stylefeng/guns/modular/system/dao/mapping/MenuDao.xml

@@ -5,7 +5,7 @@
 
 
 	<sql id="Base_Column_List">
 	<sql id="Base_Column_List">
 		id, code, pcode, name, icon, url, num, levels,
 		id, code, pcode, name, icon, url, num, levels,
-		tips, status,isopen
+		tips, status,isopen,ismenu
 	</sql>
 	</sql>
 
 
 	<select id="selectMenus" resultType="map">
 	<select id="selectMenus" resultType="map">
@@ -131,6 +131,7 @@
 		m1.NAME as name,
 		m1.NAME as name,
 		m1.url as url,
 		m1.url as url,
 		m1.levels as levels,
 		m1.levels as levels,
+		m1.ismenu as ismenu,
 		m1.num as num
 		m1.num as num
 		FROM
 		FROM
 		menu m1
 		menu m1
@@ -153,6 +154,7 @@
 		</foreach>
 		</foreach>
 		)
 		)
 		) m3 ON m1.id = m3.id
 		) m3 ON m1.id = m3.id
+		where m1.ismenu = 1
 		order by levels,num asc
 		order by levels,num asc
 	</select>
 	</select>