From 8b43a1a91c37676e6a1e506e211f60e3e238f669 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期四, 20 二月 2025 16:23:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-biz/db/mysql/tenant.sql | 44 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 36 insertions(+), 8 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/db/mysql/tenant.sql b/iailab-module-data/iailab-module-data-biz/db/mysql/tenant.sql
index 354998b..e49a145 100644
--- a/iailab-module-data/iailab-module-data-biz/db/mysql/tenant.sql
+++ b/iailab-module-data/iailab-module-data-biz/db/mysql/tenant.sql
@@ -129,7 +129,7 @@
) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='KIO测点表';
CREATE TABLE t_da_point(
- `id` VARCHAR(255) NOT NULL COMMENT 'ID' ,
+ `id` VARCHAR(36) NOT NULL COMMENT 'ID' ,
`point_no` VARCHAR(36) COMMENT '测点编码' ,
`point_name` VARCHAR(36) COMMENT '测点名称' ,
`point_type` VARCHAR(10) COMMENT '测点类型' ,
@@ -169,7 +169,7 @@
CREATE TABLE t_da_math_point(
`id` VARCHAR(36) NOT NULL COMMENT 'ID' ,
`point_id` VARCHAR(36) COMMENT '测点ID' ,
- `expression` VARCHAR(500) COMMENT '计算公式' ,
+ `expression` VARCHAR(2000) COMMENT '计算公式' ,
PRIMARY KEY (id) USING BTREE,
UNIQUE KEY `uk_point_id` (`point_id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT = '计算点表';
@@ -238,7 +238,8 @@
`tag_desc` varchar(64) DEFAULT NULL COMMENT '描述',
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
- PRIMARY KEY (`id`) USING BTREE
+ PRIMARY KEY (`id`) USING BTREE,
+ UNIQUE KEY `uk_api_tag` (`api_id`, `tag_name`) USING BTREE
) ENGINE=InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT='接口Tag表';
-- 指标管理------------
@@ -402,10 +403,37 @@
CREATE TABLE t_da_point_collect_status(
`id` VARCHAR(36) NOT NULL COMMENT 'ID' ,
- `point_id` VARCHAR(36) NOT NULL COMMENT '测点ID',
- `collect_value` VARCHAR(36) COMMENT '采集值',
- `collect_quality` VARCHAR(36) COMMENT '采集质量',
+ `point_no` VARCHAR(36) NOT NULL COMMENT '测点编码',
+ `collect_value` VARCHAR(24) COMMENT '采集值',
+ `collect_quality` VARCHAR(5) COMMENT '采集质量',
`collect_time` DATETIME COMMENT '采集时间' ,
PRIMARY KEY (id) USING BTREE,
- UNIQUE KEY `uk_point_id` (`point_id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT = '测点采集状态表';
\ No newline at end of file
+ UNIQUE KEY `uk_point_no` (`point_no`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT = '测点采集状态表';
+
+ALTER TABLE `t_ind_item` ADD COLUMN `solidify_flag` varchar(36) NULL COMMENT '固化标识' AFTER `status`,
+MODIFY COLUMN `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间' AFTER `create_time`;
+
+ALTER TABLE `t_ind_item_value`
+ MODIFY COLUMN `data_time` datetime NULL DEFAULT NULL COMMENT '数据时间' AFTER `item_no`;
+
+CREATE TABLE `t_arc_data` (
+ `id` varchar(255) NOT NULL COMMENT 'id',
+ `arc_id` varchar(255) DEFAULT NULL COMMENT '归档id',
+ `arc_time` varchar(255) DEFAULT NULL COMMENT '归档时间',
+ `value` varchar(255) DEFAULT NULL COMMENT '归档时间',
+ `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='归档数据表';
+
+CREATE TABLE `t_arc_setting` (
+ `id` varchar(255) NOT NULL COMMENT 'id',
+ `name` varchar(255) DEFAULT NULL COMMENT '名称',
+ `type` varchar(255) DEFAULT NULL COMMENT '归档周期(shift、day、month、year)',
+ `point` varchar(255) DEFAULT NULL COMMENT '归档点位',
+ `calculate` varchar(255) DEFAULT NULL COMMENT '计算方法（none、sum、diff、avg）',
+ `is_enable` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '是否启用',
+ `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+ `update_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='定时归档设置表';
\ No newline at end of file
--
Gitblit v1.9.3