From 1f6ff03df42388413846fb4b2571d6b010ef3306 Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期一, 23 九月 2024 08:35:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-biz/db/mysql/tenant.sql | 49 +++++++++++++++++++++++++++----------------------
1 files changed, 27 insertions(+), 22 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 c716368..9ef32c6 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
@@ -116,7 +116,7 @@
`id` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
`tag_name` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '测点名称',
`data_type` varchar(16) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '数据类型',
- `tag_id` int NOT NULL COMMENT '顺序号',
+ `tag_id` int default NULL COMMENT '顺序号',
`tag_desc` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci default NULL COMMENT '测点描述',
`enabled` tinyint(1) DEFAULT NULL COMMENT '是否启用',
`device` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '关联设备',
@@ -200,13 +200,13 @@
`code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '编码',
`name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '名称',
`url` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT 'URL',
- `method` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '方法',
+ `method` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '请求方法',
`param` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '参数',
`descp` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '描述',
`status` int NULL DEFAULT NULL COMMENT '状态',
- `creator` VARCHAR(255) COMMENT '创建人' ,
+ `creator` VARCHAR(64) COMMENT '创建人' ,
`create_time` DATETIME COMMENT '创建时间' ,
- `updater` VARCHAR(255) COMMENT '修改人' ,
+ `updater` VARCHAR(64) COMMENT '修改人' ,
`update_time` DATETIME COMMENT '修改时间' ,
PRIMARY KEY (`ID`) USING BTREE,
UNIQUE KEY `uk_code` (`code`) USING BTREE
@@ -214,14 +214,14 @@
CREATE TABLE `t_http_token` (
- `id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
- `api_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
- `login_url` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
- `client_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
- `client_secret` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
- `username` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
- `password` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
- `token` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT 'token',
+ `id` varchar(36) NOT NULL COMMENT 'ID',
+ `api_id` varchar(36) NOT NULL COMMENT '接口ID',
+ `login_url` varchar(200) DEFAULT NULL COMMENT '登录地址',
+ `client_id` varchar(100) DEFAULT NULL COMMENT 'ClientId',
+ `client_secret` varchar(100) DEFAULT NULL COMMENT 'ClientSecret',
+ `username` varchar(50) DEFAULT NULL COMMENT '用户名',
+ `password` varchar(50) DEFAULT NULL COMMENT '密码',
+ `token` varchar(2000) DEFAULT NULL COMMENT 'token',
`expire_time` datetime DEFAULT NULL COMMENT '过期时间',
`update_time` datetime DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`id`) USING BTREE,
@@ -229,14 +229,16 @@
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='接口Token';
CREATE TABLE `t_http_tag` (
- `id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '查询号',
- `http_api_code` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'HTTP 接口代码',
- `tag_code` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '测点编码',
- `tag_name` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '测点名称',
+ `id` varchar(36) NOT NULL COMMENT 'ID',
+ `api_id` varchar(36) NOT NULL COMMENT '接口ID',
+ `tag_name` varchar(64) NOT NULL COMMENT '标签名称',
+ `data_type` varchar(16) NOT NULL COMMENT '数据类型',
+ `enabled` tinyint(1) DEFAULT NULL COMMENT '是否启用',
+ `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
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='接口Tag表';
+) ENGINE=InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT='接口Tag表';
-- 指标管理------------
CREATE TABLE t_ind_data_set(
@@ -260,7 +262,8 @@
`field_name` VARCHAR(30) COMMENT '中文名' ,
`field_type` VARCHAR(30) COMMENT '数据类型' ,
`sort` int COMMENT '排序',
- PRIMARY KEY (id) USING BTREE
+ PRIMARY KEY (id) USING BTREE,
+ INDEX `idx_data_set_id` (`data_set_id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT = '指标数据集字段';
CREATE TABLE t_ind_item_category(
@@ -281,9 +284,10 @@
`item_name` VARCHAR(36) COMMENT '指标名称' ,
`item_type` VARCHAR(20) COMMENT '指标类型' ,
`item_category` VARCHAR(20) COMMENT '指标分类' ,
- `coefficient` decimal(10, 4) COMMENT '系数',
+ `coefficient` decimal(10, 4) COMMENT '转换系数',
`precision` int COMMENT '指标精度',
`time_granularity` VARCHAR(10) COMMENT '时间粒度' ,
+ `unit` VARCHAR(10) COMMENT '数量单位' ,
`remark` VARCHAR(255) COMMENT '备注' ,
`status` tinyint NOT NULL DEFAULT 0 COMMENT '状态（0正常 1停用）',
`creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '创建者',
@@ -291,7 +295,7 @@
`updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
PRIMARY KEY (id) USING BTREE,
- UNIQUE KEY `uk_item_no` (`item_no`) USING BTREE
+ UNIQUE INDEX `uk_item_no` (`item_no`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT = '指标项表';
CREATE TABLE t_ind_item_atom(
@@ -324,12 +328,13 @@
`expression` varchar(100) DEFAULT NULL COMMENT '计算表达式',
PRIMARY KEY (id) USING BTREE,
UNIQUE KEY `uk_item_id` (`item_id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT = '计算指标';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT = '复合指标';
+
CREATE TABLE `t_ind_item_value` (
`id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'id',
`item_no` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '指标编码',
- `data_time` varchar(36) DEFAULT NULL COMMENT '数据时间',
+ `data_time` varchar(20) DEFAULT NULL COMMENT '数据时间',
`data_value` decimal(24,6) DEFAULT NULL COMMENT '数据值',
PRIMARY KEY (`id`) USING BTREE,
KEY `idx_item_no` (`item_no`) USING BTREE,
--
Gitblit v1.9.3