Merge branch 'jwy' of http://47.100.114.196:3001/jwy/aeon_business_back into zhc

data-center-business-controller/src/main/resources/db/migration/V107__csdj_modify.sql

@@ -0,0 +1,14 @@
+ALTER TABLE `csdj_alarm_history`
+    ADD COLUMN `device_id` VARCHAR(50) NULL COMMENT '设备ID' AFTER `raw_hex`,
+    ADD INDEX `idx_device_id` (`device_id`);
+
+ALTER TABLE `csdj_device_realtime`
+    ADD COLUMN `device_id` VARCHAR(50) NOT NULL DEFAULT '' COMMENT '设备ID' AFTER `terminal_id`,
+    DROP INDEX `terminal_id`,
+    DROP INDEX `idx_terminal_id`,
+    ADD UNIQUE INDEX `uk_terminal_device` (`terminal_id`, `device_id`);
+
+ALTER TABLE `csdj_log`
+    ADD COLUMN `device_id` VARCHAR(50) NULL COMMENT '设备ID' AFTER `terminal_id`,
+    ADD INDEX `idx_terminal_id` (`terminal_id`),
+    ADD INDEX `idx_device_id` (`device_id`);

data-center-business-controller/src/main/resources/db/migration/V108__alert_handle_history_data_type.sql

@@ -0,0 +1 @@
+ALTER TABLE `alert_handle_history` add `data_type` int DEFAULT 0 COMMENT '0-正常手动处理，1-自动恢复，2-初始告警';

data-center-business-controller/src/main/resources/db/migration/V109__csdj_log_device_id_length.sql

@@ -0,0 +1 @@
+ALTER TABLE `csdj_log` MODIFY COLUMN `device_id` VARCHAR(600) DEFAULT NULL COMMENT '设备ID';