From cf1ecf13ac4c3606371d16aa50f885b831a92e3e Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期五, 09 五月 2025 11:04:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ansteel-biz/db/mysql.sql | 53 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 45 insertions(+), 8 deletions(-)
diff --git a/ansteel-biz/db/mysql.sql b/ansteel-biz/db/mysql.sql
index 09d3d12..9feda0c 100644
--- a/ansteel-biz/db/mysql.sql
+++ b/ansteel-biz/db/mysql.sql
@@ -785,13 +785,50 @@
DROP TABLE IF EXISTS `t_gas_pred_conf`;
CREATE TABLE `t_gas_pred_conf`
(
- `id` varchar(36) NOT NULL COMMENT 'id',
- `chart_code` varchar(50) NULL DEFAULT NULL COMMENT '预测图编号',
- `user_type` varchar(50) NULL DEFAULT NULL COMMENT '用户类型（发生，消耗）',
- `item_no` varchar(50) NULL DEFAULT NULL COMMENT '预测项编号',
- `item_name` varchar(50) NULL DEFAULT NULL COMMENT '预测项名称',
- `out_key` varchar(50) NULL DEFAULT NULL COMMENT '预测项输出key',
- `out_name` varchar(50) NULL DEFAULT NULL COMMENT '预测项输出名称',
- `sort` int NULL DEFAULT NULL COMMENT '排序',
+ `id` varchar(36) NOT NULL COMMENT 'id',
+ `chart_code` varchar(50) NULL DEFAULT NULL COMMENT '预测图编号',
+ `user_type` varchar(50) NULL DEFAULT NULL COMMENT '用户类型（发生，消耗）',
+ `item_no` varchar(50) NULL DEFAULT NULL COMMENT '预测项编号',
+ `item_name` varchar(50) NULL DEFAULT NULL COMMENT '预测项名称',
+ `out_key` varchar(50) NULL DEFAULT NULL COMMENT '预测项输出key',
+ `out_name` varchar(50) NULL DEFAULT NULL COMMENT '预测项输出名称',
+ `is_default_load` int DEFAULT NULL COMMENT '是否默认加载',
+ `sort` int NULL DEFAULT NULL COMMENT '排序',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC COMMENT '煤气预测析配置';
+
+ALTER TABLE `t_gas_pred_conf`
+ ADD COLUMN `out_id` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '预测项输出id' AFTER `item_name`,
+ADD COLUMN `is_default_load` int DEFAULT NULL COMMENT '是否默认加载' AFTER `out_name`;
+
+-- ----------------------------
+-- 负荷移植-最大需量发生记录
+-- ----------------------------
+DROP TABLE IF EXISTS `t_power_maxdemand_main`;
+CREATE TABLE `t_power_maxdemand_main`
+(
+ `id` varchar(36) NOT NULL COMMENT 'id',
+ `occur_time` datetime COMMENT '发生时间',
+ `code` varchar(50) NULL DEFAULT NULL COMMENT '编号',
+ `name` varchar(50) NULL DEFAULT NULL COMMENT '名称',
+ `max_demand` decimal(10, 2) NULL DEFAULT NULL COMMENT '最大需量',
+ PRIMARY KEY (`id`) USING BTREE,
+ key idx_code (code)
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC COMMENT '负荷移植最大需量发生记录';
+
+-- ----------------------------
+-- 负荷移植-最大需量发生记录详情
+-- ----------------------------
+DROP TABLE IF EXISTS `t_power_maxdemand_det`;
+CREATE TABLE `t_power_maxdemand_det`
+(
+ `id` varchar(36) NOT NULL COMMENT 'id',
+ `rel_id` varchar(36) NULL DEFAULT NULL COMMENT '关联ID',
+ `occur_time` datetime COMMENT '发生时间',
+ `code` varchar(50) NULL DEFAULT NULL COMMENT '编号',
+ `name` varchar(50) NULL DEFAULT NULL COMMENT '名称',
+ `max_demand` decimal(10, 2) NULL DEFAULT NULL COMMENT '最大需量',
+ `sort` int NULL DEFAULT NULL COMMENT '排序',
+ PRIMARY KEY (`id`) USING BTREE,
+ key idx_rel_id (rel_id)
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC COMMENT '负荷移植最大需量发生记录详情';
--
Gitblit v1.9.3