Merge branch 'SZDAS_V2.0' of http://gitlab.archser.com/common/aserver into SZDAS_V2.0

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;
@@ -20,7 +23,6 @@ import com.jfinal.plugin.activerecord.Db;
  * 应用菜单相关操作
  *
  * @author dgq
- *
  */
 public class MenuController extends Controller {
 
@@ -30,7 +32,7 @@ public class MenuController extends Controller {
   private MenuService menuService;
 
   /**
-      获取权限菜单
+   * 获取权限菜单
    */
   public void index() {
     String username = this.getAttrForStr("username");
@@ -59,7 +61,6 @@ public class MenuController extends Controller {
   }
 
 
-	
   /**
    * 获取菜单列表
    */
@@ -81,7 +82,7 @@ public class MenuController extends Controller {
     try {
       Menu menu = getBean(Menu.class, "menu");
       boolean state = menuService.saveMenuData(menu);
-			renderJson(Ret.ok("msg", state?"保存菜单数据成功！":"保存菜单数据出错，请刷新后重试！"));
+      renderJson(Ret.ok("msg", state ? "保存菜单数据成功！" : "保存菜单数据出错，请刷新后重试！"));
     } catch (Exception e) {
       e.printStackTrace();
       renderJson(Ret.fail("msg", "保存菜单数据出错，请刷新后重试！"));
@@ -95,7 +96,7 @@ public class MenuController extends Controller {
     try {
       String[] ids = getPara("ids").split(",");
       boolean state = menuService.deleteMenu(ids);
-			renderJson(Ret.ok("msg", state?"删除菜单数据成功！":"删除菜单数据出错！"));
+      renderJson(Ret.ok("msg", state ? "删除菜单数据成功！" : "删除菜单数据出错！"));
     } catch (Exception e) {
       e.printStackTrace();
       renderJson(Ret.fail("msg", "删除菜单数据出错，请刷新后重试！"));
@@ -174,4 +175,41 @@ 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<>();
+//        页面中显示的菜单，过滤隐藏的菜单
+    Map<String, Map<String, List<Menu>>> viewApps = new HashMap<>();
+    allMenuList.forEach(menu -> {
+      //        	处理菜单属性
+      System system = systemMap.get(menu.getSystemId());
+      menu.put("system", system.getName());
+      menu.put("url", system.getUrl());
+//            过滤不需要显示的菜单
+      if (menu.getHidden() == null || menu.getHidden() != 1) {
+        menu.put("star", exist(menu.getId(), stars));
+//            一级菜单组
+        viewApps.putIfAbsent(menu.getFirstLevelName(), new HashMap<String, List<Menu>>());
+//            二级菜单组
+        viewApps.get(menu.getFirstLevelName()).putIfAbsent(menu.getSecondLevelName(), new ArrayList<Menu>());
+//            最终菜单
+        viewApps.get(menu.getFirstLevelName()).get(menu.getSecondLevelName()).add(menu);
+      }
+//            一级菜单组
+      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("viewApps", viewApps).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

@@ -90,4 +90,31 @@ public abstract class BaseMenu<M extends BaseMenu<M>> extends Model<M> implement
 		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,22 @@ 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);
+	public M setIdpath(java.lang.String idpath) {
+		set("IDPATH", idpath);
 		return (M)this;
 	}
 	
-	public java.lang.String getUuid() {
-		return getStr("UUID");
+	public java.lang.String getIdpath() {
+		return getStr("IDPATH");
 	}
 
-	public M setPuuid(java.lang.String puuid) {
-		set("PUUID", puuid);
+	public M setRanking(java.lang.Integer ranking) {
+		set("RANKING", ranking);
 		return (M)this;
 	}
 	
-	public java.lang.String getPuuid() {
-		return getStr("PUUID");
-	}
-
-	public M setLocked(java.lang.String locked) {
-		set("LOCKED", locked);
-		return (M)this;
-	}
-	
-	public java.lang.String getLocked() {
-		return getStr("LOCKED");
+	public java.lang.Integer getRanking() {
+		return getInt("RANKING");
 	}
 
 }

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

@@ -63,4 +63,13 @@ public abstract class BaseRole<M extends BaseRole<M>> extends Model<M> implement
 		return getStr("IDSEQ");
 	}
 
+	public M setIsinclude(java.lang.String isinclude) {
+		set("ISINCLUDE", isinclude);
+		return (M)this;
+	}
+	
+	public java.lang.String getIsinclude() {
+		return getStr("ISINCLUDE");
+	}
+
 }

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

@@ -135,15 +135,6 @@ public abstract class BaseUser<M extends BaseUser<M>> extends Model<M> implement
 		return get("IMAGE");
 	}
 
-	public M setUuid(java.lang.String uuid) {
-		set("UUID", uuid);
-		return (M)this;
-	}
-	
-	public java.lang.String getUuid() {
-		return getStr("UUID");
-	}
-
 	public M setErrorcount(java.lang.Integer errorcount) {
 		set("ERRORCOUNT", errorcount);
 		return (M)this;
@@ -162,4 +153,19 @@ public abstract class BaseUser<M extends BaseUser<M>> extends Model<M> implement
 		return get("LAST_LOGIN_TIME");
 	}
 
+	/**
+	 * 该用户最后一次选择的档案门类
+	 */
+	public M setLastChoiceLibrary(java.lang.String lastChoiceLibrary) {
+		set("LAST_CHOICE_LIBRARY", lastChoiceLibrary);
+		return (M)this;
+	}
+	
+	/**
+	 * 该用户最后一次选择的档案门类
+	 */
+	public java.lang.String getLastChoiceLibrary() {
+		return getStr("LAST_CHOICE_LIBRARY");
+	}
+
 }

src/main/resources/DBUpdate/DM_UpdateSQL.xml

@@ -1881,6 +1881,7 @@
 			CONDITION varchar2(500),
 			CONDITION_UI varchar2(500),
 			TASK_ID number(9,0)
+			WRITEBACK varchar2(500),
 			);
 			create table "AS_CONFIG_RELATION"
 			(
@@ -1911,11 +1912,29 @@
         </sql>
     </version>
 
+    <version edition="74" description="添加自定义水印透明度字段">
+        <sql creator="yangchengwu" createDate="20200819" note="添加自定义水印透明度字段">
+            alter table AS_SCAN_SETTING add WATERMARK_ALPHA DOUBLE(10);
+        </sql>
+    </version>
 
+	<version edition="75" description="添加task表字段">
+        <sql creator="chengYaqing" createDate="20200901" note="添加task表字段">
+        	ALTER TABLE AS_TASK DROP COLUMN (ISDELE);
+        	ALTER TABLE AS_TASK DROP COLUMN (TASKNUMBER);
+        	ALTER TABLE AS_TASK DROP COLUMN (SRCDBID);
+        	ALTER TABLE AS_TASK DROP COLUMN (TASKID);
+        	ALTER TABLE AS_TASK DROP COLUMN (IDSEQ);
+            alter table AS_TASK add (fonds_number varchar2(50), ip varchar2(100) );
+        </sql>
+    </version>
 
 
-
-
+    <version edition="76" description="添加task表字段">
+        <sql creator="lidecai" createDate="20200901" note="设置菜单排序默认值">
+            alter table AS_MENU modify GROUP_ORDER default 0;
+        </sql>
+    </version>
 
 
 

src/main/resources/config-pro.properties

 
 dbType=DM
-jdbcUrl=jdbc:dm://39.104.90.66:5236
+jdbcUrl=jdbc:dm://39.104.174.12:5236
 jdbc.driver=dm.jdbc.driver.DmDriver
-user=archser_yz
-password=archser_yz
-basic.url=http://39.104.90.66:11028
+user=archser
+password=archser_v2.0
+basic.url=http://39.104.174.12:11028
 
 devMode =true
 engineDevMode=true
@@ -13,7 +13,7 @@ authUrl=http://125.77.26.133:7001/auth/token
 userInfoUrl=http://125.77.26.133:7001/api/info/user_info
 redirect_uri=http://192.168.31.17:8080/
 
-redis.url=39.104.90.66
+redis.url=39.104.174.12
 redis.password=archser_redis
 
 # --- 消息中心websocket配置 ---
@@ -26,4 +26,4 @@ messageWsTimeout=30000
 ## 是否开启消息中心的websocket
 openMessageWebSocket=true
 
-MyIpAddress=127.0.0.1,39.104.28.145,39.104.90.66
+MyIpAddress=127.0.0.1,39.104.28.145,39.104.174.12
\ No newline at end of file

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 DESC;
+#end
+
+
 #include("message.sql")
\ No newline at end of file