更新Model

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,7 +85,7 @@ 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");
 	}
@@ -94,7 +94,7 @@ public abstract class BaseMenu<M extends BaseMenu<M>> extends Model<M> implement
 		set("FIRST_LEVEL_NAME", firstLevelName);
 		return (M)this;
 	}
-
+	
 	public java.lang.String getFirstLevelName() {
 		return getStr("FIRST_LEVEL_NAME");
 	}
@@ -103,7 +103,7 @@ public abstract class BaseMenu<M extends BaseMenu<M>> extends Model<M> implement
 		set("SECOND_LEVEL_NAME", secondLevelName);
 		return (M)this;
 	}
-
+	
 	public java.lang.String getSecondLevelName() {
 		return getStr("SECOND_LEVEL_NAME");
 	}
@@ -112,7 +112,7 @@ public abstract class BaseMenu<M extends BaseMenu<M>> extends Model<M> implement
 		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,133 +54,22 @@ public abstract class BaseOrgan<M extends BaseOrgan<M>> extends Model<M> impleme
 		return getStr("IDSEQ");
 	}
 
-	/**
-	 * 用于接收kafka机构的ID
-	 */
-	public M setDcOrguuid(java.lang.String dcOrguuid) {
-		set("DC_ORGUUID", dcOrguuid);
+	public M setIdpath(java.lang.String idpath) {
+		set("IDPATH", idpath);
 		return (M)this;
 	}
 	
-	/**
-	 * 用于接收kafka机构的ID
-	 */
-	public java.lang.String getDcOrguuid() {
-		return getStr("DC_ORGUUID");
+	public java.lang.String getIdpath() {
+		return getStr("IDPATH");
 	}
 
-	/**
-	 * 用于接收kafka机构的父ID
-	 */
-	public M setDcParentorguuid(java.lang.String dcParentorguuid) {
-		set("DC_PARENTORGUUID", dcParentorguuid);
+	public M setRanking(java.lang.Integer ranking) {
+		set("RANKING", ranking);
 		return (M)this;
 	}
 	
-	/**
-	 * 用于接收kafka机构的父ID
-	 */
-	public java.lang.String getDcParentorguuid() {
-		return getStr("DC_PARENTORGUUID");
-	}
-
-	/**
-	 * 机构的锁定
-	 */
-	public M setDcDelflag(java.lang.String dcDelflag) {
-		set("DC_DELFLAG", dcDelflag);
-		return (M)this;
-	}
-	
-	/**
-	 * 机构的锁定
-	 */
-	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");
+	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,21 +135,6 @@ 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");
-	}
-
 	public M setErrorcount(java.lang.Integer errorcount) {
 		set("ERRORCOUNT", errorcount);
 		return (M)this;
@@ -168,67 +153,19 @@ 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);
+	/**
+	 * 该用户最后一次选择的档案门类
+	 */
+	public M setLastChoiceLibrary(java.lang.String lastChoiceLibrary) {
+		set("LAST_CHOICE_LIBRARY", lastChoiceLibrary);
 		return (M)this;
 	}
 	
-	public java.lang.String getDcDelflag() {
-		return getStr("DC_DELFLAG");
+	/**
+	 * 该用户最后一次选择的档案门类
+	 */
+	public java.lang.String getLastChoiceLibrary() {
+		return getStr("LAST_CHOICE_LIBRARY");
 	}
 
 }

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
\ No newline at end of file
+MyIpAddress=127.0.0.1,39.104.28.145,39.104.174.12
\ No newline at end of file