修改

src/main/resources/application-dev.yml

@@ -7,9 +7,17 @@ spring:
     driver-class-name: oracle.jdbc.OracleDriver
     druid:
       max-active: 50
-      initial-size: 5
-      min-idle: 5
-      max-wait: 60000
+      initial-size: 10
+      min-idle: 10
+      max-wait: 3000
+      # Oracle专属优化参数
+      validation-query: SELECT 1 FROM DUAL  # Oracle的验证查询
+      test-while-idle: true
+      test-on-borrow: false
+      test-on-return: false
+      time-between-eviction-runs-millis: 300000  # 空闲连接检测间隔
+      remove-abandoned: true
+      remove-abandoned-timeout: 600
   application:
     name: antai-api
   mvc:

src/main/resources/application-prod.yml

@@ -7,9 +7,17 @@ spring:
     driver-class-name: oracle.jdbc.OracleDriver
     druid:
       max-active: 50
-      initial-size: 5
-      min-idle: 5
-      max-wait: 60000
+      initial-size: 10
+      min-idle: 10
+      max-wait: 3000
+      # Oracle专属优化参数
+      validation-query: SELECT 1 FROM DUAL  # Oracle的验证查询
+      test-while-idle: true
+      test-on-borrow: false
+      test-on-return: false
+      time-between-eviction-runs-millis: 300000  # 空闲连接检测间隔
+      remove-abandoned: true
+      remove-abandoned-timeout: 600
   application:
     name: antai-api
   mvc:

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -232,6 +232,7 @@
         "label",
         "text",
         "remark",
+        "businessCompanyId",
         "prop"
         from(
         select * from(
@@ -243,6 +244,7 @@
         t.MATERIAL_TYPE_NAME "label",
         t.MATERIAL_TYPE_NAME "text",
         t.REMARK "remark",
+        company_id "businessCompanyId",
         'operationsName' "prop"
         from RMS_MATERIAL_TYPE t
         where t.DELETED = 0
@@ -1656,6 +1658,7 @@
         WHERE RP.DELETED != -1
         <if test="driverCapacityId!=null and driverCapacityId!=''">
             and RCD.capacity_id = #{driverCapacityId}
+            and rcd.deleted = 0
         </if>
         <if test="isNC!=null">
             AND RP.SOURCE_ID IS NOT NULL

src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J配置
-log4j.rootCategory=INFO,file,RUNNING,errorfile
+log4j.rootCategory=file
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout