支持三级菜单

src/main/java/com/archser/aserver/controller/MenuController.java

 package com.archser.aserver.controller;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 import com.archser.aserver.interceptor.JwtInterceptor;
 import com.archser.aserver.model.Menu;
@@ -18,7 +21,7 @@ import com.jfinal.plugin.activerecord.Db;
 
 /**
  * 应用菜单相关操作
- * 
+ *
  * @author dgq
  *
  */
@@ -28,7 +31,7 @@ public class MenuController extends Controller {
 	private LogService logService;
 	@Inject
 	private MenuService menuService;
-	
+
 	/**
       获取权限菜单
      */
@@ -59,7 +62,7 @@ public class MenuController extends Controller {
     }
 
 
-	
+
 	/**
 	 * 获取菜单列表
 	 */
@@ -73,7 +76,7 @@ public class MenuController extends Controller {
 			renderJson(Ret.fail("msg", "获取菜单列表出错，请刷新后重试！"));
 		}
 	}
-	
+
 	/**
 	 * 保存菜单数据
 	 */
@@ -87,13 +90,13 @@ public class MenuController extends Controller {
 			renderJson(Ret.fail("msg", "保存菜单数据出错，请刷新后重试！"));
 		}
 	}
-	
+
 	/**
 	 * 删除菜单数据
 	 */
 	public void deleteMenu() {
 		try {
-			String[] ids = getPara("ids").split(",");	
+			String[] ids = getPara("ids").split(",");
 			boolean state = menuService.deleteMenu(ids);
 			renderJson(Ret.ok("msg", state?"删除菜单数据成功！":"删除菜单数据出错！"));
 		} catch (Exception e) {
@@ -101,11 +104,11 @@ public class MenuController extends Controller {
 			renderJson(Ret.fail("msg", "删除菜单数据出错，请刷新后重试！"));
 		}
 	}
-	
+
 
 	/**
 	 * 菜单加星
-	 * 
+	 *
 	 * @param menuId
 	 */
 	public void star(int menuId) {
@@ -131,7 +134,7 @@ public class MenuController extends Controller {
 
 	/**
 	 * 取消菜单加星
-	 * 
+	 *
 	 * @param menuId
 	 */
 	@SuppressWarnings("unused")
@@ -149,7 +152,7 @@ public class MenuController extends Controller {
 
 	/**
 	 * 菜单是否加星
-	 * 
+	 *
 	 * @param menuId
 	 * @param stars
 	 * @return
@@ -174,4 +177,29 @@ public class MenuController extends Controller {
 		renderJson(Ret.ok());
 
 	}
+
+	public void getMenuGroup() {
+		Integer userId = Db.queryInt(Db.getSql("getUserId"), this.getAttrForStr("username"));
+		//		所有菜单
+		List<Menu> allMenuList = new Menu().dao().template("getMenuGroup", Kv.by("userId", userId)).find();
+		List<System> systems = System.dao.template("getSystems").find();
+		Map<Integer, System> systemMap = systems.stream().collect(Collectors.toMap(System::getId, System -> System));
+		List<MenuStar> stars = MenuStar.dao.template("getMenuStar", userId).find();
+
+		Map<String, Map<String, List<Menu>>> menuGroup = new HashMap<>();
+		allMenuList.forEach(menu -> {
+//        	处理菜单属性
+			System system = systemMap.get(menu.getSystemId());
+			menu.put("system", system.getName());
+			menu.put("url", system.getUrl());
+			menu.put("star", exist(menu.getId(), stars));
+//            一级菜单组
+			menuGroup.putIfAbsent(menu.getFirstLevelName(),new HashMap<String, List<Menu>>());
+//            二级菜单组
+			menuGroup.get(menu.getFirstLevelName()).putIfAbsent(menu.getSecondLevelName(), new ArrayList<Menu>());
+//            最终菜单
+			menuGroup.get(menu.getFirstLevelName()).get(menu.getSecondLevelName()).add(menu);
+		});
+		renderJson(Ret.ok("apps", menuGroup).set("allMenu",allMenuList));
+	}
 }

src/main/java/com/archser/aserver/generator/MyGenerator.java

@@ -20,7 +20,7 @@ public class MyGenerator extends Generator {
   }
 
   public static void main(String[] args) {
-    Prop p = new Prop("config.properties");
+    Prop p = new Prop("config-pro.properties");
 
     String url = p.get("jdbcUrl");
     String user = p.get("user");

src/main/java/com/archser/aserver/generator/MyMetaBuilder.java

@@ -34,8 +34,8 @@ public class MyMetaBuilder extends MetaBuilder {
 
   @Override
   protected ResultSet getTablesResultSet() throws SQLException {
-    String schemaPattern = dialect instanceof OracleDialect ? dbMeta.getUserName() : null;
-    return dbMeta.getTables(conn.getCatalog(), schemaPattern, "%", new String[] {"TABLE"});
+//    String schemaPattern = dialect instanceof OracleDialect ? dbMeta.getUserName() : null;
+    return dbMeta.getTables(conn.getCatalog(), null, "%", new String[] {"TABLE"});
   }
 
 }

src/main/java/com/archser/aserver/model/base/BaseLog.java

@@ -9,65 +9,109 @@ import com.jfinal.plugin.activerecord.IBean;
 @SuppressWarnings({"serial", "unchecked"})
 public abstract class BaseLog<M extends BaseLog<M>> extends Model<M> implements IBean {
 
+	/**
+	 * Log主键
+	 */
 	public M setId(java.lang.Integer id) {
 		set("ID", id);
 		return (M)this;
 	}
 	
+	/**
+	 * Log主键
+	 */
 	public java.lang.Integer getId() {
 		return getInt("ID");
 	}
 
+	/**
+	 * 日志类型，login、access、error、operate之一
+	 */
 	public M setType(java.lang.String type) {
 		set("TYPE", type);
 		return (M)this;
 	}
 	
+	/**
+	 * 日志类型，login、access、error、operate之一
+	 */
 	public java.lang.String getType() {
 		return getStr("TYPE");
 	}
 
+	/**
+	 * 用户名，关联AS_USER表的USERNAME
+	 */
 	public M setUserId(java.lang.Integer userId) {
 		set("USER_ID", userId);
 		return (M)this;
 	}
 	
+	/**
+	 * 用户名，关联AS_USER表的USERNAME
+	 */
 	public java.lang.Integer getUserId() {
 		return getInt("USER_ID");
 	}
 
+	/**
+	 * 日志内容
+	 */
 	public M setContent(java.lang.String content) {
 		set("CONTENT", content);
 		return (M)this;
 	}
 	
+	/**
+	 * 日志内容
+	 */
 	public java.lang.String getContent() {
 		return getStr("CONTENT");
 	}
 
+	/**
+	 * 日志产生时间
+	 */
 	public M setCreateTime(java.util.Date createTime) {
 		set("CREATE_TIME", createTime);
 		return (M)this;
 	}
 	
+	/**
+	 * 日志产生时间
+	 */
 	public java.util.Date getCreateTime() {
 		return get("CREATE_TIME");
 	}
 
+	/**
+	 * 
+扩展文件，日志内容过长时保存到文件的路径
+	 */
 	public M setExtending(java.lang.String extending) {
 		set("EXTENDING", extending);
 		return (M)this;
 	}
 	
+	/**
+	 * 
+扩展文件，日志内容过长时保存到文件的路径
+	 */
 	public java.lang.String getExtending() {
 		return getStr("EXTENDING");
 	}
 
+	/**
+	 * 系统类型名称
+	 */
 	public M setSystemType(java.lang.String systemType) {
 		set("SYSTEM_TYPE", systemType);
 		return (M)this;
 	}
 	
+	/**
+	 * 系统类型名称
+	 */
 	public java.lang.String getSystemType() {
 		return getStr("SYSTEM_TYPE");
 	}

src/main/java/com/archser/aserver/model/base/BaseMenu.java

@@ -13,7 +13,7 @@ public abstract class BaseMenu<M extends BaseMenu<M>> extends Model<M> implement
 		set("ID", id);
 		return (M)this;
 	}
-	
+
 	public java.lang.Integer getId() {
 		return getInt("ID");
 	}
@@ -22,7 +22,7 @@ public abstract class BaseMenu<M extends BaseMenu<M>> extends Model<M> implement
 		set("NAME", name);
 		return (M)this;
 	}
-	
+
 	public java.lang.String getName() {
 		return getStr("NAME");
 	}
@@ -31,7 +31,7 @@ public abstract class BaseMenu<M extends BaseMenu<M>> extends Model<M> implement
 		set("TITLE", title);
 		return (M)this;
 	}
-	
+
 	public java.lang.String getTitle() {
 		return getStr("TITLE");
 	}
@@ -40,7 +40,7 @@ public abstract class BaseMenu<M extends BaseMenu<M>> extends Model<M> implement
 		set("ICON", icon);
 		return (M)this;
 	}
-	
+
 	public java.lang.String getIcon() {
 		return getStr("ICON");
 	}
@@ -49,7 +49,7 @@ public abstract class BaseMenu<M extends BaseMenu<M>> extends Model<M> implement
 		set("DESCRIPTION", description);
 		return (M)this;
 	}
-	
+
 	public java.lang.String getDescription() {
 		return getStr("DESCRIPTION");
 	}
@@ -58,7 +58,7 @@ public abstract class BaseMenu<M extends BaseMenu<M>> extends Model<M> implement
 		set("PATH", path);
 		return (M)this;
 	}
-	
+
 	public java.lang.String getPath() {
 		return getStr("PATH");
 	}
@@ -67,7 +67,7 @@ public abstract class BaseMenu<M extends BaseMenu<M>> extends Model<M> implement
 		set("TARGET", target);
 		return (M)this;
 	}
-	
+
 	public java.lang.String getTarget() {
 		return getStr("TARGET");
 	}
@@ -76,7 +76,7 @@ public abstract class BaseMenu<M extends BaseMenu<M>> extends Model<M> implement
 		set("SYSTEM_ID", systemId);
 		return (M)this;
 	}
-	
+
 	public java.lang.Integer getSystemId() {
 		return getInt("SYSTEM_ID");
 	}
@@ -85,9 +85,36 @@ public abstract class BaseMenu<M extends BaseMenu<M>> extends Model<M> implement
 		set("HIDDEN", hidden);
 		return (M)this;
 	}
-	
+
 	public java.lang.Integer getHidden() {
 		return getInt("HIDDEN");
 	}
 
+	public M setFirstLevelName(java.lang.String firstLevelName) {
+		set("FIRST_LEVEL_NAME", firstLevelName);
+		return (M)this;
+	}
+
+	public java.lang.String getFirstLevelName() {
+		return getStr("FIRST_LEVEL_NAME");
+	}
+
+	public M setSecondLevelName(java.lang.String secondLevelName) {
+		set("SECOND_LEVEL_NAME", secondLevelName);
+		return (M)this;
+	}
+
+	public java.lang.String getSecondLevelName() {
+		return getStr("SECOND_LEVEL_NAME");
+	}
+
+	public M setGroupOrder(java.lang.Integer groupOrder) {
+		set("GROUP_ORDER", groupOrder);
+		return (M)this;
+	}
+
+	public java.lang.Integer getGroupOrder() {
+		return getInt("GROUP_ORDER");
+	}
+
 }

src/main/java/com/archser/aserver/model/base/BaseOrgan.java

@@ -54,31 +54,133 @@ public abstract class BaseOrgan<M extends BaseOrgan<M>> extends Model<M> impleme
 		return getStr("IDSEQ");
 	}
 
-	public M setUuid(java.lang.String uuid) {
-		set("UUID", uuid);
+	/**
+	 * 用于接收kafka机构的ID
+	 */
+	public M setDcOrguuid(java.lang.String dcOrguuid) {
+		set("DC_ORGUUID", dcOrguuid);
 		return (M)this;
 	}
 	
-	public java.lang.String getUuid() {
-		return getStr("UUID");
+	/**
+	 * 用于接收kafka机构的ID
+	 */
+	public java.lang.String getDcOrguuid() {
+		return getStr("DC_ORGUUID");
 	}
 
-	public M setPuuid(java.lang.String puuid) {
-		set("PUUID", puuid);
+	/**
+	 * 用于接收kafka机构的父ID
+	 */
+	public M setDcParentorguuid(java.lang.String dcParentorguuid) {
+		set("DC_PARENTORGUUID", dcParentorguuid);
 		return (M)this;
 	}
 	
-	public java.lang.String getPuuid() {
-		return getStr("PUUID");
+	/**
+	 * 用于接收kafka机构的父ID
+	 */
+	public java.lang.String getDcParentorguuid() {
+		return getStr("DC_PARENTORGUUID");
 	}
 
-	public M setLocked(java.lang.String locked) {
-		set("LOCKED", locked);
+	/**
+	 * 机构的锁定
+	 */
+	public M setDcDelflag(java.lang.String dcDelflag) {
+		set("DC_DELFLAG", dcDelflag);
 		return (M)this;
 	}
 	
-	public java.lang.String getLocked() {
-		return getStr("LOCKED");
+	/**
+	 * 机构的锁定
+	 */
+	public java.lang.String getDcDelflag() {
+		return getStr("DC_DELFLAG");
+	}
+
+	/**
+	 * 部门级别
+	 */
+	public M setDcOrglevel(java.lang.String dcOrglevel) {
+		set("DC_ORGLEVEL", dcOrglevel);
+		return (M)this;
+	}
+	
+	/**
+	 * 部门级别
+	 */
+	public java.lang.String getDcOrglevel() {
+		return getStr("DC_ORGLEVEL");
+	}
+
+	/**
+	 * 排序
+	 */
+	public M setDcSerialindex(java.lang.String dcSerialindex) {
+		set("DC_SERIALINDEX", dcSerialindex);
+		return (M)this;
+	}
+	
+	/**
+	 * 排序
+	 */
+	public java.lang.String getDcSerialindex() {
+		return getStr("DC_SERIALINDEX");
+	}
+
+	public M setDcOrgcode(java.lang.String dcOrgcode) {
+		set("DC_ORGCODE", dcOrgcode);
+		return (M)this;
+	}
+	
+	public java.lang.String getDcOrgcode() {
+		return getStr("DC_ORGCODE");
+	}
+
+	public M setDcEnname(java.lang.String dcEnname) {
+		set("DC_ENNAME", dcEnname);
+		return (M)this;
+	}
+	
+	public java.lang.String getDcEnname() {
+		return getStr("DC_ENNAME");
+	}
+
+	public M setDcOrgtype(java.lang.String dcOrgtype) {
+		set("DC_ORGTYPE", dcOrgtype);
+		return (M)this;
+	}
+	
+	public java.lang.String getDcOrgtype() {
+		return getStr("DC_ORGTYPE");
+	}
+
+	public M setDcOrgsort(java.lang.String dcOrgsort) {
+		set("DC_ORGSORT", dcOrgsort);
+		return (M)this;
+	}
+	
+	public java.lang.String getDcOrgsort() {
+		return getStr("DC_ORGSORT");
+	}
+
+	public M setDcOrglevelcode(java.lang.String dcOrglevelcode) {
+		set("DC_ORGLEVELCODE", dcOrglevelcode);
+		return (M)this;
+	}
+	
+	public java.lang.String getDcOrglevelcode() {
+		return getStr("DC_ORGLEVELCODE");
+	}
+
+	public M setDcStatus(java.lang.String dcStatus) {
+		set("DC_STATUS", dcStatus);
+		return (M)this;
+	}
+	
+	public java.lang.String getDcStatus() {
+		return getStr("DC_STATUS");
 	}
 
 }

src/main/java/com/archser/aserver/model/base/BaseUser.java

@@ -135,11 +135,17 @@ public abstract class BaseUser<M extends BaseUser<M>> extends Model<M> implement
 		return get("IMAGE");
 	}
 
+	/**
+	 * kafka中用户ID
+	 */
 	public M setUuid(java.lang.String uuid) {
 		set("UUID", uuid);
 		return (M)this;
 	}
 	
+	/**
+	 * kafka中用户ID
+	 */
 	public java.lang.String getUuid() {
 		return getStr("UUID");
 	}
@@ -162,4 +168,67 @@ public abstract class BaseUser<M extends BaseUser<M>> extends Model<M> implement
 		return get("LAST_LOGIN_TIME");
 	}
 
+	public M setDcPersoncode(java.lang.String dcPersoncode) {
+		set("DC_PERSONCODE", dcPersoncode);
+		return (M)this;
+	}
+	
+	public java.lang.String getDcPersoncode() {
+		return getStr("DC_PERSONCODE");
+	}
+
+	public M setDcUserid(java.lang.String dcUserid) {
+		set("DC_USERID", dcUserid);
+		return (M)this;
+	}
+	
+	public java.lang.String getDcUserid() {
+		return getStr("DC_USERID");
+	}
+
+	public M setDcIdnum(java.lang.String dcIdnum) {
+		set("DC_IDNUM", dcIdnum);
+		return (M)this;
+	}
+	
+	public java.lang.String getDcIdnum() {
+		return getStr("DC_IDNUM");
+	}
+
+	public M setDcCardtype(java.lang.String dcCardtype) {
+		set("DC_CARDTYPE", dcCardtype);
+		return (M)this;
+	}
+	
+	public java.lang.String getDcCardtype() {
+		return getStr("DC_CARDTYPE");
+	}
+
+	public M setDcLawcard(java.lang.String dcLawcard) {
+		set("DC_LAWCARD", dcLawcard);
+		return (M)this;
+	}
+	
+	public java.lang.String getDcLawcard() {
+		return getStr("DC_LAWCARD");
+	}
+
+	public M setDcSequenceno(java.lang.String dcSequenceno) {
+		set("DC_SEQUENCENO", dcSequenceno);
+		return (M)this;
+	}
+	
+	public java.lang.String getDcSequenceno() {
+		return getStr("DC_SEQUENCENO");
+	}
+
+	public M setDcDelflag(java.lang.String dcDelflag) {
+		set("DC_DELFLAG", dcDelflag);
+		return (M)this;
+	}
+	
+	public java.lang.String getDcDelflag() {
+		return getStr("DC_DELFLAG");
+	}
+
 }

src/main/resources/oracle.sql

@@ -287,4 +287,16 @@ select * from AS_MENU where ID in (
 	)
 ) and system_id =#para(systemId) order by ID
 #end
+
+
+### 获取三级菜单
+#sql("getMenuGroup")
+select * from AS_MENU where ID in (
+	select MENU_ID from AS_ROLE_MENU where ROLE_ID in (
+		select r.ID from AS_ROLE r, AS_ROLE_USER ru where r.ID=ru.ROLE_ID and ru.USER_ID=#para(userId)
+	)
+) order by GROUP_ORDER;
+#end
+
+
 #include("message.sql")
\ No newline at end of file