From 6205c22a959fbb3b69735f34af8d3316c4082a5d Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期四, 27 二月 2025 16:00:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-biz/db/mysql/tenant.sql | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 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 e49a145..9f63ba2 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
@@ -418,22 +418,26 @@
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 '归档时间',
+ `id` varchar(36) NOT NULL COMMENT 'id',
+ `arc_id` varchar(36) DEFAULT NULL COMMENT '归档id',
+ `code` varchar(30) DEFAULT NULL COMMENT '编码',
+ `arc_time` varchar(30) DEFAULT NULL COMMENT '归档时间',
+ `arc_value` DECIMAL(18,6) 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 '是否启用',
+ `id` varchar(36) NOT NULL COMMENT 'id',
+ `code` varchar(30) DEFAULT NULL COMMENT '编码',
+ `name` varchar(30) DEFAULT NULL COMMENT '名称',
+ `type` varchar(10) DEFAULT NULL COMMENT '归档周期(shift、day、month、year)',
+ `point` varchar(36) DEFAULT NULL COMMENT '归档点位',
+ `calculate` varchar(10) DEFAULT NULL COMMENT '计算方法（none、sum、diff、avg）',
+ `sort` int COMMENT '排序',
+ `is_enable` tinyint(1) DEFAULT 1 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
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `uk_code` (`code`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='定时归档设置表';
\ No newline at end of file
--
Gitblit v1.9.3