From bcda1b086d8cdeb9d2bc6c2d0d49a30b806d1f11 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 07 五月 2025 18:13:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ansteel-biz/db/mysql.sql | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/ansteel-biz/db/mysql.sql b/ansteel-biz/db/mysql.sql
index 2726640..79191c2 100644
--- a/ansteel-biz/db/mysql.sql
+++ b/ansteel-biz/db/mysql.sql
@@ -251,6 +251,9 @@
ADD COLUMN `node_code` varchar(50) NULL DEFAULT NULL COMMENT '节点编号';
ALTER TABLE `t_power_net_factor`
+ ADD COLUMN `cur_a` varchar(50) NULL DEFAULT NULL COMMENT '当前电流' AFTER `node_name`;
+
+ALTER TABLE `t_power_net_factor`
ADD COLUMN `p_limit_l` decimal(9, 3) NULL DEFAULT NULL COMMENT '有功下限';
ALTER TABLE `t_power_net_factor`
ADD COLUMN `p_limit_h` decimal(9, 3) NULL DEFAULT NULL COMMENT '有功上限';
@@ -258,6 +261,10 @@
ADD COLUMN `q_limit_l` varchar(50) NULL DEFAULT NULL COMMENT '无功下限';
ALTER TABLE `t_power_net_factor`
ADD COLUMN `q_limit_h` varchar(50) NULL DEFAULT NULL COMMENT '无功上限';
+ALTER TABLE `t_power_net_factor`
+ ADD COLUMN `cos_limit_l` varchar(50) NULL DEFAULT NULL COMMENT '功率因数下限';
+ALTER TABLE `t_power_net_factor`
+ ADD COLUMN `cos_limit_h` varchar(50) NULL DEFAULT NULL COMMENT '功率因数上限';
-- ----------------------------
-- 电力功率因数-发电机组实时状态
@@ -723,12 +730,12 @@
-- ----------------------------
CREATE TABLE `t_power_voltage_status`
(
- `id` varchar(36) NOT NULL COMMENT 'id',
- `code` varchar(50),
- `name` varchar(50) DEFAULT NULL COMMENT '机组名称',
- `point` varchar(50) DEFAULT NULL COMMENT '测点',
+ `id` varchar(36) NOT NULL COMMENT 'id',
+ `code` varchar(50),
+ `name` varchar(50) DEFAULT NULL COMMENT '机组名称',
+ `point` varchar(50) DEFAULT NULL COMMENT '测点',
`limit_h` decimal(8, 2) DEFAULT NULL COMMENT '阈值',
- `sort` int NULL DEFAULT NULL COMMENT '排序',
+ `sort` int NULL DEFAULT NULL COMMENT '排序',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='功率因数-母线电压状态';
@@ -769,4 +776,27 @@
PRIMARY KEY (`id`),
key uk_p_code (p_code),
UNIQUE key uk_node_code (node_code)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='电力下拉关系表';
\ No newline at end of file
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='电力下拉关系表';
+
+
+-- ----------------------------
+-- 煤气预测析配置
+-- ----------------------------
+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 '预测项输出名称',
+ `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`;
--
Gitblit v1.9.3