From a4ec2b72f1e9452e689294cd617a83111e0f868e Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期三, 19 二月 2025 14:11:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 iailab-module-model/iailab-module-model-biz/db/mysql.sql |   31 +++++++++++++++++++------------
 1 files changed, 19 insertions(+), 12 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 2d456f7..417acc3 100644
--- a/iailab-module-model/iailab-module-model-biz/db/mysql.sql
+++ b/iailab-module-model/iailab-module-model-biz/db/mysql.sql
@@ -144,7 +144,7 @@
 create table t_mm_item_result_json
 (
     id          varchar(36) not null,
-    outputid    varchar(36),
+    outputid    varchar(50),
     predicttime datetime,
     jsonvalue   text,
     cumulant    varchar(36),
@@ -883,14 +883,21 @@
 
 
 CREATE TABLE `t_electricity_price_segmented` (
-                                                 `id` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'ID',
-                                                 `i_time_id` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
-                                                 `rec_id` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
-                                                 `media_id` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '能介编号',
-                                                 `ref_media_id` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
-                                                 `start_time` timestamp NULL DEFAULT NULL COMMENT '开始时间',
-                                                 `end_time` timestamp NULL DEFAULT NULL COMMENT '结束时间',
-                                                 `create_time` timestamp NULL DEFAULT NULL COMMENT '创建时间',
-                                                 `update_time` timestamp NULL DEFAULT NULL COMMENT '修改时间',
-                                                 PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 ROW_FORMAT=DYNAMIC COMMENT='电价时段配置数据';
\ No newline at end of file
+                                                 `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 '累计测点';
\ No newline at end of file

--
Gitblit v1.9.3