fix: 优化梯级排序
This commit is contained in:
parent
9b93565fc5
commit
fdf1463427
@ -13,6 +13,8 @@ public class EngRsvrcscdBVo {
|
|||||||
|
|
||||||
private String rvcdName;
|
private String rvcdName;
|
||||||
|
|
||||||
|
private String bldsttCcode;
|
||||||
|
|
||||||
private String stcd;
|
private String stcd;
|
||||||
|
|
||||||
private String ennm;
|
private String ennm;
|
||||||
|
|||||||
@ -3522,6 +3522,7 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
|
|||||||
.append("eng.BASE_ID AS rvcd, ")
|
.append("eng.BASE_ID AS rvcd, ")
|
||||||
.append("eng.BASE_NAME AS rvcdName, ")
|
.append("eng.BASE_NAME AS rvcdName, ")
|
||||||
.append("r.STCD AS stcd, ")
|
.append("r.STCD AS stcd, ")
|
||||||
|
.append("eng.BLDSTT_CODE AS bldsttCcode, ")
|
||||||
.append("eng.ENNM AS ennm, ")
|
.append("eng.ENNM AS ennm, ")
|
||||||
.append("r.SRCDIS AS srcdis, ")
|
.append("r.SRCDIS AS srcdis, ")
|
||||||
.append("r.DMHG AS dmhg, ")
|
.append("r.DMHG AS dmhg, ")
|
||||||
|
|||||||
@ -37,11 +37,12 @@ spring:
|
|||||||
remove-abandoned-timeout: 1800
|
remove-abandoned-timeout: 1800
|
||||||
log-abandoned: true
|
log-abandoned: true
|
||||||
break-after-acquire-failure: true
|
break-after-acquire-failure: true
|
||||||
time-between-connect-error-millis: 300000
|
time-between-connect-error-millis: 30000
|
||||||
pool-prepared-statements: true
|
pool-prepared-statements: true
|
||||||
max-open-prepared-statements: 100
|
max-open-prepared-statements: 100
|
||||||
max-pool-prepared-statement-per-connection-size: 100
|
max-pool-prepared-statement-per-connection-size: 100
|
||||||
connection-properties: oracle.net.CONNECT_TIMEOUT=10000;oracle.jdbc.ReadTimeout=60000;oracle.net.READ_TIMEOUT=60000
|
connection-properties: connectTimeout=10000;oracle.jdbc.ReadTimeout=60000;oracle.net.READ_TIMEOUT=60000
|
||||||
|
# connection-properties: oracle.net.CONNECT_TIMEOUT=10000;oracle.jdbc.ReadTimeout=60000;oracle.net.READ_TIMEOUT=60000
|
||||||
slave:
|
slave:
|
||||||
driverClassName: dm.jdbc.driver.DmDriver
|
driverClassName: dm.jdbc.driver.DmDriver
|
||||||
url: "${DB_MASTER_URL:jdbc:dm://172.16.21.143:5236/QGC_REFA}"
|
url: "${DB_MASTER_URL:jdbc:dm://172.16.21.143:5236/QGC_REFA}"
|
||||||
@ -69,11 +70,12 @@ spring:
|
|||||||
remove-abandoned-timeout: 1800
|
remove-abandoned-timeout: 1800
|
||||||
log-abandoned: true
|
log-abandoned: true
|
||||||
break-after-acquire-failure: true
|
break-after-acquire-failure: true
|
||||||
time-between-connect-error-millis: 300000
|
time-between-connect-error-millis: 30000
|
||||||
pool-prepared-statements: true
|
pool-prepared-statements: true
|
||||||
max-open-prepared-statements: 100
|
max-open-prepared-statements: 100
|
||||||
max-pool-prepared-statement-per-connection-size: 100
|
max-pool-prepared-statement-per-connection-size: 100
|
||||||
connection-properties: oracle.net.CONNECT_TIMEOUT=10000;oracle.jdbc.ReadTimeout=60000;oracle.net.READ_TIMEOUT=60000
|
connection-properties: connectTimeout=10000;oracle.jdbc.ReadTimeout=60000;oracle.net.READ_TIMEOUT=60000
|
||||||
|
# connection-properties: oracle.net.CONNECT_TIMEOUT=10000;oracle.jdbc.ReadTimeout=60000;oracle.net.READ_TIMEOUT=60000
|
||||||
filter:
|
filter:
|
||||||
stat:
|
stat:
|
||||||
enabled: true
|
enabled: true
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user