From c41c0c7a5291281c3a9fb63a289e9433d553cf13 Mon Sep 17 00:00:00 2001 From: lbw Date: Thu, 28 Apr 2022 13:43:24 +0800 Subject: [PATCH] =?UTF-8?q?:card=5Ffile=5Fbox:=20=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9B=B8=E5=85=B3=E7=9A=84=E5=8F=98?= =?UTF-8?q?=E5=8C=96=EF=BC=8C=20=E6=94=AF=E6=8C=81=20=E8=BE=BE=E6=A2=A6?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../range/impl/db/provider/DmSqlProvider.java | 42 +++ .../impl/db/provider/MssqlSqlProvider.java | 17 +- pigx-upms/pigx-upms-biz/pom.xml | 5 + .../src/main/resources/generator.properties | 3 + .../resources/mapper/GeneratorDmMapper.xml | 2 +- pigx-visual/pigx-pay-platform/pom.xml | 288 +++++++++--------- 6 files changed, 203 insertions(+), 154 deletions(-) create mode 100644 pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/provider/DmSqlProvider.java diff --git a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/provider/DmSqlProvider.java b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/provider/DmSqlProvider.java new file mode 100644 index 000000000..630f02561 --- /dev/null +++ b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/provider/DmSqlProvider.java @@ -0,0 +1,42 @@ +package com.pig4cloud.pigx.common.sequence.range.impl.db.provider; + +import com.baomidou.mybatisplus.annotation.DbType; +import org.springframework.stereotype.Component; + +/** + * 数据源提供者 + * + * @author 达梦数据库支持 + * @date 2022-04-27 + * + * sql server + */ +@Component +public class DmSqlProvider implements SqlProvider { + + /** + * 获取表是否存在 + * @return + */ + @Override + public String getExistTableSql() { + return "select count(*) from user_tables where table_name =upper('#tableName')"; + } + + /** + * 获取建表语句 + * @return + */ + @Override + public String getCreateTableSql() { + return "CREATE TABLE #tableName (ID BIGINT IDENTITY (1,1) NOT NULL,VALUE BIGINT NOT NULL" + + ",NAME VARCHAR (32) NOT NULL,GMT_CREATE TIMESTAMP (0) NOT NULL,GMT_MODIFIED TIMESTAMP (0) NOT NULL" + + ",NOT CLUSTER PRIMARY KEY (ID),CONSTRAINT UK_NAME UNIQUE (NAME)) STORAGE (ON MAIN,CLUSTERBTR);"; + } + + @Override + public Boolean support(DbType dbType) { + return DbType.SQL_SERVER.equals(dbType); + } + +} diff --git a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/provider/MssqlSqlProvider.java b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/provider/MssqlSqlProvider.java index df5551166..cf8ad245b 100644 --- a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/provider/MssqlSqlProvider.java +++ b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/provider/MssqlSqlProvider.java @@ -14,28 +14,21 @@ import org.springframework.stereotype.Component; @Component public class MssqlSqlProvider implements SqlProvider { - /** - * 获取表是否存在 - * @return 执行语句 - */ - @Override - public String getExistTableSql() { - return "SELECT TOP 1 * FROM sysObjects WHERE Id=OBJECT_ID(N'#tableName') AND xtype='U'"; - } - /** * 获取建表语句 * @return */ @Override public String getCreateTableSql() { - return "CREATE TABLE #tableName (id bigint NOT NULL,value bigint NOT NULL,name nvarchar (32) COLLATE " - + "Chinese_PRC_CI_AS NOT NULL,gmt_create datetime2 (7) NOT NULL,gmt_modified datetime2 (7) NOT NULL)"; + return "IF NOT EXISTS (\n" + + "SELECT*FROM sys.all_objects WHERE object_id=OBJECT_ID(N'#tableName') AND type IN ('U')) \n" + + "CREATE TABLE #tableName (id bigint NOT NULL,VALUE bigint NOT NULL,name nvarchar (32) COLLATE " + + "Chinese_PRC_CI_AS NOT NULL,gmt_create datetime2 (7) NOT NULL,gmt_modified datetime2 (7) NOT NULL) GO"; } @Override public Boolean support(DbType dbType) { - return DbType.SQL_SERVER.equals(dbType); + return DbType.SQL_SERVER2005.equals(dbType); } } diff --git a/pigx-upms/pigx-upms-biz/pom.xml b/pigx-upms/pigx-upms-biz/pom.xml index 8e8b89600..280e17b9b 100644 --- a/pigx-upms/pigx-upms-biz/pom.xml +++ b/pigx-upms/pigx-upms-biz/pom.xml @@ -53,6 +53,11 @@ com.microsoft.sqlserver mssql-jdbc + + + com.dameng + DmJdbcDriver18 + com.pig4cloud diff --git a/pigx-visual/pigx-codegen/src/main/resources/generator.properties b/pigx-visual/pigx-codegen/src/main/resources/generator.properties index 7359f9ebd..9a43f7ebe 100755 --- a/pigx-visual/pigx-codegen/src/main/resources/generator.properties +++ b/pigx-visual/pigx-codegen/src/main/resources/generator.properties @@ -65,3 +65,6 @@ BLOB=String nvarchar=String nchar=String datetime2=LocalDateTime + +#\u8FBE\u68A6 +BIGINT=Long diff --git a/pigx-visual/pigx-codegen/src/main/resources/mapper/GeneratorDmMapper.xml b/pigx-visual/pigx-codegen/src/main/resources/mapper/GeneratorDmMapper.xml index a00343d3b..ccb301ca7 100755 --- a/pigx-visual/pigx-codegen/src/main/resources/mapper/GeneratorDmMapper.xml +++ b/pigx-visual/pigx-codegen/src/main/resources/mapper/GeneratorDmMapper.xml @@ -18,7 +18,7 @@ SELECT - 'oracle' AS "dbType", + 'dm' AS "dbType", TEMP.COLUMN_NAME AS "columnName", TEMP.data_type AS "columnType", TEMP.data_type AS "dataType", diff --git a/pigx-visual/pigx-pay-platform/pom.xml b/pigx-visual/pigx-pay-platform/pom.xml index 2469e6d74..2b810dbc2 100755 --- a/pigx-visual/pigx-pay-platform/pom.xml +++ b/pigx-visual/pigx-pay-platform/pom.xml @@ -1,153 +1,159 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - com.pig4cloud - pigx-visual - 4.3.0 - + + com.pig4cloud + pigx-visual + 4.3.0 + - pigx-pay-platform - jar + pigx-pay-platform + jar - 支付系统 - - 2.0.4 - + 支付系统 + + 2.0.4 + - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - com.baomidou - mybatis-plus-boot-starter - - - mysql - mysql-connector-java - + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + com.baomidou + mybatis-plus-boot-starter + + + mysql + mysql-connector-java + - - com.oracle.database.jdbc - ojdbc8 - + + com.oracle.database.jdbc + ojdbc8 + - - - org.postgresql - postgresql - + + + org.postgresql + postgresql + - - - com.alibaba - druid-spring-boot-starter - - - - com.pig4cloud - pigx-common-data - - - com.pig4cloud - pigx-common-sequence - + + + com.dameng + DmJdbcDriver18 + - - cn.hutool - hutool-extra - - - - com.pig4cloud - pigx-common-gray - - - - com.pig4cloud - pigx-common-sentinel - - - - com.pig4cloud - pigx-upms-api - - - - com.pig4cloud - pigx-common-swagger - - - - com.pig4cloud - pigx-common-xss - - - com.pig4cloud - pigx-common-security - - - com.pig4cloud - pigx-common-log - - - - com.github.javen205 - IJPay-WxPay - - - com.github.javen205 - IJPay-AliPay - - - com.github.binarywang - weixin-java-mp - - - com.yungouos.pay - yungouos-pay-sdk - ${yungouos.version} - - - - org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-undertow - - - org.springframework.boot - spring-boot-starter-freemarker - - + + + com.alibaba + druid-spring-boot-starter + + + + com.pig4cloud + pigx-common-data + + + com.pig4cloud + pigx-common-sequence + - - - - org.springframework.boot - spring-boot-maven-plugin - - - io.fabric8 - docker-maven-plugin - - false - - - - + + cn.hutool + hutool-extra + + + + com.pig4cloud + pigx-common-gray + + + + com.pig4cloud + pigx-common-sentinel + + + + com.pig4cloud + pigx-upms-api + + + + com.pig4cloud + pigx-common-swagger + + + + com.pig4cloud + pigx-common-xss + + + com.pig4cloud + pigx-common-security + + + com.pig4cloud + pigx-common-log + + + + com.github.javen205 + IJPay-WxPay + + + com.github.javen205 + IJPay-AliPay + + + com.github.binarywang + weixin-java-mp + + + com.yungouos.pay + yungouos-pay-sdk + ${yungouos.version} + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-undertow + + + org.springframework.boot + spring-boot-starter-freemarker + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + io.fabric8 + docker-maven-plugin + + false + + + +