From 042be316746210a681a21c3ecca6b7a44e793db0 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期日, 09 三月 2025 23:31:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/db/mysql.sql | 197 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 166 insertions(+), 31 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 649f596..3e73a65 100644
--- a/iailab-module-model/iailab-module-model-biz/db/mysql.sql
+++ b/iailab-module-model/iailab-module-model-biz/db/mysql.sql
@@ -40,18 +40,6 @@
INDEX idx_itemid (itemid)
) engine = innodb default character set utf8mb4 COMMENT = '预测项输出表';
-create table t_mm_item_result
-(
- id varchar(36) not null,
- outputid varchar(36),
- datatime datetime,
- datavalue decimal(19, 3),
- primary key (id),
- INDEX idx_outputid (outputid),
- INDEX idx_datatime (datatime)
-) engine = innodb
- default character set utf8mb4 COMMENT = '预测结果表';
-
create table t_mm_item_type
(
id varchar(36) not null,
@@ -66,7 +54,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),
@@ -115,7 +103,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)
@@ -156,26 +144,14 @@
create table t_mm_item_result_json
(
id varchar(36) not null,
- outputid varchar(36),
+ outputid varchar(50),
predicttime datetime,
- jsonvalue varchar(6400),
+ jsonvalue text,
cumulant varchar(36),
primary key (id),
INDEX idx_outputid (outputid),
INDEX idx_predicttime (predicttime)
) engine = innodb default character set utf8mb4 COMMENT = '预测JSON数据表';
-
-create table
- t_mm_item_result_last_point
-(
- id varchar(36) not null,
- outputid varchar(36),
- datatime datetime,
- datavalue decimal(19, 3),
- primary key (id),
- INDEX idx_outputid (outputid),
- INDEX idx_datatime (datatime)
-) engine = innodb default character set utf8mb4 COMMENT = '预测T+L数据表';
create table t_mm_item_accuracy_rate
(
@@ -638,7 +614,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 '最大值',
@@ -709,7 +685,7 @@
`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 '打包模型名称（“，”分割）',
+ `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,
@@ -875,4 +851,163 @@
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;
+
+alter table t_st_schedule_record add column `result_code` varchar(10) DEFAULT NULL;
+alter table t_st_schedule_record add column `result_data` text DEFAULT NULL;
+
+CREATE TABLE `t_st_schedule_model_out` (
+ `id` varchar(36) NOT NULL COMMENT 'id',
+ `model_id` varchar(36) DEFAULT NULL COMMENT '模型ID',
+ `result_key` varchar(36) DEFAULT NULL COMMENT '输出key',
+ `result_type` varchar(36) DEFAULT NULL COMMENT '数据类型（double,double[],double[][]）',
+ `result_port` int DEFAULT NULL COMMENT 'port',
+ `result_index` int DEFAULT NULL COMMENT 'index',
+ `is_write` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '是否下发',
+ `point_no` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '下发的点位',
+ `sort` int DEFAULT NULL COMMENT '排序',
+ `disturbance_point_no` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '无扰切换点位',
+ PRIMARY KEY (`id`) USING BTREE,
+ INDEX `ind_model_id`(`model_id` ASC) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='模型下发信息表';
+
+alter table t_st_schedule_scheme add column `run_status` varchar(4) DEFAULT NULL COMMENT '运行状态';
+
+alter table t_mm_predict_alarm_config add column `cul_upper` decimal(10, 4) COMMENT '累计值上限';
+alter table t_mm_predict_alarm_config add column `cul_lower` decimal(10, 4) COMMENT '累计值下限';
+
+alter table t_st_schedule_scheme modify column `trigger_condition` varchar(50) COMMENT '触发条件'
+
+
+CREATE TABLE `t_electricity_price_segmented` (
+ `id` varchar(36) NOT NULL COMMENT 'ID',
+ `i_time_id` varchar(36) DEFAULT NULL,
+ `rec_id` varchar(36) DEFAULT NULL,
+ `media_id` varchar(36) DEFAULT NULL COMMENT '能介编号',
+ `ref_media_id` varchar(20) DEFAULT NULL,
+ `start_time` datetime NULL DEFAULT NULL COMMENT '开始时间',
+ `end_time` datetime NULL DEFAULT NULL COMMENT '结束时间',
+ `year` varchar(26) DEFAULT NULL,
+ `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+ `update_time` datetime NULL DEFAULT NULL COMMENT '修改时间',
+ PRIMARY KEY (`id`) USING BTREE,
+ INDEX `ind_i_time_id`(`i_time_id` ASC) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='电价时段配置数据';
+
+
+alter table t_mm_item_output add column `iscumulant` tinyint default false COMMENT '是否累计';
+alter table t_mm_item_output add column `cumuldivisor` int DEFAULT NULL COMMENT '累计除数';
+alter table t_mm_item_output add column `cumulpoint` varchar(36) DEFAULT NULL, COMMENT '累计测点';
+
+
+CREATE TABLE `t_st_adjust_config` (
+ `id` varchar(36) NOT NULL COMMENT 'ID',
+ `schedule_model_id` varchar(36) DEFAULT NULL COMMENT '调度模型ID',
+ `remark` varchar(200) DEFAULT NULL COMMENT '备注',
+ `status` tinyint DEFAULT 1 COMMENT '状态',
+ create_time datetime default current_timestamp,
+ update_time datetime default current_timestamp,
+ PRIMARY KEY (`id`) USING BTREE,
+ INDEX `idx_schedule_model_id`(`schedule_model_id` ASC) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='模拟调整配置表';
+
+CREATE TABLE `t_st_adjust_config_det` (
+ `id` varchar(36) NOT NULL COMMENT 'ID',
+ `config_id` varchar(36) DEFAULT NULL COMMENT '配置ID',
+ `item_type_id` varchar(36) DEFAULT NULL COMMENT '预测项类型',
+ `predict_item_id` varchar(36) DEFAULT NULL COMMENT '预测项ID',
+ `out_key` varchar(50) DEFAULT NULL COMMENT '输出KEY',
+ `out_name` varchar(50) DEFAULT NULL COMMENT '输出名称',
+ `model_param_order` integer DEFAULT NULL COMMENT '参数排序',
+ `model_param_port_order` integer DEFAULT NULL COMMENT '输入排序',
+ `sort` integer COMMENT '执行顺序',
+ PRIMARY KEY (`id`) USING BTREE,
+ INDEX `idx_config_id`(`config_id` ASC) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='模拟调整配置详细表';
+
+CREATE TABLE `t_st_adjust_result` (
+ `id` varchar(36) NOT NULL COMMENT 'ID',
+ `config_id` varchar(36) DEFAULT NULL COMMENT '配置ID',
+ `output_id` varchar(50) DEFAULT NULL COMMENT '预测项输出ID',
+ `schedule_model_id` varchar(36) DEFAULT NULL COMMENT '调度模型ID',
+ `adjust_time` datetime NULL DEFAULT NULL COMMENT '模拟调整时间',
+ `adjust_value` varchar(500) DEFAULT NULL COMMENT '模拟调整值',
+ `json_value` varchar(1000) DEFAULT NULL COMMENT '模拟调整结果',
+ PRIMARY KEY (`id`) USING BTREE,
+ INDEX `idx_output_id`(`output_id` ASC) USING BTREE,
+ INDEX `idx_schedule_model_id`(`schedule_model_id` ASC) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='模拟调整结果表';
+
+-- matlab
+CREATE TABLE `t_ml_model` (
+ `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+ `model_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '模型名称',
+ `model_file_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '模型文件名',
+ `model_file_path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '模型文件路径',
+ `model_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '模型类型',
+ `matlab_platform` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT 'matlab平台',
+ `matlab_version` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT 'matlab版本',
+ `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注',
+ `creator` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建者',
+ `create_date` datetime NULL DEFAULT NULL COMMENT '创建时间',
+ `updater` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新者',
+ `update_date` datetime NULL DEFAULT NULL COMMENT '更新时间',
+ PRIMARY KEY (`id`) USING BTREE,
+ UNIQUE INDEX `model_file_name`(`model_file_name` ASC) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = 'matlab模型表' ROW_FORMAT = Dynamic;
+
+CREATE TABLE `t_ml_model_method` (
+ `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+ `ml_model_id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '模型id',
+ `class_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '全类名',
+ `method_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '方法名',
+ `data_length` int NULL DEFAULT 1 COMMENT '数据长度',
+ `out_length` int NULL DEFAULT NULL COMMENT '输出长度',
+ `sort` int NULL DEFAULT NULL COMMENT '排序',
+ PRIMARY KEY (`id`, `ml_model_id`) USING BTREE,
+ INDEX `id`(`id` ASC) USING BTREE,
+ INDEX `index_model_id`(`ml_model_id` ASC) USING BTREE,
+ CONSTRAINT `t_ml_model_method_ibfk_1` FOREIGN KEY (`ml_model_id`) REFERENCES `t_ml_model` (`id`) ON DELETE CASCADE ON UPDATE RESTRICT
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = 'matlab模型方法表' ROW_FORMAT = Dynamic;
+
+CREATE TABLE `t_ml_model_method_setting` (
+ `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'id',
+ `ml_model_method_id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '模型方法id',
+ `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '参数名称',
+ `setting_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '参数key',
+ `setting_value` 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 '参数类型',
+ `sort` int NULL DEFAULT NULL COMMENT '排序',
+ PRIMARY KEY (`id`) USING BTREE,
+ INDEX `id`(`id` ASC) USING BTREE,
+ INDEX `ml_model_method_id`(`ml_model_method_id` ASC) USING BTREE,
+ CONSTRAINT `t_ml_model_method_setting_ibfk_1` FOREIGN KEY (`ml_model_method_id`) REFERENCES `t_ml_model_method` (`id`) ON DELETE CASCADE ON UPDATE RESTRICT
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = 'matlab模型方法参数表' ROW_FORMAT = Dynamic;
+
+CREATE TABLE `t_ml_project` (
+ `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 '修改时间',
+ `publish_time` timestamp NULL DEFAULT NULL COMMENT '发布时间',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = 'matlab项目表' ROW_FORMAT = DYNAMIC;
+
+CREATE TABLE `t_ml_project_model` (
+ `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'id',
+ `project_id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '项目id',
+ `model_id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '模型id',
+ PRIMARY KEY (`id`, `project_id`, `model_id`) USING BTREE,
+ INDEX `model_id`(`model_id` ASC) USING BTREE,
+ INDEX `project_id`(`project_id` ASC) USING BTREE,
+ CONSTRAINT `t_ml_project_model_ibfk_1` FOREIGN KEY (`model_id`) REFERENCES `t_ml_model` (`id`) ON DELETE CASCADE ON UPDATE RESTRICT,
+ CONSTRAINT `t_ml_project_model_ibfk_2` FOREIGN KEY (`project_id`) REFERENCES `t_ml_project` (`id`) ON DELETE CASCADE ON UPDATE RESTRICT
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = 'matlab项目模型关联表' ROW_FORMAT = DYNAMIC;
+
+
+-- t_st_schedule_record 创建复合索引
+CREATE INDEX idx_st_schedule_record_scheme_result_time ON t_st_schedule_record (scheme_id, result_code, schedule_time DESC, create_time DESC);
--
Gitblit v1.9.3