From 9f2877939024b0478f32c61d607f937db32d500e Mon Sep 17 00:00:00 2001 From: dataprince Date: Wed, 20 Dec 2023 19:44:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81PostgreSQL=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 4 +- .../common/core/constant/GenConstants.java | 4 +- .../common/orm/helper/DataBaseHelper.java | 23 + .../mf/controller/MfProductController.java | 2 +- .../mf/controller/MfStudentController.java | 2 +- .../mapper/demo/DemoCustomerMapper.xml | 20 +- .../service/GenTableServiceImpl.java | 3 +- .../ruoyi/generator/util/VelocityUtils.java | 11 +- .../mapper/generator/GenTableColumnMapper.xml | 49 +- .../mapper/generator/GenTableMapper.xml | 90 +- .../main/resources/vm/sql/{ => mysql}/sql.vm | 2 +- .../main/resources/vm/sql/postgresql/sql.vm | 19 + .../service/impl/SysClientServiceImpl.java | 3 +- .../service/impl/SysDataScopeServiceImpl.java | 1 - .../service/impl/SysDeptServiceImpl.java | 2 +- .../service/impl/SysDictDataServiceImpl.java | 3 +- .../service/impl/SysDictTypeServiceImpl.java | 3 +- .../impl/SysLogininforServiceImpl.java | 1 + .../service/impl/SysMenuServiceImpl.java | 1 + .../service/impl/SysNoticeServiceImpl.java | 3 +- .../service/impl/SysOperLogServiceImpl.java | 1 + .../impl/SysPermissionServiceImpl.java | 1 + .../service/impl/SysPostServiceImpl.java | 5 +- .../service/impl/SysRoleMenuServiceImpl.java | 1 + .../service/impl/SysRoleServiceImpl.java | 3 +- .../service/impl/SysUserPostServiceImpl.java | 1 + .../service/impl/SysUserRoleServiceImpl.java | 1 + .../service/impl/SysUserServiceImpl.java | 1 + sql/mysql/mysql-ruoyiflex-V4.2.0.sql | 1657 +++++++++++++ sql/mysql/mysql-ruoyiflex.sql | 2054 ----------------- sql/mysql/update.sql | 1 + .../postgresql-ruoyiflex-V4.2.0.sql | 1886 +++++++++++++++ 32 files changed, 3742 insertions(+), 2116 deletions(-) create mode 100644 ruoyi-common/ruoyi-common-orm/src/main/java/com/ruoyi/common/orm/helper/DataBaseHelper.java rename ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/{ => mysql}/sql.vm (90%) create mode 100644 ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/postgresql/sql.vm create mode 100644 sql/mysql/mysql-ruoyiflex-V4.2.0.sql delete mode 100644 sql/mysql/mysql-ruoyiflex.sql create mode 100644 sql/postgresql/postgresql-ruoyiflex-V4.2.0.sql diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index ae3ea7b..8bfe3e9 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -159,7 +159,7 @@ management: --- # 监控中心客户端配置 spring.boot.admin.client: # 增加客户端开关 - enabled: false + enabled: true url: http://localhost:9090/admin instance: service-host-type: IP @@ -170,7 +170,7 @@ spring.boot.admin.client: powerjob: worker: # 如何开启调度中心请查看文档教程 - enabled: false + enabled: true # 需要先在 powerjob 登录页执行应用注册后才能使用 app-name: ruoyi-worker # 28080 端口 随着主应用端口飘逸 避免集群冲突 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java index 899b5c5..5f6cc42 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java @@ -32,14 +32,14 @@ public class GenConstants public static final String PARENT_MENU_NAME = "parentMenuName"; /** 数据库字符串类型 */ - public static final String[] COLUMNTYPE_STR = { "char", "varchar", "nvarchar", "varchar2" }; + public static final String[] COLUMNTYPE_STR = { "char", "varchar", "nvarchar", "varchar2","character","character varying" }; /** 数据库文本类型 */ public static final String[] COLUMNTYPE_TEXT = { "tinytext", "text", "mediumtext", "longtext", "binary", "varbinary", "blob", "ntext", "image", "bytea" }; /** 数据库时间类型 */ - public static final String[] COLUMNTYPE_TIME = { "datetime", "time", "date", "timestamp", "year", "interval", + public static final String[] COLUMNTYPE_TIME = { "datetime", "time", "date", "timestamp","timestamp without time zone","year", "interval", "smalldatetime", "datetime2", "datetimeoffset" }; /** 数据库数字类型 */ diff --git a/ruoyi-common/ruoyi-common-orm/src/main/java/com/ruoyi/common/orm/helper/DataBaseHelper.java b/ruoyi-common/ruoyi-common-orm/src/main/java/com/ruoyi/common/orm/helper/DataBaseHelper.java new file mode 100644 index 0000000..7d7cdb1 --- /dev/null +++ b/ruoyi-common/ruoyi-common-orm/src/main/java/com/ruoyi/common/orm/helper/DataBaseHelper.java @@ -0,0 +1,23 @@ +package com.ruoyi.common.orm.helper; + +import com.mybatisflex.core.FlexGlobalConfig; +import com.mybatisflex.core.dialect.DbType; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; + +/** + * 数据库助手:判断数据库类型 + * + * @author dataprince数据小王子 + */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class DataBaseHelper { + + public static boolean isMySql() { + return DbType.MYSQL == FlexGlobalConfig.getDefaultConfig().getDbType(); + } + + public static boolean isPostgreSql() { + return DbType.POSTGRE_SQL == FlexGlobalConfig.getDefaultConfig().getDbType(); + } +} diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/mf/controller/MfProductController.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/mf/controller/MfProductController.java index 808b9e1..3749406 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/mf/controller/MfProductController.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/mf/controller/MfProductController.java @@ -1,9 +1,9 @@ package com.ruoyi.mf.controller; import java.util.List; + import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/mf/controller/MfStudentController.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/mf/controller/MfStudentController.java index a7d8f80..941d745 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/mf/controller/MfStudentController.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/mf/controller/MfStudentController.java @@ -1,9 +1,9 @@ package com.ruoyi.mf.controller; import java.util.List; + import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; diff --git a/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/DemoCustomerMapper.xml b/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/DemoCustomerMapper.xml index 98359f8..afc056d 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/DemoCustomerMapper.xml +++ b/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/DemoCustomerMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -33,14 +33,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + insert into demo_customer @@ -84,14 +84,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from demo_customer where customer_id in + delete from demo_customer where customer_id in #{customerId} - + - delete from demo_goods where customer_id in + delete from demo_goods where customer_id in #{customerId} @@ -102,9 +102,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into demo_goods( goods_id, customer_id, name, weight, price, date, type) values + insert into demo_goods( customer_id, name, weight, price, date, type) values - ( #{item.goodsId}, #{item.customerId}, #{item.name}, #{item.weight}, #{item.price}, #{item.date}, #{item.type}) + ( #{item.customerId}, #{item.name}, #{item.weight}, #{item.price}, #{item.date}, #{item.type}) - \ No newline at end of file + diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java b/ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java index c6a704f..038b89e 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java +++ b/ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java @@ -7,6 +7,8 @@ import java.util.stream.Collectors; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; +import com.mybatisflex.core.FlexGlobalConfig; +import com.mybatisflex.core.dialect.DbType; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryMethods; import com.mybatisflex.core.query.QueryWrapper; @@ -205,7 +207,6 @@ public class GenTableServiceImpl extends BaseServiceImpl fileName = StringUtils.format("{}/controller/{}Controller.java", javaPath, className); case "vm/xml/mapper.xml.vm" -> fileName = StringUtils.format("{}/{}Mapper.xml", mybatisPath, className); case "vm/xml/sub-mapper.xml.vm" -> fileName = StringUtils.format("{}/{}Mapper.xml", mybatisPath, genTable.getSubTable().getClassName()); - case "vm/sql/sql.vm" -> fileName = businessName + "Menu.sql"; + case "vm/sql/postgresql/sql.vm" -> fileName = businessName + "Menu(postgresql).sql"; + case "vm/sql/mysql/sql.vm" -> fileName = businessName + "Menu(mysql).sql"; case "vm/js/api.js.vm" -> fileName = StringUtils.format("{}/api/{}/{}.js", vuePath, moduleName, businessName); case "vm/vue/index.vue.vm" -> fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName); case "vm/vue/index-tree.vue.vm" -> fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName); diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml index 2904b07..88a8acf 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml @@ -34,9 +34,52 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml index f842104..6f65636 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml @@ -58,32 +58,76 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"