From 65f89af571bbd55fe2da4edf167860bf9dc4fd9b Mon Sep 17 00:00:00 2001 From: AndrewFeng Date: Thu, 18 Mar 2021 23:01:58 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=A4=9A=E6=95=B0=E6=8D=AE=E6=BA=90?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roses/kernel/db/flyway/FlywayInitListener.java | 3 ++- .../roses/kernel/dsctn/persist/DataBaseInfoPersistence.java | 1 + .../roses/kernel/dsctn/persist/sqls/AddDatabaseInfoSql.java | 4 ++-- .../roses/kernel/dsctn/persist/sqls/DatabaseListSql.java | 6 +++--- .../roses/kernel/dsctn/persist/sqls/DropDatabaseSql.java | 4 ++-- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/kernel-d-db/db-sdk-flyway/src/main/java/cn/stylefeng/roses/kernel/db/flyway/FlywayInitListener.java b/kernel-d-db/db-sdk-flyway/src/main/java/cn/stylefeng/roses/kernel/db/flyway/FlywayInitListener.java index 5c1df2be2..88ba57c34 100644 --- a/kernel-d-db/db-sdk-flyway/src/main/java/cn/stylefeng/roses/kernel/db/flyway/FlywayInitListener.java +++ b/kernel-d-db/db-sdk-flyway/src/main/java/cn/stylefeng/roses/kernel/db/flyway/FlywayInitListener.java @@ -32,6 +32,7 @@ public class FlywayInitListener implements ApplicationListener Date: Sat, 24 Apr 2021 23:19:48 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stylefeng/roses/kernel/db/flyway/FlywayInitListener.java | 3 +-- .../roses/kernel/dsctn/persist/sqls/CreateDatabaseSql.java | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/kernel-d-db/db-sdk-flyway/src/main/java/cn/stylefeng/roses/kernel/db/flyway/FlywayInitListener.java b/kernel-d-db/db-sdk-flyway/src/main/java/cn/stylefeng/roses/kernel/db/flyway/FlywayInitListener.java index 451993eab..74d13f3e7 100644 --- a/kernel-d-db/db-sdk-flyway/src/main/java/cn/stylefeng/roses/kernel/db/flyway/FlywayInitListener.java +++ b/kernel-d-db/db-sdk-flyway/src/main/java/cn/stylefeng/roses/kernel/db/flyway/FlywayInitListener.java @@ -47,7 +47,7 @@ import org.springframework.jdbc.datasource.DriverManagerDataSource; @Slf4j public class FlywayInitListener implements ApplicationListener, Ordered { - private static final String FLYWAY_LOCATIONS = "classpath:db/migration"; + private static final String FLYWAY_LOCATIONS = "classpath:db/migration/mysql"; @Override public void onApplicationEvent(ApplicationContextInitializedEvent applicationEnvironmentPreparedEvent) { @@ -60,7 +60,6 @@ public class FlywayInitListener implements ApplicationListener Date: Sun, 25 Apr 2021 23:45:20 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E4=BF=9D=E5=AD=98sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roses/kernel/dsctn/persist/sqls/AddDatabaseInfoSql.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel-d-ds-container/ds-container-sdk/src/main/java/cn/stylefeng/roses/kernel/dsctn/persist/sqls/AddDatabaseInfoSql.java b/kernel-d-ds-container/ds-container-sdk/src/main/java/cn/stylefeng/roses/kernel/dsctn/persist/sqls/AddDatabaseInfoSql.java index 39edda0e4..2da8c3fa6 100644 --- a/kernel-d-ds-container/ds-container-sdk/src/main/java/cn/stylefeng/roses/kernel/dsctn/persist/sqls/AddDatabaseInfoSql.java +++ b/kernel-d-ds-container/ds-container-sdk/src/main/java/cn/stylefeng/roses/kernel/dsctn/persist/sqls/AddDatabaseInfoSql.java @@ -18,12 +18,12 @@ public class AddDatabaseInfoSql extends AbstractSql { @Override protected String sqlServer() { - return "INSERT INTO [sys_database_info] ([db_id], [db_name], [jdbc_driver], [username], [password], [jdbc_url], [remarks], [create_time]) VALUES (?, ?, ?, ?, ?, ?, ?, ?)"; + return "INSERT INTO [sys_database_info] ([db_id], [db_name], [jdbc_driver], [jdbc_url], [username], [password], [remarks], [create_time]) VALUES (?, ?, ?, ?, ?, ?, ?, ?)"; } @Override protected String pgSql() { - return "INSERT INTO sys_database_info(db_id, db_name, jdbc_driver, username, password, jdbc_url, remarks, create_time) VALUES (?, ?, ?, ?, ?, ?, ?, to_timestamp(?,'YYYY-MM-DD HH24:MI:SS'))"; + return "INSERT INTO sys_database_info(db_id, db_name, jdbc_driver, jdbc_url, username, password, remarks, create_time) VALUES (?, ?, ?, ?, ?, ?, ?, to_timestamp(?,'YYYY-MM-DD HH24:MI:SS'))"; } @Override From 8980f292060ae73ea687ef739210534f67c97fd9 Mon Sep 17 00:00:00 2001 From: AndrewFeng Date: Fri, 14 May 2021 22:12:29 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4pgsql=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modular/data/PgsqlSysConfigData.java | 34 +++++++++++++++++++ .../modular/factory/SysConfigDataFactory.java | 3 +- .../modular/listener/ConfigInitListener.java | 2 +- 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/data/PgsqlSysConfigData.java diff --git a/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/data/PgsqlSysConfigData.java b/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/data/PgsqlSysConfigData.java new file mode 100644 index 000000000..fd4132768 --- /dev/null +++ b/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/data/PgsqlSysConfigData.java @@ -0,0 +1,34 @@ +package cn.stylefeng.roses.kernel.config.modular.data; + +import cn.hutool.db.Entity; +import cn.hutool.db.handler.EntityListHandler; +import cn.hutool.db.sql.SqlExecutor; +import cn.stylefeng.roses.kernel.config.api.SysConfigDataApi; +import cn.stylefeng.roses.kernel.rule.enums.StatusEnum; +import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum; +import lombok.extern.slf4j.Slf4j; + +import java.sql.Connection; +import java.sql.SQLException; +import java.util.List; + +/** + * Mysql数据库的系统配置表获取 + * + * @author AndrewFeng + * @date 2021/5/14 21:18 + */ +@Slf4j +public class PgsqlSysConfigData implements SysConfigDataApi { + + @Override + public List getConfigs(Connection conn) throws SQLException { + return SqlExecutor.query(conn, getConfigListSql(), new EntityListHandler(), StatusEnum.ENABLE.getCode(), YesOrNotEnum.N.getCode()); + } + + @Override + public String getConfigListSql() { + return "select config_code, config_value from sys_config where status_flag = ? and del_flag = ?"; + } + +} diff --git a/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/factory/SysConfigDataFactory.java b/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/factory/SysConfigDataFactory.java index d5c674406..b83041249 100644 --- a/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/factory/SysConfigDataFactory.java +++ b/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/factory/SysConfigDataFactory.java @@ -2,6 +2,7 @@ package cn.stylefeng.roses.kernel.config.modular.factory; import cn.stylefeng.roses.kernel.config.api.SysConfigDataApi; import cn.stylefeng.roses.kernel.config.modular.data.MysqlSysConfigData; +import cn.stylefeng.roses.kernel.config.modular.data.PgsqlSysConfigData; import cn.stylefeng.roses.kernel.rule.enums.DbTypeEnum; import cn.stylefeng.roses.kernel.rule.util.DatabaseTypeUtil; @@ -24,7 +25,7 @@ public class SysConfigDataFactory { if (DbTypeEnum.MYSQL.equals(dbType)) { return new MysqlSysConfigData(); } else if (DbTypeEnum.PG_SQL.equals(dbType)) { - // todo + return new PgsqlSysConfigData(); } else if (DbTypeEnum.MS_SQL.equals(dbType)) { // todo } else if (DbTypeEnum.ORACLE.equals(dbType)) { diff --git a/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/listener/ConfigInitListener.java b/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/listener/ConfigInitListener.java index 8e690b160..0a5feb8eb 100644 --- a/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/listener/ConfigInitListener.java +++ b/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/listener/ConfigInitListener.java @@ -108,7 +108,7 @@ public class ConfigInitListener implements ApplicationListener ConfigContext.me().putConfig(sysConfig.getStr("config_code"), sysConfig.getStr("config_value"))); } } catch (ClassNotFoundException e) { - log.error("初始化系统配置表失败，找不到com.mysql.cj.jdbc.Driver类", e); + log.error("初始化系统配置表失败，找不到{}类 : {}",driverClassName,e); throw new ConfigException(ConfigExceptionEnum.CLASS_NOT_FOUND_ERROR); } catch (SQLException sqlException) { log.error("初始化系统配置表失败，执行查询语句失败", sqlException); From b220a6bbd9f1ebf334761df94b2697d355707e82 Mon Sep 17 00:00:00 2001 From: AndrewFeng Date: Sat, 15 May 2021 21:30:12 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=8A=E6=96=B0?= =?UTF-8?q?=E5=A2=9Eoracle=EF=BC=8Cpgsql=EF=BC=8Cmssql=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=8C=E5=8F=8A=E5=88=A0=E9=99=A4=E8=A1=A8=E7=A9=BA=E9=97=B4?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modular/data/MssqlSysConfigData.java | 34 +++++++++++++++++++ .../modular/data/OracleSysConfigData.java | 34 +++++++++++++++++++ .../modular/data/PgsqlSysConfigData.java | 2 +- .../modular/factory/SysConfigDataFactory.java | 6 ++-- .../dsctn/persist/sqls/DropDatabaseSql.java | 4 +-- 5 files changed, 75 insertions(+), 5 deletions(-) create mode 100644 kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/data/MssqlSysConfigData.java create mode 100644 kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/data/OracleSysConfigData.java diff --git a/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/data/MssqlSysConfigData.java b/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/data/MssqlSysConfigData.java new file mode 100644 index 000000000..c070ccf75 --- /dev/null +++ b/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/data/MssqlSysConfigData.java @@ -0,0 +1,34 @@ +package cn.stylefeng.roses.kernel.config.modular.data; + +import cn.hutool.db.Entity; +import cn.hutool.db.handler.EntityListHandler; +import cn.hutool.db.sql.SqlExecutor; +import cn.stylefeng.roses.kernel.config.api.SysConfigDataApi; +import cn.stylefeng.roses.kernel.rule.enums.StatusEnum; +import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum; +import lombok.extern.slf4j.Slf4j; + +import java.sql.Connection; +import java.sql.SQLException; +import java.util.List; + +/** + * Mssql数据库的系统配置表获取 + * + * @author AndrewFeng + * @date 2021/5/14 21:18 + */ +@Slf4j +public class MssqlSysConfigData implements SysConfigDataApi { + + @Override + public List getConfigs(Connection conn) throws SQLException { + return SqlExecutor.query(conn, getConfigListSql(), new EntityListHandler(), StatusEnum.ENABLE.getCode(), YesOrNotEnum.N.getCode()); + } + + @Override + public String getConfigListSql() { + return "select config_code, config_value from sys_config where status_flag = ? and del_flag = ?"; + } + +} diff --git a/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/data/OracleSysConfigData.java b/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/data/OracleSysConfigData.java new file mode 100644 index 000000000..270c92b59 --- /dev/null +++ b/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/data/OracleSysConfigData.java @@ -0,0 +1,34 @@ +package cn.stylefeng.roses.kernel.config.modular.data; + +import cn.hutool.db.Entity; +import cn.hutool.db.handler.EntityListHandler; +import cn.hutool.db.sql.SqlExecutor; +import cn.stylefeng.roses.kernel.config.api.SysConfigDataApi; +import cn.stylefeng.roses.kernel.rule.enums.StatusEnum; +import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum; +import lombok.extern.slf4j.Slf4j; + +import java.sql.Connection; +import java.sql.SQLException; +import java.util.List; + +/** + * Oracle数据库的系统配置表获取 + * + * @author AndrewFeng + * @date 2021/5/14 21:18 + */ +@Slf4j +public class OracleSysConfigData implements SysConfigDataApi { + + @Override + public List getConfigs(Connection conn) throws SQLException { + return SqlExecutor.query(conn, getConfigListSql(), new EntityListHandler(), StatusEnum.ENABLE.getCode(), YesOrNotEnum.N.getCode()); + } + + @Override + public String getConfigListSql() { + return "select config_code, config_value from sys_config where status_flag = ? and del_flag = ?"; + } + +} diff --git a/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/data/PgsqlSysConfigData.java b/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/data/PgsqlSysConfigData.java index fd4132768..03bf1d802 100644 --- a/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/data/PgsqlSysConfigData.java +++ b/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/data/PgsqlSysConfigData.java @@ -13,7 +13,7 @@ import java.sql.SQLException; import java.util.List; /** - * Mysql数据库的系统配置表获取 + * Pgsql数据库的系统配置表获取 * * @author AndrewFeng * @date 2021/5/14 21:18 diff --git a/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/factory/SysConfigDataFactory.java b/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/factory/SysConfigDataFactory.java index b83041249..059c069ef 100644 --- a/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/factory/SysConfigDataFactory.java +++ b/kernel-d-config/config-business/src/main/java/cn/stylefeng/roses/kernel/config/modular/factory/SysConfigDataFactory.java @@ -1,7 +1,9 @@ package cn.stylefeng.roses.kernel.config.modular.factory; import cn.stylefeng.roses.kernel.config.api.SysConfigDataApi; +import cn.stylefeng.roses.kernel.config.modular.data.MssqlSysConfigData; import cn.stylefeng.roses.kernel.config.modular.data.MysqlSysConfigData; +import cn.stylefeng.roses.kernel.config.modular.data.OracleSysConfigData; import cn.stylefeng.roses.kernel.config.modular.data.PgsqlSysConfigData; import cn.stylefeng.roses.kernel.rule.enums.DbTypeEnum; import cn.stylefeng.roses.kernel.rule.util.DatabaseTypeUtil; @@ -27,9 +29,9 @@ public class SysConfigDataFactory { } else if (DbTypeEnum.PG_SQL.equals(dbType)) { return new PgsqlSysConfigData(); } else if (DbTypeEnum.MS_SQL.equals(dbType)) { - // todo + return new MssqlSysConfigData(); } else if (DbTypeEnum.ORACLE.equals(dbType)) { - // todo + return new OracleSysConfigData(); } return new MysqlSysConfigData(); } diff --git a/kernel-d-ds-container/ds-container-sdk/src/main/java/cn/stylefeng/roses/kernel/dsctn/persist/sqls/DropDatabaseSql.java b/kernel-d-ds-container/ds-container-sdk/src/main/java/cn/stylefeng/roses/kernel/dsctn/persist/sqls/DropDatabaseSql.java index b35cf3cbd..beaf85821 100644 --- a/kernel-d-ds-container/ds-container-sdk/src/main/java/cn/stylefeng/roses/kernel/dsctn/persist/sqls/DropDatabaseSql.java +++ b/kernel-d-ds-container/ds-container-sdk/src/main/java/cn/stylefeng/roses/kernel/dsctn/persist/sqls/DropDatabaseSql.java @@ -47,11 +47,11 @@ public class DropDatabaseSql extends AbstractSql { @Override protected String pgSql() { - return ""; + return "DROP DATABASE ?;"; } @Override protected String oracle() { - return "DROP DATABASE ?;"; + return "DROP DATASPACE ?;"; } } From b2e67985fa20e032da63e2bc084e8441421a54de Mon Sep 17 00:00:00 2001 From: AndrewFeng Date: Mon, 17 May 2021 20:15:21 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E9=80=82=E9=85=8Doracle=E5=8F=8A=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93sql=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persist/sqls/AddDatabaseInfoSql.java | 2 +- .../dsctn/persist/sqls/CreateDatabaseSql.java | 4 +- .../modular/listener/TaskRunListener.java | 1 + .../timer/modular/param/SysTimersParam.java | 5 +++ .../dict/modular/db/init/DictInitializer.java | 39 ++++++++++--------- .../modular/db/init/DictTypeInitializer.java | 33 ++++++++-------- 6 files changed, 46 insertions(+), 38 deletions(-) diff --git a/kernel-d-ds-container/ds-container-sdk/src/main/java/cn/stylefeng/roses/kernel/dsctn/persist/sqls/AddDatabaseInfoSql.java b/kernel-d-ds-container/ds-container-sdk/src/main/java/cn/stylefeng/roses/kernel/dsctn/persist/sqls/AddDatabaseInfoSql.java index 2da8c3fa6..b815b1a8e 100644 --- a/kernel-d-ds-container/ds-container-sdk/src/main/java/cn/stylefeng/roses/kernel/dsctn/persist/sqls/AddDatabaseInfoSql.java +++ b/kernel-d-ds-container/ds-container-sdk/src/main/java/cn/stylefeng/roses/kernel/dsctn/persist/sqls/AddDatabaseInfoSql.java @@ -28,6 +28,6 @@ public class AddDatabaseInfoSql extends AbstractSql { @Override protected String oracle() { - return "INSERT INTO sys_database_info VALUES (?, ?, ?, ?, ?, ?, ?, to_date(?, 'yyyy-mm-dd hh24:mi:ss'))"; + return "INSERT INTO sys_database_info(db_id, db_name, jdbc_driver, jdbc_url, username, password, remarks, create_time) VALUES (?, ?, ?, ?, ?, ?, ?, to_date(?, 'yyyy-mm-dd hh24:mi:ss'))"; } } diff --git a/kernel-d-ds-container/ds-container-sdk/src/main/java/cn/stylefeng/roses/kernel/dsctn/persist/sqls/CreateDatabaseSql.java b/kernel-d-ds-container/ds-container-sdk/src/main/java/cn/stylefeng/roses/kernel/dsctn/persist/sqls/CreateDatabaseSql.java index e35d26489..11b99e831 100644 --- a/kernel-d-ds-container/ds-container-sdk/src/main/java/cn/stylefeng/roses/kernel/dsctn/persist/sqls/CreateDatabaseSql.java +++ b/kernel-d-ds-container/ds-container-sdk/src/main/java/cn/stylefeng/roses/kernel/dsctn/persist/sqls/CreateDatabaseSql.java @@ -49,11 +49,11 @@ public class CreateDatabaseSql extends AbstractSql { @Override protected String pgSql() { - return ""; + return "CREATE DATABASE ?;"; } @Override protected String oracle() { - return ""; + return "create tablespace ? datafile '/opt/oracle/guns.dbf' size 500m autoextend on next 5m maxsize unlimited;"; } } diff --git a/kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/listener/TaskRunListener.java b/kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/listener/TaskRunListener.java index 154b67e87..4c992b51f 100644 --- a/kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/listener/TaskRunListener.java +++ b/kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/listener/TaskRunListener.java @@ -57,6 +57,7 @@ public class TaskRunListener implements ApplicationListener list = sysTimersService.findList(sysTimersParam); diff --git a/kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/param/SysTimersParam.java b/kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/param/SysTimersParam.java index 4783deefc..3f36fdc76 100644 --- a/kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/param/SysTimersParam.java +++ b/kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/param/SysTimersParam.java @@ -81,6 +81,11 @@ public class SysTimersParam extends BaseRequest { */ private String remark; + /** + * 是否删除标记 + */ + private String delFlag; + /** * 启用定时任务 */ diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/db/init/DictInitializer.java b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/db/init/DictInitializer.java index 21bd2643b..240de5cc0 100644 --- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/db/init/DictInitializer.java +++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/db/init/DictInitializer.java @@ -33,31 +33,32 @@ import org.springframework.stereotype.Component; * * @author majianguo * @date 2020/12/9 上午11:02 + * @see cn.stylefeng.roses.kernel.dsctn.persist.sqls.AbstractSql */ @Component public class DictInitializer extends DbInitializer { @Override protected String getTableInitSql() { - return "CREATE TABLE `sys_dict` (\n" + - " `dict_id` bigint(20) NOT NULL COMMENT '字典id',\n" + - " `dict_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '字典编码',\n" + - " `dict_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '字典名称',\n" + - " `dict_name_pinyin` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '字典名称首字母',\n" + - " `dict_encode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '字典编码',\n" + - " `dict_type_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '字典类型的编码',\n" + - " `dict_short_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '字典简称',\n" + - " `dict_short_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '字典简称的编码',\n" + - " `dict_parent_id` bigint(20) NOT NULL COMMENT '上级字典的id(如果没有上级字典id，则为-1)',\n" + - " `status_flag` tinyint(4) NOT NULL COMMENT '状态：(1-启用,2-禁用),参考 StatusEnum',\n" + - " `dict_sort` decimal(10, 2) NULL DEFAULT NULL COMMENT '排序，带小数点',\n" + - " `dict_pids` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '父id集合',\n" + - " `del_flag` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N' COMMENT '是否删除，Y-被删除，N-未删除',\n" + - " `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',\n" + - " `create_user` bigint(20) NULL DEFAULT NULL COMMENT '创建用户id',\n" + - " `update_time` datetime(0) NULL DEFAULT NULL COMMENT '修改时间',\n" + - " `update_user` bigint(20) NULL DEFAULT NULL COMMENT '修改用户id',\n" + - " PRIMARY KEY (`dict_id`) USING BTREE\n" + + return "CREATE TABLE sys_dict (\n" + + " dict_id bigint(20) NOT NULL COMMENT '字典id',\n" + + " dict_code varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '字典编码',\n" + + " dict_name varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '字典名称',\n" + + " dict_name_pinyin varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '字典名称首字母',\n" + + " dict_encode varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '字典编码',\n" + + " dict_type_code varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '字典类型的编码',\n" + + " dict_short_name varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '字典简称',\n" + + " dict_short_code varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '字典简称的编码',\n" + + " dict_parent_id bigint(20) NOT NULL COMMENT '上级字典的id(如果没有上级字典id，则为-1)',\n" + + " status_flag tinyint(4) NOT NULL COMMENT '状态：(1-启用,2-禁用),参考 StatusEnum',\n" + + " dict_sort decimal(10, 2) NULL DEFAULT NULL COMMENT '排序，带小数点',\n" + + " dict_pids varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '父id集合',\n" + + " del_flag char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N' COMMENT '是否删除，Y-被删除，N-未删除',\n" + + " create_time datetime(0) NULL DEFAULT NULL COMMENT '创建时间',\n" + + " create_user bigint(20) NULL DEFAULT NULL COMMENT '创建用户id',\n" + + " update_time datetime(0) NULL DEFAULT NULL COMMENT '修改时间',\n" + + " update_user bigint(20) NULL DEFAULT NULL COMMENT '修改用户id',\n" + + " PRIMARY KEY (dict_id) USING BTREE\n" + ") ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '字典表' ROW_FORMAT = Dynamic;"; } diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/db/init/DictTypeInitializer.java b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/db/init/DictTypeInitializer.java index 2f583aa50..810f938d7 100644 --- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/db/init/DictTypeInitializer.java +++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/db/init/DictTypeInitializer.java @@ -33,28 +33,29 @@ import org.springframework.stereotype.Component; * * @author majianguo * @date 2020/12/9 上午11:02 + * @see cn.stylefeng.roses.kernel.dsctn.persist.sqls.AbstractSql */ @Component public class DictTypeInitializer extends DbInitializer { @Override protected String getTableInitSql() { - return "CREATE TABLE `sys_dict_type` (\n" + - " `dict_type_id` bigint(20) NOT NULL COMMENT '字典类型id',\n" + - " `dict_type_class` int(2) NULL DEFAULT NULL COMMENT '字典类型： 1-业务类型，2-系统类型，参考 DictTypeClassEnum',\n" + - " `dict_type_bus_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '字典类型业务编码',\n" + - " `dict_type_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '字典类型编码',\n" + - " `dict_type_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '字典类型名称',\n" + - " `dict_type_name_pinyin` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '字典类型名称首字母拼音',\n" + - " `dict_type_desc` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '字典类型描述',\n" + - " `status_flag` tinyint(4) NULL DEFAULT NULL COMMENT '字典类型的状态：1-启用，2-禁用，参考 StatusEnum',\n" + - " `dict_type_sort` decimal(10, 2) NULL DEFAULT NULL COMMENT '排序，带小数点',\n" + - " `del_flag` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N' COMMENT '是否删除：Y-被删除，N-未删除',\n" + - " `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',\n" + - " `create_user` bigint(20) NULL DEFAULT NULL COMMENT '创建用户id',\n" + - " `update_time` datetime(0) NULL DEFAULT NULL COMMENT '修改时间',\n" + - " `update_user` bigint(20) NULL DEFAULT NULL COMMENT '修改用户id',\n" + - " PRIMARY KEY (`dict_type_id`) USING BTREE\n" + + return "CREATE TABLE sys_dict_type (\n" + + " dict_type_id bigint(20) NOT NULL COMMENT '字典类型id',\n" + + " dict_type_class int(2) NULL DEFAULT NULL COMMENT '字典类型： 1-业务类型，2-系统类型，参考 DictTypeClassEnum',\n" + + " dict_type_bus_code varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '字典类型业务编码',\n" + + " dict_type_code varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '字典类型编码',\n" + + " dict_type_name varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '字典类型名称',\n" + + " dict_type_name_pinyin varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '字典类型名称首字母拼音',\n" + + " dict_type_desc varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '字典类型描述',\n" + + " status_flag tinyint(4) NULL DEFAULT NULL COMMENT '字典类型的状态：1-启用，2-禁用，参考 StatusEnum',\n" + + " dict_type_sort decimal(10, 2) NULL DEFAULT NULL COMMENT '排序，带小数点',\n" + + " del_flag char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'N' COMMENT '是否删除：Y-被删除，N-未删除',\n" + + " create_time datetime(0) NULL DEFAULT NULL COMMENT '创建时间',\n" + + " create_user bigint(20) NULL DEFAULT NULL COMMENT '创建用户id',\n" + + " update_time datetime(0) NULL DEFAULT NULL COMMENT '修改时间',\n" + + " update_user bigint(20) NULL DEFAULT NULL COMMENT '修改用户id',\n" + + " PRIMARY KEY (dict_type_id) USING BTREE\n" + ") ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '字典类型表，一个字典类型下有多个字典' ROW_FORMAT = Dynamic;"; }