From fdf14634271cec938c46d17642a3ce4afbd4d5b4 Mon Sep 17 00:00:00 2001
From: tangwei <tangwei0654@163.com>
Date: Fri, 17 Jul 2026 16:51:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E6=A2=AF=E7=BA=A7?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/qgc_base/domain/vo/EngRsvrcscdBVo.java    |  2 ++
 .../qgc_base/service/impl/SdEngInfoBHServiceImpl.java  |  1 +
 backend/src/main/resources/application-prod.yml        | 10 ++++++----
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/vo/EngRsvrcscdBVo.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/vo/EngRsvrcscdBVo.java
index c402b4a4..4ccc4736 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/vo/EngRsvrcscdBVo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/vo/EngRsvrcscdBVo.java
@@ -13,6 +13,8 @@ public class EngRsvrcscdBVo {
 
     private String rvcdName;
 
+    private String bldsttCcode;
+
     private String stcd;
 
     private String ennm;
diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java
index 8e700969..7259fdca 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java
@@ -3522,6 +3522,7 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
                 .append("eng.BASE_ID AS rvcd, ")
                 .append("eng.BASE_NAME AS rvcdName, ")
                 .append("r.STCD AS stcd, ")
+                .append("eng.BLDSTT_CODE AS bldsttCcode, ")
                 .append("eng.ENNM AS ennm, ")
                 .append("r.SRCDIS AS srcdis, ")
                 .append("r.DMHG AS dmhg, ")
diff --git a/backend/src/main/resources/application-prod.yml b/backend/src/main/resources/application-prod.yml
index 1c569fca..cc37ba65 100644
--- a/backend/src/main/resources/application-prod.yml
+++ b/backend/src/main/resources/application-prod.yml
@@ -37,11 +37,12 @@ spring:
         remove-abandoned-timeout: 1800
         log-abandoned: true
         break-after-acquire-failure: true
-        time-between-connect-error-millis: 300000
+        time-between-connect-error-millis: 30000
         pool-prepared-statements: true
         max-open-prepared-statements: 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:
         driverClassName: dm.jdbc.driver.DmDriver
         url: "${DB_MASTER_URL:jdbc:dm://172.16.21.143:5236/QGC_REFA}"
@@ -69,11 +70,12 @@ spring:
         remove-abandoned-timeout: 1800
         log-abandoned: true
         break-after-acquire-failure: true
-        time-between-connect-error-millis: 300000
+        time-between-connect-error-millis: 30000
         pool-prepared-statements: true
         max-open-prepared-statements: 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:
         stat:
           enabled: true