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 |   81 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 80 insertions(+), 1 deletions(-)

diff --git a/ansteel-biz/db/mysql.sql b/ansteel-biz/db/mysql.sql
index 0edec8f..79191c2 100644
--- a/ansteel-biz/db/mysql.sql
+++ b/ansteel-biz/db/mysql.sql
@@ -250,6 +250,22 @@
 ALTER TABLE `t_power_net_factor`
     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 '有功上限';
+ALTER TABLE `t_power_net_factor`
+    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 '功率因数上限';
+
 -- ----------------------------
 -- 电力功率因数-发电机组实时状态
 -- ----------------------------
@@ -296,6 +312,7 @@
     `status_id` varchar(36) NULL DEFAULT NULL COMMENT '投运状态父ID',
     `type`      varchar(50) NULL DEFAULT NULL COMMENT '类型',
     `name`      varchar(50) NULL DEFAULT NULL COMMENT '电容器名称',
+    `point_no`  varchar(50) NULL DEFAULT NULL COMMENT '下属测点编码',
     `remark`    varchar(50) NULL DEFAULT NULL COMMENT '备注',
     `sort`      int NULL DEFAULT NULL COMMENT '排序',
     PRIMARY KEY (`id`) USING BTREE
@@ -707,6 +724,21 @@
     UNIQUE key uk_code (code)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='调整后的功率因数与无功倒送量';
 
+
+-- ----------------------------
+-- 功率因数-母线电压状态
+-- ----------------------------
+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 '测点',
+    `limit_h` decimal(8, 2) DEFAULT NULL COMMENT '阈值',
+    `sort`    int NULL DEFAULT NULL COMMENT '排序',
+    PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='功率因数-母线电压状态';
+
 CREATE TABLE `t_coking_overview_ind`
 (
     `id`           varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'id',
@@ -720,4 +752,51 @@
     `create_date`  datetime                                                     DEFAULT NULL COMMENT '创建时间',
     PRIMARY KEY (`id`) USING BTREE,
     KEY            `idx_rel_id` (`rel_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='焦化工序概况指标数据结果';
\ No newline at end of file
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='焦化工序概况指标数据结果';
+
+-- ----------------------------
+-- 电力下拉关系表
+-- ----------------------------
+CREATE TABLE `t_power_net_dropdown`
+(
+    `id`         varchar(36) NOT NULL,
+    `p_code`     varchar(50)                                                  DEFAULT NULL COMMENT '父编码',
+    `group_name` varchar(50) NULL DEFAULT NULL COMMENT '分组名称',
+    `node_code`  varchar(50)                                                  DEFAULT NULL COMMENT '编码',
+    `node_name`  varchar(50)                                                  DEFAULT NULL COMMENT '名称',
+    `cur_p`      varchar(50) NULL DEFAULT NULL COMMENT '当前有功',
+    `cur_q`      varchar(50) NULL DEFAULT NULL COMMENT '当前无功',
+    `cur_cos`    varchar(50) NULL DEFAULT NULL COMMENT '当前功率因数',
+    `ext1`       varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '拓展字段1',
+    `ext2`       varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '拓展字段2',
+    `ext3`       varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '拓展字段3',
+    `ext4`       varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '拓展字段4',
+    `ext5`       varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '拓展字段5',
+    `sort`       int                                                          DEFAULT NULL COMMENT '排序',
+    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='电力下拉关系表';
+
+
+-- ----------------------------
+-- 煤气预测析配置
+-- ----------------------------
+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