gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

适配oracle及数据库sql修改

pull/16/head
AndrewFeng 2021-05-17 20:15:21 +08:00
parent b220a6bbd9
commit b2e67985fa
6 changed files with 46 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel-d-ds-container/ds-container-sdk/src/main/java/cn/stylefeng/roses/kernel/dsctn/persist/sqls/AddDatabaseInfoSql.java
View File

@ -28,6 +28,6 @@ public class AddDatabaseInfoSql extends AbstractSql {
@Override @Override
protected String oracle() { 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'))";
} }
} }

4
kernel-d-ds-container/ds-container-sdk/src/main/java/cn/stylefeng/roses/kernel/dsctn/persist/sqls/CreateDatabaseSql.java
View File

@ -49,11 +49,11 @@ public class CreateDatabaseSql extends AbstractSql {
@Override @Override
protected String pgSql() { protected String pgSql() {
return ""; return "CREATE DATABASE ?;";
} }
@Override @Override
protected String oracle() { protected String oracle() {
return ""; return "create tablespace ? datafile '/opt/oracle/guns.dbf' size 500m autoextend on next 5m maxsize unlimited;";
} }
} }

1
kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/listener/TaskRunListener.java
View File

@ -57,6 +57,7 @@ public class TaskRunListener implements ApplicationListener<ApplicationStartedEv
// 获取数据库所有开启状态的任务 // 获取数据库所有开启状态的任务
SysTimersParam sysTimersParam = new SysTimersParam(); SysTimersParam sysTimersParam = new SysTimersParam();
sysTimersParam.setDelFlag("N");
sysTimersParam.setJobStatus(TimerJobStatusEnum.RUNNING.getCode()); sysTimersParam.setJobStatus(TimerJobStatusEnum.RUNNING.getCode());
List<SysTimers> list = sysTimersService.findList(sysTimersParam); List<SysTimers> list = sysTimersService.findList(sysTimersParam);

5
kernel-d-timer/timer-business/src/main/java/cn/stylefeng/roses/kernel/timer/modular/param/SysTimersParam.java
View File

@ -81,6 +81,11 @@ public class SysTimersParam extends BaseRequest {
*/ */
private String remark; private String remark;
/**
* 是否删除标记
*/
private String delFlag;
/** /**
* 启用定时任务 * 启用定时任务
*/ */

39
kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/db/init/DictInitializer.java
View File

@ -33,31 +33,32 @@ import org.springframework.stereotype.Component;
* *
* @author majianguo * @author majianguo
* @date 2020/12/9 上午11:02 * @date 2020/12/9 上午11:02
* @see cn.stylefeng.roses.kernel.dsctn.persist.sqls.AbstractSql
*/ */
@Component @Component
public class DictInitializer extends DbInitializer { public class DictInitializer extends DbInitializer {
@Override @Override
protected String getTableInitSql() { protected String getTableInitSql() {
return "CREATE TABLE `sys_dict` (\n" + return "CREATE TABLE sys_dict (\n" +
" `dict_id` bigint(20) NOT NULL COMMENT '字典id',\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_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 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_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_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_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_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_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" + " dict_parent_id bigint(20) NOT NULL COMMENT '上级字典的id(如果没有上级字典id，则为-1)',\n" +
" `status_flag` tinyint(4) NOT NULL COMMENT '状态：(1-启用,2-禁用),参考 StatusEnum',\n" + " status_flag tinyint(4) NOT NULL COMMENT '状态：(1-启用,2-禁用),参考 StatusEnum',\n" +
" `dict_sort` decimal(10, 2) NULL DEFAULT NULL COMMENT '排序，带小数点',\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" + " 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" + " 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_time datetime(0) NULL DEFAULT NULL COMMENT '创建时间',\n" +
" `create_user` bigint(20) NULL DEFAULT NULL COMMENT '创建用户id',\n" + " create_user bigint(20) NULL DEFAULT NULL COMMENT '创建用户id',\n" +
" `update_time` datetime(0) NULL DEFAULT NULL COMMENT '修改时间',\n" + " update_time datetime(0) NULL DEFAULT NULL COMMENT '修改时间',\n" +
" `update_user` bigint(20) NULL DEFAULT NULL COMMENT '修改用户id',\n" + " update_user bigint(20) NULL DEFAULT NULL COMMENT '修改用户id',\n" +
" PRIMARY KEY (`dict_id`) USING BTREE\n" + " PRIMARY KEY (dict_id) USING BTREE\n" +
") ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '字典表' ROW_FORMAT = Dynamic;"; ") ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '字典表' ROW_FORMAT = Dynamic;";
} }

33
kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/db/init/DictTypeInitializer.java
View File

@ -33,28 +33,29 @@ import org.springframework.stereotype.Component;
* *
* @author majianguo * @author majianguo
* @date 2020/12/9 上午11:02 * @date 2020/12/9 上午11:02
* @see cn.stylefeng.roses.kernel.dsctn.persist.sqls.AbstractSql
*/ */
@Component @Component
public class DictTypeInitializer extends DbInitializer { public class DictTypeInitializer extends DbInitializer {
@Override @Override
protected String getTableInitSql() { protected String getTableInitSql() {
return "CREATE TABLE `sys_dict_type` (\n" + return "CREATE TABLE sys_dict_type (\n" +
" `dict_type_id` bigint(20) NOT NULL COMMENT '字典类型id',\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_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_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_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 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_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" + " 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" + " status_flag tinyint(4) NULL DEFAULT NULL COMMENT '字典类型的状态：1-启用，2-禁用，参考 StatusEnum',\n" +
" `dict_type_sort` decimal(10, 2) NULL DEFAULT NULL COMMENT '排序，带小数点',\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" + " 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_time datetime(0) NULL DEFAULT NULL COMMENT '创建时间',\n" +
" `create_user` bigint(20) NULL DEFAULT NULL COMMENT '创建用户id',\n" + " create_user bigint(20) NULL DEFAULT NULL COMMENT '创建用户id',\n" +
" `update_time` datetime(0) NULL DEFAULT NULL COMMENT '修改时间',\n" + " update_time datetime(0) NULL DEFAULT NULL COMMENT '修改时间',\n" +
" `update_user` bigint(20) NULL DEFAULT NULL COMMENT '修改用户id',\n" + " update_user bigint(20) NULL DEFAULT NULL COMMENT '修改用户id',\n" +
" PRIMARY KEY (`dict_type_id`) USING BTREE\n" + " PRIMARY KEY (dict_type_id) USING BTREE\n" +
") ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '字典类型表，一个字典类型下有多个字典' ROW_FORMAT = Dynamic;"; ") ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '字典类型表，一个字典类型下有多个字典' ROW_FORMAT = Dynamic;";
} }