Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
aserver
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
15所TongWeb
aserver
Commits
d306ea70
Commit
d306ea70
authored
Aug 28, 2020
by
lidecai15948775315
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新Model
parent
007f7545
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
54 additions
and
231 deletions
+54
-231
_DataDictionary.txt
src/main/java/com/archser/aserver/model/_DataDictionary.txt
+20
-32
BaseMenu.java
src/main/java/com/archser/aserver/model/base/BaseMenu.java
+0
-0
BaseOrgan.java
src/main/java/com/archser/aserver/model/base/BaseOrgan.java
+8
-119
BaseRole.java
src/main/java/com/archser/aserver/model/base/BaseRole.java
+9
-0
BaseUser.java
src/main/java/com/archser/aserver/model/base/BaseUser.java
+10
-73
config-pro.properties
src/main/resources/config-pro.properties
+7
-7
No files found.
src/main/java/com/archser/aserver/model/_DataDictionary.txt
View file @
d306ea70
...
...
@@ -43,9 +43,9 @@ Table: AS_LOG
-------------+-----------------+------+-----+---------+---------
Table: AS_MENU
-------------+---------------+------+-----+---------+---------
-------------
------
+---------------+------+-----+---------+---------
Field | Type | Null | Key | Default | Remarks
-------------+---------------+------+-----+---------+---------
-------------
------
+---------------+------+-----+---------+---------
ID | NUMBER(9) | NO | PRI | |
NAME | VARCHAR2(50) | YES | | |
TITLE | VARCHAR2(50) | YES | | |
...
...
@@ -55,8 +55,9 @@ Table: AS_MENU
TARGET | VARCHAR2(30) | YES | | |
SYSTEM_ID | NUMBER(9) | YES | | |
HIDDEN | NUMBER(9) | YES | | |
ID | NUMBER(9) | NO | PRI | |
NAME | VARCHAR2(50) | YES | | |
FIRST_LEVEL_NAME | VARCHAR2(255) | YES | | |
SECOND_LEVEL_NAME | VARCHAR2(255) | YES | | |
GROUP_ORDER | INTEGER(10) | YES | | |
TITLE | VARCHAR2(50) | YES | | |
ICON | VARCHAR2(50) | YES | | |
DESCRIPTION | VARCHAR2(255) | YES | | |
...
...
@@ -65,7 +66,9 @@ Table: AS_MENU
SYSTEM_ID | NUMBER(9) | YES | | |
HIDDEN | NUMBER(9) | YES | | |
GROUPNAME | VARCHAR2(50) | YES | | |
-------------+---------------+------+-----+---------+---------
GROUPORDER | NUMBER(9) | YES | | 0 |
ID | NUMBER(9) | YES | PRI | |
-------------------+---------------+------+-----+---------+---------
Table: AS_MENU_STAR
---------+-----------+------+-----+---------+---------
...
...
@@ -101,32 +104,23 @@ Table: AS_MESSAGE
CONTENT | VARCHAR2(1000) | YES | | |
SYSTEM_ID | NUMBER(9) | YES | | |
PATH | VARCHAR2(255) | YES | | |
PARAMS | VARCHAR2(
400)
| YES | | |
PARAMS | VARCHAR2(
1000)
| YES | | |
OPERATE | VARCHAR2(40) | YES | | |
READ | VARCHAR2(1) | YES | | |
SEND_TIME | TIMESTAMP(36,6) | YES | | |
------------+-----------------+------+-----+---------+---------
Table: AS_ORGAN
------------------+---------------+------+-----+---------+---------
------------------+---------------
-
+------+-----+---------+---------
Field | Type | Null | Key | Default | Remarks
------------------+---------------+------+-----+---------+---------
------------------+---------------
-
+------+-----+---------+---------
ID | NUMBER(9) | NO | PRI | |
NAME | VARCHAR2(50) | YES | | |
PID | NUMBER(9) | YES | | |
ISUNIT | VARCHAR2(1) | YES | | 'N' |
IDSEQ | VARCHAR2(500) | YES | | '' |
DC_ORGUUID | VARCHAR2(500) | YES | | | 用于接收kafka机构的ID
DC_PARENTORGUUID | VARCHAR2(500) | YES | | | 用于接收kafka机构的父ID
DC_DELFLAG | VARCHAR2(50) | YES | | | 机构的锁定
DC_ORGLEVEL | VARCHAR2(255) | YES | | | 部门级别
DC_SERIALINDEX | VARCHAR2(255) | YES | | | 排序
DC_ORGCODE | VARCHAR2(255) | YES | | NULL |
DC_ENNAME | VARCHAR2(255) | YES | | NULL |
DC_ORGTYPE | VARCHAR2(255) | YES | | NULL |
DC_ORGSORT | VARCHAR2(255) | YES | | NULL |
DC_ORGLEVELCODE | VARCHAR2(255) | YES | | NULL |
DC_STATUS | VARCHAR2(255) | YES | | NULL |
IDSEQ | VARCHAR2(500) | YES | | '' | 机构立档单位路径
IDPATH | VARCHAR2(1000) | YES | | |
RANKING | NUMBER(4) | YES | | |
ID | NUMBER(9) | NO | PRI | |
NAME | VARCHAR2(50) | YES | | |
PID | NUMBER(9) | YES | | |
...
...
@@ -143,7 +137,7 @@ Table: AS_ORGAN
DC_ORGSORT | VARCHAR2(255) | YES | | NULL |
DC_ORGLEVELCODE | VARCHAR2(255) | YES | | NULL |
DC_STATUS | VARCHAR2(255) | YES | | NULL |
------------------+---------------+------+-----+---------+---------
------------------+---------------
-
+------+-----+---------+---------
Table: AS_ROLE
-------------+---------------+------+-----+---------+---------
...
...
@@ -155,6 +149,7 @@ Table: AS_ROLE
LOCKED | VARCHAR2(1) | YES | | |
CREATETIME | TIMESTAMP(29) | YES | | |
IDSEQ | VARCHAR2(500) | YES | | '' |
ISINCLUDE | VARCHAR2(5) | YES | | |
ID | NUMBER(9) | NO | PRI | |
NAME | VARCHAR2(50) | YES | | |
DESCRIPTION | VARCHAR2(255) | YES | | |
...
...
@@ -214,9 +209,9 @@ Table: AS_SYSTEM
-------------+----------------+------+-----+---------+---------
Table: AS_USER
-----------------+------------------+------+-----+---------+---------
-----------------
----
+------------------+------+-----+---------+---------
Field | Type | Null | Key | Default | Remarks
-----------------+------------------+------+-----+---------+---------
-----------------
----
+------------------+------+-----+---------+---------
ID | NUMBER(9) | NO | PRI | |
USERNAME | VARCHAR2(40) | YES | | |
PASSWORD | VARCHAR2(64) | YES | | |
...
...
@@ -231,16 +226,9 @@ Table: AS_USER
POSTCODE | VARCHAR2(10) | YES | | |
DESCRIPTION | VARCHAR2(500) | YES | | |
IMAGE | BLOB(2147483647) | YES | | |
UUID | VARCHAR2(500) | YES | | | kafka中用户ID
ERRORCOUNT | NUMBER(9) | YES | | |
LAST_LOGIN_TIME | TIMESTAMP(29) | YES | | |
DC_PERSONCODE | VARCHAR2(500) | YES | | |
DC_USERID | VARCHAR2(255) | YES | | NULL |
DC_IDNUM | VARCHAR2(50) | YES | | NULL |
DC_CARDTYPE | VARCHAR2(50) | YES | | NULL |
DC_LAWCARD | VARCHAR2(64) | YES | | NULL |
DC_SEQUENCENO | VARCHAR2(11) | YES | | NULL |
DC_DELFLAG | VARCHAR2(255) | YES | | NULL |
LAST_CHOICE_LIBRARY | VARCHAR2(1000) | YES | | | 该用户最后一次选择的档案门类
ID | NUMBER(9) | NO | PRI | |
USERNAME | VARCHAR2(40) | YES | | |
PASSWORD | VARCHAR2(64) | YES | | |
...
...
@@ -265,5 +253,5 @@ Table: AS_USER
DC_LAWCARD | VARCHAR2(64) | YES | | NULL |
DC_SEQUENCENO | VARCHAR2(11) | YES | | NULL |
DC_DELFLAG | VARCHAR2(255) | YES | | NULL |
-----------------+------------------+------+-----+---------+---------
-----------------
----
+------------------+------+-----+---------+---------
src/main/java/com/archser/aserver/model/base/BaseMenu.java
View file @
d306ea70
src/main/java/com/archser/aserver/model/base/BaseOrgan.java
View file @
d306ea70
...
...
@@ -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
);
return
(
M
)
this
;
}
/**
* 用于接收kafka机构的ID
*/
public
java
.
lang
.
String
getDcOrguuid
()
{
return
getStr
(
"DC_ORGUUID"
);
}
/**
* 用于接收kafka机构的父ID
*/
public
M
setDcParentorguuid
(
java
.
lang
.
String
dcParentorguuid
)
{
set
(
"DC_PARENTORGUUID"
,
dcParentorguuid
);
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
);
public
M
setIdpath
(
java
.
lang
.
String
idpath
)
{
set
(
"IDPATH"
,
idpath
);
return
(
M
)
this
;
}
public
java
.
lang
.
String
get
DcOrglevelcode
()
{
return
getStr
(
"
DC_ORGLEVELCODE
"
);
public
java
.
lang
.
String
get
Idpath
()
{
return
getStr
(
"
IDPATH
"
);
}
public
M
set
DcStatus
(
java
.
lang
.
String
dcStatus
)
{
set
(
"
DC_STATUS"
,
dcStatus
);
public
M
set
Ranking
(
java
.
lang
.
Integer
ranking
)
{
set
(
"
RANKING"
,
ranking
);
return
(
M
)
this
;
}
public
java
.
lang
.
String
getDcStatus
()
{
return
get
Str
(
"DC_STATUS
"
);
public
java
.
lang
.
Integer
getRanking
()
{
return
get
Int
(
"RANKING
"
);
}
}
src/main/java/com/archser/aserver/model/base/BaseRole.java
View file @
d306ea70
...
...
@@ -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
View file @
d306ea70
...
...
@@ -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
View file @
d306ea70
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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment