From 7324229be6b961411038fab3c680929ae05b0496 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期四, 12 十二月 2024 16:30:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/db/mysql.sql | 66 ++++++++++++++++++++------------
1 files changed, 41 insertions(+), 25 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/db/mysql.sql b/iailab-module-model/iailab-module-model-biz/db/mysql.sql
index 8883c8c..1381cea 100644
--- a/iailab-module-model/iailab-module-model-biz/db/mysql.sql
+++ b/iailab-module-model/iailab-module-model-biz/db/mysql.sql
@@ -66,7 +66,7 @@
id varchar(36) not null,
modelid varchar(36),
`key` varchar(36),
- value varchar(256),
+ value varchar(1000),
name varchar(36),
valuetype varchar(36),
primary key (id),
@@ -86,13 +86,6 @@
primary key (id),
INDEX idx_modelid (modelid)
) engine = innodb default character set utf8mb4 COMMENT = '预测模型输入参数表';
-
-create table t_mm_model_resultstr
-(
- id varchar(64) not null,
- resultstr varchar(64),
- primary key (id)
-) engine = innodb default character set utf8mb4 COMMENT = '预测模型结果字符串表';
create table
t_mm_predict_item
@@ -122,7 +115,7 @@
(
id varchar(36) not null,
itemid varchar(36),
- expression varchar(255),
+ expression varchar(1000),
num integer,
primary key (id),
UNIQUE INDEX uk_itemid (itemid)
@@ -188,19 +181,35 @@
(
id varchar(36) not null,
item_id varchar(36) not null COMMENT '预测项ID',
- sample_length integer COMMENT '样本长度',
+ out_id varchar(36) not null COMMENT '输出ID',
+ sample_length integer COMMENT '取样长度',
value_type integer COMMENT '值类型',
+ begin_time datetime COMMENT '开始统计时间',
in_deviation decimal(8, 3) COMMENT '精准误差',
in_accuracy_rate decimal(6, 4) COMMENT '精准度',
out_deviation decimal(8, 3) COMMENT '不可信误差',
out_accuracy_rate decimal(6, 4) COMMENT '不可信率',
- is_enable tinyint,
- update_time datetime,
- begin_time datetime,
+ is_enable tinyint COMMENT '是否启用',
+ create_time datetime COMMENT '创建时间',
+ update_time datetime COMMENT '更新时间',
primary key (id),
INDEX idx_item_id (item_id)
) engine = innodb
default character set utf8mb4 COMMENT = '预测精准度表';
+
+create table t_mm_item_accuracy_his
+(
+ id varchar(36) not null,
+ rate_id varchar(36) not null COMMENT '预测精准度ID',
+ in_deviation decimal(8, 3) COMMENT '精准误差',
+ in_accuracy_rate decimal(6, 4) COMMENT '精准度',
+ out_deviation decimal(8, 3) COMMENT '不可信误差',
+ out_accuracy_rate decimal(6, 4) COMMENT '不可信率',
+ create_time datetime COMMENT '创建时间',
+ primary key (id),
+ INDEX idx_rate_id (rate_id)
+) engine = innodb
+ default character set utf8mb4 COMMENT = '预测精准度历史';
create table t_mm_predict_alarm_config
(
@@ -208,12 +217,13 @@
title varchar(20) COMMENT '消息标题',
alarm_obj varchar(36) COMMENT '监控对象',
item_id varchar(36) COMMENT '预测项ID',
+ out_id varchar(36) COMMENT '输出ID',
comp_length int COMMENT '比较长度',
upper_limit decimal(10, 4) COMMENT '上限',
lower_limit decimal(10, 4) COMMENT '下限',
unit varchar(10) COMMENT '单位',
coefficient decimal(10, 4) COMMENT '转换系数',
- model_id varchar(36) COMMENT '调度建议模型',
+ schedule_id varchar(36) COMMENT '调度方案',
is_enable tinyint NOT NULL COMMENT '是否启用（0禁用 1启用）',
`creator` varchar(64) NOT NULL DEFAULT '' COMMENT '创建者',
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
@@ -226,11 +236,13 @@
create table t_mm_predict_alarm_message
(
id varchar(36) not null,
+ config_id varchar(36) COMMENT '配置ID',
title varchar(36) COMMENT '消息标题',
content varchar(128) COMMENT '消息内容',
alarm_obj varchar(36) COMMENT '监控对象',
point_id varchar(36) COMMENT '监控点位ID',
item_id varchar(36) COMMENT '预测项ID',
+ out_id varchar(36) COMMENT '输出ID',
current_value decimal(18, 4) COMMENT '当前值',
out_time datetime COMMENT '超出时间',
out_value decimal(18, 4) COMMENT '超出值',
@@ -239,6 +251,7 @@
create_time datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
primary key (id),
INDEX idx_item_id (item_id),
+ INDEX idx_config_id (config_id),
INDEX idx_alarm_obj (alarm_obj),
INDEX idx_alarm_time (alarm_time)
) engine = innodb
@@ -590,7 +603,7 @@
`file_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '文件名',
`file_path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '文件保存路径',
`remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注',
- `create_time` timestamp NULL DEFAULT NULL COMMENT '生成时间',
+ `create_time` datetime NULL DEFAULT NULL COMMENT '生成时间',
PRIMARY KEY (`id`, `mdk_id`) USING BTREE,
INDEX `del_code_history`(`mdk_id` ASC) USING BTREE,
CONSTRAINT `del_code_history` FOREIGN KEY (`mdk_id`) REFERENCES `t_mpk_file` (`id`) ON DELETE CASCADE ON UPDATE RESTRICT
@@ -625,7 +638,7 @@
`method_id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '方法id',
`setting_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT 'key',
`name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '参数名称',
- `value` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '参数默认值',
+ `value` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '参数默认值',
`type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '输入类型',
`value_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '参数类型',
`max` int NULL DEFAULT NULL COMMENT '最大值',
@@ -663,8 +676,8 @@
`id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'id',
`project_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '项目名称',
`project_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '项目编码',
- `create_time` timestamp NULL DEFAULT NULL COMMENT '创建时间',
- `update_time` timestamp NULL DEFAULT NULL COMMENT '修改时间',
+ `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+ `update_time` datetime NULL DEFAULT NULL COMMENT '修改时间',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '项目表' ROW_FORMAT = DYNAMIC;
@@ -696,8 +709,8 @@
`file_path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '文件路径',
`version` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '版本号',
`log` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新日志',
- `model_names` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '打包模型名称（“，”分割）',
- `create_time` timestamp NULL DEFAULT NULL COMMENT '创建时间',
+ `model_names` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '打包模型名称（“，”分割）',
+ `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
PRIMARY KEY (`id`, `project_id`) USING BTREE,
INDEX `del_package_history`(`project_id` ASC) USING BTREE,
CONSTRAINT `del_package_history` FOREIGN KEY (`project_id`) REFERENCES `t_mpk_project` (`id`) ON DELETE CASCADE ON UPDATE RESTRICT
@@ -802,8 +815,8 @@
`id` varchar(36) NOT NULL,
`chart_name` varchar(100) DEFAULT NULL COMMENT '图表名称',
`chart_code` varchar(100) DEFAULT NULL COMMENT '图表编码',
- `create_time` timestamp NULL DEFAULT NULL COMMENT '创建时间',
- `update_time` timestamp NULL DEFAULT NULL COMMENT '修改时间',
+ `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+ `update_time` datetime NULL DEFAULT NULL COMMENT '修改时间',
PRIMARY KEY (`id`),
UNIQUE KEY `uk_chart_code` (`chart_code`),
KEY `index_id` (`id`)
@@ -817,8 +830,8 @@
`param_code` varchar(100) DEFAULT NULL COMMENT '参数编码',
`param_value` varchar(1000) DEFAULT NULL COMMENT '参数值',
`remark` varchar(255) DEFAULT NULL COMMENT '备注',
- `create_time` timestamp NULL DEFAULT NULL COMMENT '创建时间',
- `update_time` timestamp NULL DEFAULT NULL COMMENT '修改时间',
+ `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+ `update_time` datetime NULL DEFAULT NULL COMMENT '修改时间',
PRIMARY KEY (`id`, `chart_id`) USING BTREE,
KEY `index_chart_id` (`chart_id`),
CONSTRAINT `chart_id` FOREIGN KEY (`chart_id`) REFERENCES `t_chart` (`id`) ON DELETE CASCADE ON UPDATE RESTRICT
@@ -862,4 +875,7 @@
INSERT INTO `iailab_plat_system`.`system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1629, 2, 'double[][]', '2', 'model_result_type', 0, '', '', '', '141', '2024-11-11 15:21:17', '141', '2024-11-11 15:21:17', b'0');
-alter table t_mm_item_output add column `result_name` varchar(50) DEFAULT NULL;
\ No newline at end of file
+alter table t_mm_item_output add column `result_name` varchar(50) DEFAULT NULL;
+
+
+alter table t_st_schedule_scheme add column `mpkprojectid` varchar(36) DEFAULT NULL;
\ No newline at end of file
--
Gitblit v1.9.3