From 1ac5226ccc10d1d33bfcf4129c09a9b095a9f82e Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 21 四月 2025 10:59:30 +0800
Subject: [PATCH] 异常溯源折线图 修改
---
ansteel-biz/db/mysql.sql | 28 ++++++++++++++++------------
ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/entity/CokingTraceChartEntity.java | 18 ++++++++++++++++--
2 files changed, 32 insertions(+), 14 deletions(-)
diff --git a/ansteel-biz/db/mysql.sql b/ansteel-biz/db/mysql.sql
index 5f9b368..d7c0ce3 100644
--- a/ansteel-biz/db/mysql.sql
+++ b/ansteel-biz/db/mysql.sql
@@ -448,8 +448,8 @@
`id` varchar(36) NOT NULL COMMENT 'id',
`info_type` varchar(10) NULL DEFAULT NULL COMMENT '信息类型（0：生产情况，1：能源发生，2：能源消耗）',
`ind_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '指标类型（prod_day,main,child）',
- `data_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '数据类型（测点，指标）',
- `point_no` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '测点编码',
+ `data_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '数据类型（测点，指标）',
+ `point_no` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '测点编码',
`ind_code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '指标编码',
`ind_name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '指标名称',
`ind_unit` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '指标单位',
@@ -532,7 +532,10 @@
`rel_id` varchar(36) NULL DEFAULT NULL COMMENT '关联ID',
`name` varchar(20) NULL DEFAULT NULL COMMENT '图表名称',
`clock` varchar(20) NULL DEFAULT NULL COMMENT '查询时间',
- `value_json` varchar(1000) NULL DEFAULT NULL COMMENT '值',
+ `data_type` varchar(20) DEFAULT NULL COMMENT '数据类型（测点，指标）',
+ `data_no` varchar(20) DEFAULT NULL COMMENT '数据编码',
+ `start_time` datetime COMMENT '开始时间',
+ `end_time` datetime COMMENT '结束时间',
`sort` int NULL DEFAULT NULL COMMENT '排序',
`create_date` datetime COMMENT '创建时间',
PRIMARY KEY (`id`) USING BTREE,
@@ -602,7 +605,7 @@
(
`id` varchar(36) NOT NULL COMMENT 'id',
`rel_id` varchar(36) NULL DEFAULT NULL COMMENT '关联ID',
- `title` varchar(20) NULL DEFAULT NULL COMMENT '标题',
+ `title` varchar(20) NULL DEFAULT NULL COMMENT '标题',
`clock` varchar(20) NULL DEFAULT NULL COMMENT '查询时间',
`ind_name` varchar(20) NULL DEFAULT NULL COMMENT '名称',
`ind_value` varchar(20) NULL DEFAULT NULL COMMENT '值',
@@ -619,12 +622,13 @@
-- ----------------------------
-- 负荷移植-月最大需量，实测需量，有功功率
-- ----------------------------
-CREATE TABLE `t_power_demand` (
- `id` varchar(36) NOT NULL COMMENT 'id',
- `name` varchar(50) DEFAULT NULL COMMENT '机组名称',
- `max_demand` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '月最大需量',
- `cur_demand` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '实测需量',
- `active_power` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '有功功率',
- `sort` varchar(50) DEFAULT NULL COMMENT '排序',
- PRIMARY KEY (`id`)
+CREATE TABLE `t_power_demand`
+(
+ `id` varchar(36) NOT NULL COMMENT 'id',
+ `name` varchar(50) DEFAULT NULL COMMENT '机组名称',
+ `max_demand` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '月最大需量',
+ `cur_demand` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '实测需量',
+ `active_power` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '有功功率',
+ `sort` varchar(50) DEFAULT NULL COMMENT '排序',
+ PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='月最大需量，实测需量，有功功率';
\ No newline at end of file
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/entity/CokingTraceChartEntity.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/entity/CokingTraceChartEntity.java
index 2557fbd..3a0a1a7 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/entity/CokingTraceChartEntity.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/entity/CokingTraceChartEntity.java
@@ -32,9 +32,23 @@
*/
private String clock;
/**
- * 值
+ * 数据类型（测点，指标）
*/
- private String valueJson;
+ private String dataType;
+ /**
+ * 数据编码
+ */
+ private String dataNo;
+
+ /**
+ * 开始时间
+ */
+ private Date startTime;
+
+ /**
+ * 结束时间
+ */
+ private Date endTime;
/**
* 排序
*/
--
Gitblit v1.9.3