增加虚谷数据库支持

pom.xml

@@ -10,8 +10,8 @@
     </parent>
     <groupId>com.syjy</groupId>
     <artifactId>calculation-spring-boot-starter</artifactId>
-    <version>0.0.40</version>
-    <!--    <version>0.0.40-SNAPSHOT</version>-->
+    <version>0.0.42</version>
+<!--    <version>0.0.42-SNAPSHOT</version>-->
     <name>calculation</name>
     <description>Demo project for Spring Boot</description>
     <properties>
@@ -49,7 +49,12 @@
             <artifactId>postgresql</artifactId>
             <version>42.5.0</version> <!-- 请使用最新的稳定版本 -->
         </dependency>
-
+        <!-- https://mvnrepository.com/artifact/com.xugudb/xugu-jdbc -->
+        <dependency>
+            <groupId>com.xugudb</groupId>
+            <artifactId>xugu-jdbc</artifactId>
+            <version>12.3.4</version>
+        </dependency>
         <!--mysql 驱动-->
         <dependency>
             <groupId>mysql</groupId>
@@ -57,19 +62,19 @@
         </dependency>
 
         <!--本地使用时候放开-->
-        <dependency>
-            <groupId>kingbasejdbc4</groupId>
-            <artifactId>kingbasejdbc4</artifactId>
-            <version>1</version>
-        </dependency>
-
-        <!--发布时候放开-->
         <!--        <dependency>-->
-        <!--            <groupId>com.alibaba.cloud</groupId>-->
-        <!--            <version>2.2.0.RELEASE</version>-->
-        <!--            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>-->
+        <!--            <groupId>kingbasejdbc4</groupId>-->
+        <!--            <artifactId>kingbasejdbc4</artifactId>-->
+        <!--            <version>1</version>-->
         <!--        </dependency>-->
 
+        <!--发布时候放开-->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <version>2.2.0.RELEASE</version>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+
         <!-- druid 连接池 -->
         <dependency>
             <groupId>com.alibaba</groupId>
@@ -151,27 +156,38 @@
         </snapshotRepository>
 
         <!--csc-->
-        <!--        <repository>-->
-        <!--            <id>jiayue-csc-releases</id>-->
-        <!--            <url>http://49.4.68.219:8888/repository/jiayue-csc-releases/</url>-->
-        <!--        </repository>-->
-        <!--        <snapshotRepository>-->
-        <!--            <id>jiayue-csc-snapshots</id>-->
-        <!--            <url>http://49.4.68.219:8888/repository/jiayue-csc-snapshots/</url>-->
-        <!--        </snapshotRepository>-->
+<!--        <repository>-->
+<!--            <id>jiayue-csc-releases</id>-->
+<!--            <url>http://49.4.68.219:8888/repository/jiayue-csc-releases/</url>-->
+<!--        </repository>-->
+<!--        <snapshotRepository>-->
+<!--            <id>jiayue-csc-snapshots</id>-->
+<!--            <url>http://49.4.68.219:8888/repository/jiayue-csc-snapshots/</url>-->
+<!--        </snapshotRepository>-->
 
     </distributionManagement>
 
     <build>
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                    <compilerArguments>
+                        <bootclasspath>D:\develops\Eclipse Adoptium\jdk-8.0.432.6-hotspot\jre\lib/rt.jar</bootclasspath>
+                    </compilerArguments>
+                </configuration>
+            </plugin>
+            <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <!--独立打包作为服务和对外接口时候需要注释，上传Maven取消注释-->
-                <!--                <configuration>-->
-                <!--                    <skip>true</skip>-->
-                <!--                    <mainClass>com.syjy.calculate.CalculationApplication</mainClass>-->
-                <!--                </configuration>-->
+                <configuration>
+                    <skip>true</skip>
+                    <mainClass>com.syjy.calculate.CalculationApplication</mainClass>
+                </configuration>
                 <executions>
                     <execution>
                         <goals>

src/main/java/com/syjy/calculate/entity/CalculateResult.java

@@ -162,6 +162,7 @@ public class CalculateResult extends HashMap<String, Object> {
     public static final String DB_KINGBASE = "kingbase";
     public static final String DB_POSTGRES = "postgres";
     public static final String DB_HIGHGO = "highgo";
+    public static final String DB_XUGU = "xugu";
     // 授权信息
     public static final String AUTHORIZATION = "Authorization";
 

src/main/java/com/syjy/calculate/repository/repositoryImpl/CalculationFormulaRepositoryImpl.java

@@ -416,17 +416,24 @@ public class CalculationFormulaRepositoryImpl implements CalculationFormulaRepos
       String dbType = properties.getDbType();
       String path;
       // 获取初始化公式表sql
-      // 如果是金仓数据库
-      if (CalculateResult.DB_KINGBASE.equals(dbType)) {
-        path = "sql/t_calculation_formula_king_base.sql";
-      } else if (ObjectUtil.equal(CalculateResult.DB_POSTGRES, dbType)) {
-        path = "sql/t_calculation_formula_postgresql.sql";
-      } else if (ObjectUtil.equal(CalculateResult.DB_HIGHGO, dbType)) {
-        path = "sql/t_calculation_formula_highgo.sql";
-      } else {// 如果是mysql
-        path = "sql/t_calculation_formula.sql";
+      switch (dbType) {
+        case CalculateResult.DB_KINGBASE: // 金昌数据库
+          path = "sql/t_calculation_formula_king_base.sql";
+          break;
+        case CalculateResult.DB_POSTGRES: // PG数据库
+          path = "sql/t_calculation_formula_postgresql.sql";
+          break;
+        case CalculateResult.DB_HIGHGO: // 瀚高数据库
+          path = "sql/t_calculation_formula_highgo.sql";
+          break;
+        case CalculateResult.DB_XUGU: // 虚谷数据库
+          path = "sql/t_calculation_formula_xugu.sql";
+          break;
+        case CalculateResult.DB_MYSQL: // Mysql数据库
+        default:
+          path = "sql/t_calculation_formula.sql";
       }
-
+      log.info("建表：{}", path);
       // 用ClassLoader获取jar包中的文件，获取文件流
       ClassLoader defaultClassLoader = ClassUtils.getDefaultClassLoader();
       assert defaultClassLoader != null;
@@ -471,9 +478,10 @@ public class CalculationFormulaRepositoryImpl implements CalculationFormulaRepos
         }
       };
       switch (dbType) {
-        case CalculateResult.DB_POSTGRES:
         case CalculateResult.DB_KINGBASE:
+        case CalculateResult.DB_POSTGRES:
         case CalculateResult.DB_HIGHGO:
+        case CalculateResult.DB_XUGU:
           jdbcTemplate.execute(SqlUtil.formatSql(IoUtil.read(sqlInputStream, StandardCharsets.UTF_8)));
           jdbcTemplate.batchUpdate("INSERT INTO T_CALCULATION_FORMULA VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)", pss);
           break;

src/main/resources/application.yml

@@ -11,17 +11,17 @@
 #      url: jdbc:mysql://192.168.1.226:3306/ipfcst-v3?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&characterSetResults=UTF-8&autoReconnect=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
 #      driver-class-name: com.mysql.cj.jdbc.Driver
 
-server:
-  port: 9089
-spring:
-  datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    druid:
-      # 数据源配置
-      username: root
-      password: '!QAZ2root'
-      url: jdbc:mysql://localhost:3306/ipfcst-v3?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&characterSetResults=UTF-8&autoReconnect=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
-      driver-class-name: com.mysql.cj.jdbc.Driver
+#server:
+#  port: 9089
+#spring:
+#  datasource:
+#    type: com.alibaba.druid.pool.DruidDataSource
+#    druid:
+#      # 数据源配置
+#      username: root
+#      password: '!QAZ2root'
+#      url: jdbc:mysql://localhost:3306/ipfcst-v3?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&characterSetResults=UTF-8&autoReconnect=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
+#      driver-class-name: com.mysql.cj.jdbc.Driver
 
 #      金仓数据库
 #      username: SYSTEM
@@ -29,14 +29,14 @@ spring:
 #      url: jdbc:kingbase://192.168.1.204:54321/ipfcstV3
 #      driver-class-name: com.kingbase.Driver
 
-logging:
-  file:
-    name: ./logs/calculate.log
-
-calculate:
-  service:
-    enabled: true
-    version: 0.0.40
-    dbType: mysql
+#logging:
+#  file:
+#    name: ./logs/calculate.log
+#
+#calculate:
+#  service:
+#    enabled: true
+#    version: 0.0.40
+#    dbType: mysql
 
 version: @project.version@

src/main/resources/sql/t_calculation_formula_xugu.sql

@@ -0,0 +1,19 @@
+CREATE TABLE T_CALCULATION_FORMULA (
+ID INTEGER identity(1,1),
+TYPE VARCHAR (50) NOT NULL,
+ORDER_NO INTEGER,
+FORMULA TEXT NOT NULL,
+PROVINCE VARCHAR (50) NOT NULL,
+ELECTRIC_TYPE VARCHAR (50) NOT NULL,
+STATION_CODE VARCHAR (50),
+RULE_FORMULA VARCHAR (50),
+IS_RATE VARCHAR (50) NOT NULL,
+MAX_MIN_LIMIT VARCHAR (50),
+STATE VARCHAR (50),
+DATA_SOURCE_TYPE VARCHAR (50),
+HOW_MANY_DAYS VARCHAR (50),
+CREATE_TIME TIMESTAMP(0),
+CREATOR VARCHAR (50),
+LAST_MODIFIER VARCHAR (50),
+LAST_MODIFY_TIME TIMESTAMP(0),
+PRIMARY KEY (ID));