diff --git a/dongjian-center-admin-common/src/main/java/com/dongjian/datacenter/admin/common/Constants.java b/dongjian-center-admin-common/src/main/java/com/dongjian/datacenter/admin/common/Constants.java
index eef0cf6..edcaff3 100644
--- a/dongjian-center-admin-common/src/main/java/com/dongjian/datacenter/admin/common/Constants.java
+++ b/dongjian-center-admin-common/src/main/java/com/dongjian/datacenter/admin/common/Constants.java
@@ -24,6 +24,6 @@ public class Constants {
 	
 	public final static String DATA_TABLE_NAME = "rawData";
 
-	public static final String MOUNT_DIR = "/home/third-admin/mount";
+	public static final String MOUNT_DIR = "/home/aeon-admin/mount";
 
 }
diff --git a/dongjian-center-admin-controller/src/main/resources/sql/init_aurora_third.sql b/dongjian-center-admin-controller/src/main/resources/sql/init_aurora_third.sql
index 4207058..6e71c9b 100644
--- a/dongjian-center-admin-controller/src/main/resources/sql/init_aurora_third.sql
+++ b/dongjian-center-admin-controller/src/main/resources/sql/init_aurora_third.sql
@@ -17,9 +17,346 @@
 SET NAMES utf8;
 SET FOREIGN_KEY_CHECKS = 0;
 
-CREATE DATABASE /*!32312 IF NOT EXISTS*/`third` /*!40100 DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci */ /*!80016 DEFAULT ENCRYPTION='N' */;
+CREATE DATABASE /*!32312 IF NOT EXISTS*/`aeon` /*!40100 DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci */ /*!80016 DEFAULT ENCRYPTION='N' */;
 
-USE `third`;
+USE `aeon`;
+
+-- ----------------------------
+-- Table structure for 1year_rawData
+-- ----------------------------
+DROP TABLE IF EXISTS `1year_rawData`;
+CREATE TABLE `1year_rawData`  (
+  `hashId` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+  `id` int NULL DEFAULT NULL,
+  `methodType` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `deviceId` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `platformIdentifyId` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `deviceTypeName` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `alertLevel` int NULL DEFAULT NULL,
+  `alertLevelName` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `alertContent` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `alertTitle` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `alertTypeName` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `alertCancelTitle` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `alertCancelContent` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `rawData` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `status` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `messageId` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `buildingInfo` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `floorInfo` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `spaceInfo` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `equipmentInfo` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `projectInfo` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `receive_ts` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `ts` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `companyId` int NULL DEFAULT NULL,
+  `company` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `dateKey` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `yearKey` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `monthKey` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `dayKey` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `srcType` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `needTransfer` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `pure_target_id` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `targetId` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `problemReportCategoryId` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `forwardType` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `buildingId` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `buildingCode` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `target_id_mapper` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `updata_interval` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  INDEX `ts`(`ts` ASC) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for alertData
+-- ----------------------------
+DROP TABLE IF EXISTS `alertData`;
+CREATE TABLE `alertData`  (
+  `hashId` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+  `id` int NULL DEFAULT NULL,
+  `methodType` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `deviceId` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `platformIdentifyId` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `deviceTypeName` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `alertLevel` int NULL DEFAULT NULL,
+  `alertLevelName` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `alertContent` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `alertTitle` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `alertTypeName` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `alertCancelTitle` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `alertCancelContent` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `rawData` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `status` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `messageId` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `buildingInfo` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `floorInfo` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `spaceInfo` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `equipmentInfo` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `projectInfo` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `receive_ts` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `ts` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `companyId` int NULL DEFAULT NULL,
+  `company` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `dateKey` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `yearKey` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `monthKey` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `dayKey` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `srcType` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `needTransfer` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `pure_target_id` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `targetId` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `problemReportCategoryId` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `forwardType` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `buildingId` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `buildingCode` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `target_id_mapper` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `updata_interval` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  PRIMARY KEY (`hashId`) USING BTREE,
+  INDEX `receive_ts`(`receive_ts` ASC) USING BTREE,
+  INDEX `pure_target_id`(`pure_target_id` ASC) USING BTREE,
+  INDEX `deviceId`(`deviceId` ASC) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for dashboard_aggregate_accumulate_30min
+-- ----------------------------
+DROP TABLE IF EXISTS `dashboard_aggregate_accumulate_30min`;
+CREATE TABLE `dashboard_aggregate_accumulate_30min`  (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `device_id` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+  `aggregate_value` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '30分钟聚合值',
+  `date_year` int NULL DEFAULT NULL,
+  `date_month` int NULL DEFAULT NULL,
+  `date_day` int NULL DEFAULT NULL,
+  `date_hour` int NULL DEFAULT NULL,
+  `date_minute` int NULL DEFAULT NULL,
+  `time_start` bigint NULL DEFAULT NULL,
+  `time_end` bigint NULL DEFAULT NULL,
+  `aggregated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`) USING BTREE,
+  INDEX `idx_device_time`(`device_id` ASC, `date_year` ASC, `date_month` ASC, `date_day` ASC, `date_hour` ASC, `date_minute` ASC) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '30分钟聚合表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for dashboard_aggregate_accumulate_day
+-- ----------------------------
+DROP TABLE IF EXISTS `dashboard_aggregate_accumulate_day`;
+CREATE TABLE `dashboard_aggregate_accumulate_day`  (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `device_id` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+  `aggregate_value` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '日聚合值',
+  `date_year` int NULL DEFAULT NULL,
+  `date_month` int NULL DEFAULT NULL,
+  `date_day` int NULL DEFAULT NULL,
+  `time_start` bigint NULL DEFAULT NULL,
+  `time_end` bigint NULL DEFAULT NULL,
+  `aggregated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`) USING BTREE,
+  INDEX `idx_device_time`(`device_id` ASC, `date_year` ASC, `date_month` ASC, `date_day` ASC) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '日聚合表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for dashboard_aggregate_accumulate_hour
+-- ----------------------------
+DROP TABLE IF EXISTS `dashboard_aggregate_accumulate_hour`;
+CREATE TABLE `dashboard_aggregate_accumulate_hour`  (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `device_id` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+  `aggregate_value` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '1小时聚合值',
+  `date_year` int NULL DEFAULT NULL,
+  `date_month` int NULL DEFAULT NULL,
+  `date_day` int NULL DEFAULT NULL,
+  `date_hour` int NULL DEFAULT NULL,
+  `time_start` bigint NULL DEFAULT NULL,
+  `time_end` bigint NULL DEFAULT NULL,
+  `aggregated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`) USING BTREE,
+  INDEX `idx_device_time`(`device_id` ASC, `date_year` ASC, `date_month` ASC, `date_day` ASC, `date_hour` ASC) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '小时聚合表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for dashboard_aggregate_accumulate_month
+-- ----------------------------
+DROP TABLE IF EXISTS `dashboard_aggregate_accumulate_month`;
+CREATE TABLE `dashboard_aggregate_accumulate_month`  (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `device_id` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+  `aggregate_value` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '月聚合值',
+  `date_year` int NULL DEFAULT NULL,
+  `date_month` int NULL DEFAULT NULL,
+  `time_start` bigint NULL DEFAULT NULL,
+  `time_end` bigint NULL DEFAULT NULL,
+  `aggregated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`) USING BTREE,
+  INDEX `idx_device_time`(`device_id` ASC, `date_year` ASC, `date_month` ASC) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '月聚合表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for dashboard_aggregate_accumulate_year
+-- ----------------------------
+DROP TABLE IF EXISTS `dashboard_aggregate_accumulate_year`;
+CREATE TABLE `dashboard_aggregate_accumulate_year`  (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `device_id` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+  `aggregate_value` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '年聚合值',
+  `date_year` int NULL DEFAULT NULL,
+  `time_start` bigint NULL DEFAULT NULL,
+  `time_end` bigint NULL DEFAULT NULL,
+  `aggregated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`) USING BTREE,
+  INDEX `idx_device_time`(`device_id` ASC, `date_year` ASC) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '年聚合表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for dashboard_aggregate_measure_day
+-- ----------------------------
+DROP TABLE IF EXISTS `dashboard_aggregate_measure_day`;
+CREATE TABLE `dashboard_aggregate_measure_day`  (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `device_id` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '设备ID',
+  `average_value` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '日平均值',
+  `max_value` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `min_value` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `date_year` int NULL DEFAULT NULL,
+  `date_month` int NULL DEFAULT NULL,
+  `date_day` int NULL DEFAULT NULL,
+  `time_start` bigint NULL DEFAULT NULL,
+  `time_end` bigint NULL DEFAULT NULL,
+  `aggregated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '聚合时间',
+  PRIMARY KEY (`id`) USING BTREE,
+  INDEX `idx_device_time`(`device_id` ASC, `date_year` ASC, `date_month` ASC, `date_day` ASC) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '日聚合表（测量值）' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for dashboard_aggregate_measure_hour
+-- ----------------------------
+DROP TABLE IF EXISTS `dashboard_aggregate_measure_hour`;
+CREATE TABLE `dashboard_aggregate_measure_hour`  (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `device_id` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '设备ID',
+  `average_value` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '小时平均值',
+  `max_value` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `min_value` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `date_year` int NULL DEFAULT NULL,
+  `date_month` int NULL DEFAULT NULL,
+  `date_day` int NULL DEFAULT NULL,
+  `date_hour` int NULL DEFAULT NULL,
+  `time_start` bigint NULL DEFAULT NULL,
+  `time_end` bigint NULL DEFAULT NULL,
+  `aggregated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '聚合时间',
+  PRIMARY KEY (`id`) USING BTREE,
+  INDEX `idx_device_time`(`device_id` ASC, `date_year` ASC, `date_month` ASC, `date_day` ASC, `date_hour` ASC) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '小时聚合表（测量值）' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for dashboard_aggregate_measure_month
+-- ----------------------------
+DROP TABLE IF EXISTS `dashboard_aggregate_measure_month`;
+CREATE TABLE `dashboard_aggregate_measure_month`  (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `device_id` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '设备ID',
+  `average_value` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '月平均值',
+  `max_value` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `min_value` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `date_year` int NULL DEFAULT NULL,
+  `date_month` int NULL DEFAULT NULL,
+  `time_start` bigint NULL DEFAULT NULL,
+  `time_end` bigint NULL DEFAULT NULL,
+  `aggregated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '聚合时间',
+  PRIMARY KEY (`id`) USING BTREE,
+  INDEX `idx_device_time`(`device_id` ASC, `date_year` ASC, `date_month` ASC) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '月聚合表（测量值）' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for dashboard_aggregate_measure_year
+-- ----------------------------
+DROP TABLE IF EXISTS `dashboard_aggregate_measure_year`;
+CREATE TABLE `dashboard_aggregate_measure_year`  (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `device_id` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '设备ID',
+  `average_value` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '年平均值',
+  `max_value` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `min_value` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `date_year` int NULL DEFAULT NULL,
+  `time_start` bigint NULL DEFAULT NULL,
+  `time_end` bigint NULL DEFAULT NULL,
+  `aggregated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '聚合时间',
+  PRIMARY KEY (`id`) USING BTREE,
+  INDEX `idx_device_time`(`device_id` ASC, `date_year` ASC) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '年聚合表（测量值）' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for dashboard_realtime_accumulate_day
+-- ----------------------------
+DROP TABLE IF EXISTS `dashboard_realtime_accumulate_day`;
+CREATE TABLE `dashboard_realtime_accumulate_day`  (
+  `device_id` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '设备ID',
+  `date_year` int NULL DEFAULT NULL COMMENT '年份',
+  `date_month` int NULL DEFAULT NULL COMMENT '月份',
+  `date_day` int NULL DEFAULT NULL COMMENT '日期',
+  `upload_value` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '上传值',
+  `increment_today` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '今天的增量',
+  `upload_at` bigint NULL DEFAULT NULL COMMENT '上传时间（时间戳）',
+  UNIQUE INDEX `uniq_device_date`(`device_id` ASC, `date_year` ASC, `date_month` ASC, `date_day` ASC) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '设备每日累计数据表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for dashboard_realtime_measure
+-- ----------------------------
+DROP TABLE IF EXISTS `dashboard_realtime_measure`;
+CREATE TABLE `dashboard_realtime_measure`  (
+  `device_id` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+  `date_year` int NULL DEFAULT NULL,
+  `date_month` int NULL DEFAULT NULL,
+  `date_day` int NULL DEFAULT NULL,
+  `date_hour` int NULL DEFAULT NULL,
+  `date_minute` int NULL DEFAULT NULL,
+  `date_second` int NULL DEFAULT NULL,
+  `upload_value` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `min_value` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `max_value` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `upload_at` bigint NULL DEFAULT NULL,
+  PRIMARY KEY (`device_id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for dashboard_record_accumulate
+-- ----------------------------
+DROP TABLE IF EXISTS `dashboard_record_accumulate`;
+CREATE TABLE `dashboard_record_accumulate`  (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `device_id` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `date_year` int NULL DEFAULT NULL,
+  `date_month` int NULL DEFAULT NULL,
+  `date_day` int NULL DEFAULT NULL,
+  `date_hour` int NULL DEFAULT NULL,
+  `date_minute` int NULL DEFAULT NULL,
+  `date_second` int NULL DEFAULT NULL,
+  `upload_value` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `increment_today` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '今天的增量',
+  `increment_minute` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '1分钟的增量',
+  `upload_at` bigint NULL DEFAULT NULL,
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for dashboard_record_measure
+-- ----------------------------
+DROP TABLE IF EXISTS `dashboard_record_measure`;
+CREATE TABLE `dashboard_record_measure`  (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `device_id` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+  `date_year` int NULL DEFAULT NULL,
+  `date_month` int NULL DEFAULT NULL,
+  `date_day` int NULL DEFAULT NULL,
+  `date_hour` int NULL DEFAULT NULL,
+  `date_minute` int NULL DEFAULT NULL,
+  `date_second` int NULL DEFAULT NULL,
+  `upload_value` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `upload_at` bigint NULL DEFAULT NULL,
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for rawData
@@ -36,6 +373,51 @@ CREATE TABLE `rawData`  (
   `alertLevelName` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `alertContent` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `alertTitle` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `alertCancelTitle` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `alertCancelContent` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `rawData` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `status` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `messageId` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `buildingInfo` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `floorInfo` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `spaceInfo` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `equipmentInfo` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `projectInfo` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `receive_ts` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `ts` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `company` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `dateKey` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `yearKey` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `monthKey` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `dayKey` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `srcType` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `needTransfer` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `pure_target_id` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `targetId` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `problemReportCategoryId` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `forwardType` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `buildingId` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `buildingCode` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `target_id_mapper` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `updata_interval` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  PRIMARY KEY (`hashId`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for rawData_realtime
+-- ----------------------------
+DROP TABLE IF EXISTS `rawData_realtime`;
+CREATE TABLE `rawData_realtime`  (
+  `hashId` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+  `id` int NULL DEFAULT NULL,
+  `methodType` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `deviceId` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+  `platformIdentifyId` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `deviceTypeName` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `alertLevel` int NULL DEFAULT NULL,
+  `alertLevelName` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `alertContent` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `alertTitle` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `alertTypeName` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `alertCancelTitle` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `alertCancelContent` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
@@ -65,55 +447,59 @@ CREATE TABLE `rawData`  (
   `buildingCode` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `target_id_mapper` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `updata_interval` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  PRIMARY KEY (`hashId`) USING BTREE
+  PRIMARY KEY (`deviceId`) USING BTREE,
+  INDEX `ts`(`ts` ASC) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
--- Table structure for rawData
+-- Table structure for rawData_single_id
 -- ----------------------------
-DROP TABLE IF EXISTS `1year_rawData`;
-CREATE TABLE `1year_rawData`  (
-	  `hashId` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
-		`id` int NULL DEFAULT NULL,
-		`methodType` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-		`deviceId` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-		`platformIdentifyId` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-		`deviceTypeName` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-		`alertLevel` int NULL DEFAULT NULL,
-        `alertLevelName` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-		`alertContent` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-		`alertTitle` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-        `alertTypeName` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-		`alertCancelTitle` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-		`alertCancelContent` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-		`rawData` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-		`status` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-		`messageId` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-		`buildingInfo` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-		`floorInfo` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-		`spaceInfo` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-		`equipmentInfo` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-		`projectInfo` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-		`receive_ts` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-		`ts` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-        `companyId` int NULL DEFAULT NULL,
-		`company` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-		`dateKey` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-		`yearKey` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-		`monthKey` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-		`dayKey` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-		`srcType` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-		`needTransfer` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-		`pure_target_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-		`targetId` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-		`problemReportCategoryId` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-		`forwardType` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-		`buildingId` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-		`buildingCode` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-		`target_id_mapper` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-		`updata_interval` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-   		KEY `ts` (`ts`) USING BTREE
-	) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+DROP TABLE IF EXISTS `rawData_single_id`;
+CREATE TABLE `rawData_single_id`  (
+  `hashId` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+  `id` int NULL DEFAULT NULL,
+  `methodType` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `deviceId` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `platformIdentifyId` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `deviceTypeName` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `alertLevel` int NULL DEFAULT NULL,
+  `alertLevelName` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `alertContent` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `alertTitle` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `alertTypeName` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `alertCancelTitle` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `alertCancelContent` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `rawData` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `status` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `messageId` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `buildingInfo` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `floorInfo` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `spaceInfo` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `equipmentInfo` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `projectInfo` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `receive_ts` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `ts` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `companyId` int NULL DEFAULT NULL,
+  `company` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `dateKey` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `yearKey` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `monthKey` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `dayKey` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `srcType` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `needTransfer` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `pure_target_id` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `targetId` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `problemReportCategoryId` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `forwardType` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `buildingId` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `buildingCode` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `target_id_mapper` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  `updata_interval` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+  PRIMARY KEY (`hashId`) USING BTREE,
+  INDEX `receive_ts`(`receive_ts` ASC) USING BTREE,
+  INDEX `pure_target_id`(`pure_target_id` ASC) USING BTREE,
+  INDEX `deviceId`(`deviceId` ASC) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for raw_data_10min
@@ -295,153 +681,4 @@ CREATE TABLE `raw_data_30min`  (
   INDEX `idx_q3_data_milli_ts`(`q3_data_milli_ts` ASC) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
 
-
--- ----------------------------
--- Table structure for rawData_single_id
--- ----------------------------
-DROP TABLE IF EXISTS `rawData_single_id`;
-CREATE TABLE `rawData_single_id`  (
-  `hashId` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
-  `id` int NULL DEFAULT NULL,
-  `methodType` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `deviceId` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `platformIdentifyId` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `deviceTypeName` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `alertLevel` int NULL DEFAULT NULL,
-  `alertLevelName` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `alertContent` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `alertTitle` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `alertTypeName` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `alertCancelTitle` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `alertCancelContent` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `rawData` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `status` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `messageId` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `buildingInfo` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `floorInfo` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `spaceInfo` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `equipmentInfo` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `projectInfo` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `receive_ts` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `ts` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `companyId` int NULL DEFAULT NULL,
-  `company` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `dateKey` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `yearKey` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `monthKey` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `dayKey` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `srcType` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `needTransfer` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `pure_target_id` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `targetId` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `problemReportCategoryId` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `forwardType` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `buildingId` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `buildingCode` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `target_id_mapper` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `updata_interval` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  PRIMARY KEY (`hashId`) USING BTREE,
-  INDEX `receive_ts`(`receive_ts` ASC) USING BTREE,
-  INDEX `pure_target_id`(`pure_target_id` ASC) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
-
-
-/*Table structure for table `rawData_realtime` */
-
-DROP TABLE IF EXISTS `rawData_realtime`;
-
-CREATE TABLE `rawData_realtime` (
-  `hashId` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
-  `id` int DEFAULT NULL,
-  `methodType` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
-  `deviceId` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
-  `platformIdentifyId` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
-  `deviceTypeName` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
-  `alertLevel` int DEFAULT NULL,
-  `alertLevelName` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
-  `alertContent` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
-  `alertTitle` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
-  `alertTypeName` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
-  `alertCancelTitle` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
-  `alertCancelContent` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
-  `rawData` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
-  `status` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
-  `messageId` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
-  `buildingInfo` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
-  `floorInfo` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
-  `spaceInfo` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
-  `equipmentInfo` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
-  `projectInfo` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
-  `receive_ts` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
-  `ts` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
-  `companyId` int DEFAULT NULL,
-  `company` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
-  `dateKey` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
-  `yearKey` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
-  `monthKey` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
-  `dayKey` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
-  `srcType` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
-  `needTransfer` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
-  `pure_target_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
-  `targetId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
-  `problemReportCategoryId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
-  `forwardType` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
-  `buildingId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
-  `buildingCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
-  `target_id_mapper` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
-  `updata_interval` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
-  PRIMARY KEY (`deviceId`),
-  KEY `ts` (`ts`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC;
-
--- ----------------------------
--- Table structure for alertData
--- ----------------------------
-DROP TABLE IF EXISTS `alertData`;
-CREATE TABLE `alertData`  (
-  `hashId` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
-  `id` int NULL DEFAULT NULL,
-  `methodType` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `deviceId` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `platformIdentifyId` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `deviceTypeName` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `alertLevel` int NULL DEFAULT NULL,
-  `alertLevelName` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `alertContent` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `alertTitle` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `alertTypeName` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `alertCancelTitle` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `alertCancelContent` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `rawData` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `status` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `messageId` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `buildingInfo` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `floorInfo` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `spaceInfo` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `equipmentInfo` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `projectInfo` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `receive_ts` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `ts` varchar(45) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `companyId` int NULL DEFAULT NULL,
-  `company` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `dateKey` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `yearKey` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `monthKey` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `dayKey` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `srcType` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `needTransfer` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `pure_target_id` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `targetId` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `problemReportCategoryId` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `forwardType` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `buildingId` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `buildingCode` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `target_id_mapper` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `updata_interval` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  PRIMARY KEY (`hashId`) USING BTREE,
-  INDEX `receive_ts`(`receive_ts` ASC) USING BTREE,
-  INDEX `pure_target_id`(`pure_target_id` ASC) USING BTREE,
-  INDEX `deviceId`(`deviceId` ASC) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
-
 SET FOREIGN_KEY_CHECKS = 1;
diff --git a/dongjian-center-admin-service/src/main/java/com/dongjian/datacenter/admin/service/common/CommonOpt.java b/dongjian-center-admin-service/src/main/java/com/dongjian/datacenter/admin/service/common/CommonOpt.java
index 847cca8..b430175 100644
--- a/dongjian-center-admin-service/src/main/java/com/dongjian/datacenter/admin/service/common/CommonOpt.java
+++ b/dongjian-center-admin-service/src/main/java/com/dongjian/datacenter/admin/service/common/CommonOpt.java
@@ -488,10 +488,10 @@ public class CommonOpt {
             	/****初始化aurora里面的表****/
             	try {
             		String outPath = userDir +"/tmp/init_aurora_third_" + companyId + ".sql";
-        			FileReplace.replaceResourceFileStr("/sql/init_aurora_third.sql", outPath, "third", "third");
-        			logger.info("init aurora third sql脚本生成成功，路径为:{}", outPath);
+        			FileReplace.replaceResourceFileStr("/sql/init_aurora_third.sql", outPath, "aeon", "aeon");
+        			logger.info("init aurora aeon sql脚本生成成功，路径为:{}", outPath);
         			
-        			String dbUrl = MessageFormat.format(AURORA_URL_FORMAT.replace("third", "information_schema"), clusterEndpoit);
+        			String dbUrl = MessageFormat.format(AURORA_URL_FORMAT.replace("aeon", "information_schema"), clusterEndpoit);
         			logger.info("连接aurora进行创建表:{}", dbUrl);
         			Connection connectionSql = DriverManager.getConnection(dbUrl, "techsor", "Abc#123456xyz");
         	        ScriptRunner runner = new ScriptRunner(connectionSql);
@@ -499,7 +499,7 @@ public class CommonOpt {
         	        runner.setLogWriter(null);
         	        runner.runScript(new InputStreamReader(new FileInputStream(outPath), StandardCharsets.UTF_8));
         	        
-        	        logger.info("init aurora third sql脚本执行完毕, 企业id为{}, 地址为{}", companyId, clusterEndpoit);
+        	        logger.info("init aurora aeon sql脚本执行完毕, 企业id为{}, 地址为{}", companyId, clusterEndpoit);
         	        
         	        //ScriptRunner或者Statement遇到分号;会当作一个独立的sql，因此不适合用ScriptRunner或者Statement读取文件的方式去执行存储过程
         	        List<String> sqllList = generateSql.getSqlList();
@@ -513,7 +513,7 @@ public class CommonOpt {
     	        	connectionSql.close();
 				} catch (Exception e) {
 					updateCompanyAuroraFlag(companyId, 3);
-					logger.error("init aurora third sql脚本执行失败, 企业id为{}, 地址为{}", companyId, clusterEndpoit);
+					logger.error("init aurora aeon sql脚本执行失败, 企业id为{}, 地址为{}", companyId, clusterEndpoit);
 					logger.error(e.getMessage());
 				}
 			} else {
diff --git a/dongjian-center-admin-service/src/main/java/com/dongjian/datacenter/admin/service/common/GenerateSql.java b/dongjian-center-admin-service/src/main/java/com/dongjian/datacenter/admin/service/common/GenerateSql.java
index 8cc409b..b6983e0 100644
--- a/dongjian-center-admin-service/src/main/java/com/dongjian/datacenter/admin/service/common/GenerateSql.java
+++ b/dongjian-center-admin-service/src/main/java/com/dongjian/datacenter/admin/service/common/GenerateSql.java
@@ -21,7 +21,7 @@ public class GenerateSql {
 	
 	public List<String> getSqlList() throws IOException {
         List<String> sqlList = new ArrayList<>();
-        sqlList.add("use `third`;");
+        sqlList.add("use `aeon`;");
         
         sqlList.add("DROP EVENT IF EXISTS `e_service_cleardata`;");
         
@@ -139,7 +139,7 @@ public class GenerateSql {
         		+ "    DECLARE cur CURSOR FOR   \r\n"
         		+ "        SELECT table_name   \r\n"
         		+ "        FROM information_schema.tables   \r\n"
-        		+ "        WHERE table_schema = 'third' \r\n"
+        		+ "        WHERE table_schema = 'aeon' \r\n"
         		+ "        AND (\r\n"
         		+ "            -- 删除 rawData_ 开头 7 天前的表\r\n"
         		+ "            (table_name LIKE 'rawData_%'   \r\n"