diff --git a/BackendWorkerService/Program.cs b/BackendWorkerService/Program.cs index f2ea9b1..ab33de4 100644 --- a/BackendWorkerService/Program.cs +++ b/BackendWorkerService/Program.cs @@ -121,7 +121,7 @@ namespace BackendWorkerService //); //#endregion - #region 停車場管理(設定每 5秒 執行一次) + #region 停車場管理(設定每 5秒 執行一次)(巨蛋棟要其他不用) services.AddSingleton(); services.AddSingleton( new JobSchedule(jobType: typeof(ParkingJob), cronExpression: configuration.GetValue("BackgroundServiceCron:ParkingJob")) @@ -142,7 +142,7 @@ namespace BackendWorkerService ); #endregion - #region 定時取得氣象API + #region 定時取得氣象API(巨蛋棟要其他不用) services.AddSingleton(); services.AddSingleton( new JobSchedule(jobType: typeof(Quartz.Jobs.WeatherAPIJob), cronExpression: configuration.GetValue("BackgroundServiceCron:WeatherAPIJob")) diff --git a/BackendWorkerService/Quartz/Jobs/ArchiveElectricMeterDayJob.cs b/BackendWorkerService/Quartz/Jobs/ArchiveElectricMeterDayJob.cs index d8b4ea6..b8a5576 100644 --- a/BackendWorkerService/Quartz/Jobs/ArchiveElectricMeterDayJob.cs +++ b/BackendWorkerService/Quartz/Jobs/ArchiveElectricMeterDayJob.cs @@ -355,8 +355,8 @@ namespace BackendWorkerService.Quartz.Jobs row.TryGetValue("@start_timestamp", out var yyyymmData); dbDateName = System.DateTime.Parse(yyyymmData.ToString()).ToString("yyyyMM"); var sql = $@"CREATE TABLE IF NOT EXISTS `archive_electric_water_meter_day_{dbDateName}` ( - `device_number` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL, - `point` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL, + `device_number` varchar(50) NOT NULL, + `point` varchar(20) NOT NULL, `start_timestamp` datetime(6) NOT NULL, `end_timestamp` datetime(6) NULL DEFAULT NULL, `count_rawdata` int(11) NULL DEFAULT NULL, @@ -367,11 +367,11 @@ namespace BackendWorkerService.Quartz.Jobs `sum_rawdata` decimal(15, 3) NULL DEFAULT NULL, `is_complete` tinyint(3) UNSIGNED NULL DEFAULT NULL COMMENT '臬血嚗0:芸 1:摰', `repeat_times` int(11) NULL DEFAULT 0 COMMENT '銴甈⊥', - `fail_reason` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '憭望', + `fail_reason` varchar(4000) NULL DEFAULT NULL COMMENT '憭望', `created_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP, `updated_at` datetime(6) NULL DEFAULT NULL, PRIMARY KEY (`device_number`, `point`, `start_timestamp`) USING BTREE - ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC; + ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin ROW_FORMAT = DYNAMIC; SET FOREIGN_KEY_CHECKS = 1; UPDATE archive_electric_water_meter_day_{dbDateName} SET @@ -524,8 +524,8 @@ namespace BackendWorkerService.Quartz.Jobs dbDateName = System.DateTime.Parse(yyyymmData.ToString()).ToString("yyyyMM"); var sql = $@" CREATE TABLE IF NOT EXISTS `archive_electric_water_meter_day_{dbDateName}` ( - `device_number` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL, - `point` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL, + `device_number` varchar(50) NOT NULL, + `point` varchar(20) NOT NULL, `start_timestamp` datetime(6) NOT NULL, `end_timestamp` datetime(6) NULL DEFAULT NULL, `count_rawdata` int(11) NULL DEFAULT NULL, @@ -536,11 +536,11 @@ namespace BackendWorkerService.Quartz.Jobs `sum_rawdata` decimal(15, 3) NULL DEFAULT NULL, `is_complete` tinyint(3) UNSIGNED NULL DEFAULT NULL COMMENT '臬血嚗0:芸 1:摰', `repeat_times` int(11) NULL DEFAULT 0 COMMENT '銴甈⊥', - `fail_reason` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '憭望', + `fail_reason` varchar(4000) NULL DEFAULT NULL COMMENT '憭望', `created_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP, `updated_at` datetime(6) NULL DEFAULT NULL, PRIMARY KEY (`device_number`, `point`, `start_timestamp`) USING BTREE - ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC; + ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin ROW_FORMAT = DYNAMIC; UPDATE archive_electric_water_meter_day_{dbDateName} SET count_rawdata = @count_rawdata, @@ -1357,8 +1357,8 @@ namespace BackendWorkerService.Quartz.Jobs { var sql = $@" CREATE TABLE IF NOT EXISTS `archive_electric_water_meter_month` ( - `device_number` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL, - `point` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL, + `device_number` varchar(50) NOT NULL, + `point` varchar(20) NOT NULL, `start_timestamp` datetime(6) NOT NULL, `end_timestamp` datetime(6) NULL DEFAULT NULL, `count_rawdata` int(11) NULL DEFAULT NULL, @@ -1369,11 +1369,11 @@ namespace BackendWorkerService.Quartz.Jobs `sum_rawdata` decimal(15, 3) NULL DEFAULT NULL, `is_complete` tinyint(3) UNSIGNED NULL DEFAULT NULL COMMENT '臬血嚗0:芸 1:摰', `repeat_times` int(11) NULL DEFAULT 0 COMMENT '銴甈⊥', - `fail_reason` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '憭望', + `fail_reason` varchar(4000) NULL DEFAULT NULL COMMENT '憭望', `created_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP, `updated_at` datetime(6) NULL DEFAULT NULL, PRIMARY KEY (`device_number`, `point`, `start_timestamp`) USING BTREE - ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC; + ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin ROW_FORMAT = DYNAMIC; SET FOREIGN_KEY_CHECKS = 1; UPDATE archive_electric_water_meter_month SET @@ -1523,8 +1523,8 @@ namespace BackendWorkerService.Quartz.Jobs { var sql = $@" CREATE TABLE IF NOT EXISTS `archive_electric_water_meter_month` ( - `device_number` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL, - `point` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL, + `device_number` varchar(50) NOT NULL, + `point` varchar(20) NOT NULL, `start_timestamp` datetime(6) NOT NULL, `end_timestamp` datetime(6) NULL DEFAULT NULL, `count_rawdata` int(11) NULL DEFAULT NULL, @@ -1535,11 +1535,11 @@ namespace BackendWorkerService.Quartz.Jobs `sum_rawdata` decimal(15, 3) NULL DEFAULT NULL, `is_complete` tinyint(3) UNSIGNED NULL DEFAULT NULL COMMENT '臬血嚗0:芸 1:摰', `repeat_times` int(11) NULL DEFAULT 0 COMMENT '銴甈⊥', - `fail_reason` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '憭望', + `fail_reason` varchar(4000) NULL DEFAULT NULL COMMENT '憭望', `created_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP, `updated_at` datetime(6) NULL DEFAULT NULL, PRIMARY KEY (`device_number`, `point`, `start_timestamp`) USING BTREE - ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC; + ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin ROW_FORMAT = DYNAMIC; SET FOREIGN_KEY_CHECKS = 1; UPDATE archive_electric_water_meter_month SET diff --git a/Repository/BackendRepository/Implement/NiagaraDataSynchronizeRepository.cs b/Repository/BackendRepository/Implement/NiagaraDataSynchronizeRepository.cs index ce4d1aa..cabd432 100644 --- a/Repository/BackendRepository/Implement/NiagaraDataSynchronizeRepository.cs +++ b/Repository/BackendRepository/Implement/NiagaraDataSynchronizeRepository.cs @@ -67,7 +67,7 @@ namespace Repository.BackendRepository.Implement `device_full_name` varchar(100) DEFAULT NULL, `is_used` smallint(1) DEFAULT 0, PRIMARY KEY (`id`) - ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;"; + ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;"; using (TransactionScope scope = new TransactionScope(TransactionScopeAsyncFlowOption.Enabled)) { await conn.ExecuteAsync(sql); @@ -263,7 +263,7 @@ namespace Repository.BackendRepository.Implement `parent_path` varchar(50) DEFAULT NULL, `full_name` varchar(50) DEFAULT NULL, PRIMARY KEY (`id`) - ) ENGINE=InnoDB AUTO_INCREMENT=59 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;"; + ) ENGINE=InnoDB AUTO_INCREMENT=59 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;"; using (TransactionScope scope = new TransactionScope(TransactionScopeAsyncFlowOption.Enabled)) { await conn.ExecuteAsync(sql); @@ -1802,24 +1802,24 @@ SET FOREIGN_KEY_CHECKS = 0; DROP TABLE IF EXISTS `import_niagara_item_history`; CREATE TABLE `import_niagara_item_history` ( `id` int(11) NOT NULL AUTO_INCREMENT, -`device_number` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '摰 TagName 閮剖蝺刻', -`device_area_tag` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL, -`device_building_tag` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL, -`device_system_tag` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL, -`device_name_tag` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL, -`device_floor_tag` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL, -`device_master_tag` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL, -`device_last_name_tag` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL, -`device_serial_tag` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL, -`device_point_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL, -`parent_path` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL, +`device_number` varchar(50) NULL DEFAULT NULL COMMENT '摰 TagName 閮剖蝺刻', +`device_area_tag` varchar(50) NULL DEFAULT NULL, +`device_building_tag` varchar(50) NULL DEFAULT NULL, +`device_system_tag` varchar(50) NULL DEFAULT NULL, +`device_name_tag` varchar(50) NULL DEFAULT NULL, +`device_floor_tag` varchar(50) NULL DEFAULT NULL, +`device_master_tag` varchar(50) NULL DEFAULT NULL, +`device_last_name_tag` varchar(50) NULL DEFAULT NULL, +`device_serial_tag` varchar(50) NULL DEFAULT NULL, +`device_point_name` varchar(50) NULL DEFAULT NULL, +`parent_path` varchar(50) NULL DEFAULT NULL, `is_history` bit(1) NULL DEFAULT b'0', -`full_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL, -`check_status` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL, +`full_name` varchar(50) NULL DEFAULT NULL, +`check_status` varchar(50) NULL DEFAULT NULL, `created_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`) USING BTREE, KEY `idx_device_number` (`device_number`) -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin ROW_FORMAT = Dynamic; SET FOREIGN_KEY_CHECKS = 1;"; using (TransactionScope scope = new TransactionScope(TransactionScopeAsyncFlowOption.Enabled)) @@ -1981,7 +1981,7 @@ SET FOREIGN_KEY_CHECKS = 1;"; `device_number` varchar(50) DEFAULT NULL, `device_point_name` varchar(50) DEFAULT NULL, PRIMARY KEY (`id`) - ) ENGINE=InnoDB AUTO_INCREMENT=59 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;"; + ) ENGINE=InnoDB AUTO_INCREMENT=59 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;"; using (TransactionScope scope = new TransactionScope(TransactionScopeAsyncFlowOption.Enabled)) { await conn.ExecuteAsync(sql);