Explorar el Código

feat: 基金管理展示兼容oceanbase

chenjianhua hace 6 meses
padre
commit
3b90b83ef3

+ 5 - 0
service-base/pom.xml

@@ -40,6 +40,11 @@
             <artifactId>DmJdbcDriver18</artifactId>
         </dependency>
         <dependency>
+            <groupId>com.oceanbase</groupId>
+            <artifactId>oceanbase-client</artifactId>
+            <version>2.4.9</version>
+        </dependency>
+        <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
         </dependency>

+ 1 - 1
service-base/src/main/resources/mapper/CompanyEmailHistoryMapper.xml

@@ -41,7 +41,7 @@
             cec.email,
             maxce.send_time as send_time,
             maxce.send_remark,
-            COALESCE(maxce.send_status,-1) as send_status
+            IFNULL(maxce.send_status,-1) as send_status
         FROM
         company_email_config cec
         JOIN pvn_company_info c

+ 8 - 8
service-base/src/main/resources/mapper/EmailFileInfoMapper.xml

@@ -99,10 +99,10 @@
     </resultMap>
     <select id="searchEmailDetailById" resultMap="BaseDetailMap">
         SELECT distinct
-            COALESCE(nav.fund_id,asset.fund_id) as fund_id,
-            COALESCE(nav.fund_name,asset.fund_name) as fund_name,
-            COALESCE(nav.register_number,asset.register_number) as register_number,
-            COALESCE(nav.price_date,asset.price_date) as price_date,
+            IFNULL(nav.fund_id,asset.fund_id) as fund_id,
+            IFNULL(nav.fund_name,asset.fund_name) as fund_name,
+            IFNULL(nav.register_number,asset.register_number) as register_number,
+            IFNULL(nav.price_date,asset.price_date) as price_date,
             nav.nav,
             nav.cumulative_nav_withdrawal,
             asset.asset_net,
@@ -178,10 +178,10 @@
             parameterType="com.simuwang.base.pojo.dto.query.EmailFileQuery">
             select count(1) from (
             SELECT distinct
-            COALESCE(nav.fund_id,asset.fund_id) as fund_id,
-            COALESCE(nav.fund_name,asset.fund_name) as fund_name,
-            COALESCE(nav.register_number,asset.register_number) as register_number,
-            COALESCE(nav.price_date,asset.price_date) as price_date,
+            IFNULL(nav.fund_id,asset.fund_id) as fund_id,
+            IFNULL(nav.fund_name,asset.fund_name) as fund_name,
+            IFNULL(nav.register_number,asset.register_number) as register_number,
+            IFNULL(nav.price_date,asset.price_date) as price_date,
             nav.nav,
             nav.cumulative_nav_withdrawal,
             asset.asset_net,

+ 1 - 1
service-base/src/main/resources/mapper/FundInfoMapper.xml

@@ -51,7 +51,7 @@
                c.company_name as companyName,
                c.credit_code as creditCode,
                f.inception_date as inceptionDate,
-               COALESCE(n.last_price_date,'') as lastPriceDate,
+               IFNULL(n.last_price_date,'') as lastPriceDate,
                r.nav_frequency as navFrequency,
                r.asset_frequency as assetFrequency,
                r.valuation_frequency as valuationFrequency,

+ 1 - 1
service-base/src/main/resources/mapper/FundNavAssetMapper.xml

@@ -16,7 +16,7 @@
         SELECT distinct
         info.fund_id,
         info.fund_short_name,
-        COALESCE(
+        IFNULL(
         nav.price_date,
         asset.price_date
         ) AS price_date,

+ 3 - 3
service-deploy/src/main/resources/application.yml

@@ -27,9 +27,9 @@ spring:
     data-daq:
       # 指定为HikariDataSource
       type: com.zaxxer.hikari.HikariDataSource
-      driver-class-name: org.postgresql.Driver
-      url: jdbc:postgresql://192.168.1.37:5432/PPW_EMAIL
-      username: smppw01
+      driver-class-name: com.alipay.oceanbase.obproxy.mysql.jdbc.Driver
+      url: jdbc:oceanbase://192.168.1.28:2881/ppw_email?serverTimezone=Asia/Shanghai&useLegacyDatetimeCode=false&useSSL=false&nullNamePatternMatchesAll=true&useUnicode=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=true
+      username: root
       password: Smppw@2024
       # hikari连接池配置 对应 HikariConfig 配置属性类
       hikari: