diff --git a/BackendWorkerService/Quartz/Jobs/ArchiveElectricMeterDayJob.cs b/BackendWorkerService/Quartz/Jobs/ArchiveElectricMeterDayJob.cs index 54bd8f2..1635c46 100644 --- a/BackendWorkerService/Quartz/Jobs/ArchiveElectricMeterDayJob.cs +++ b/BackendWorkerService/Quartz/Jobs/ArchiveElectricMeterDayJob.cs @@ -1204,8 +1204,11 @@ namespace BackendWorkerService.Quartz.Jobs @repeat_times, @fail_reason, @updated_at - WHERE ROW_COUNT() = 0;"; - // update device set archive_lastDate = @updated_at, archive_lastActionDate = @updated_at where device_number = @device_number; + WHERE ROW_COUNT() = 0; + + update device set archive_lastDate = @start_timestamp, archive_lastActionDate = @updated_at + where device_number = @device_number;"; //archive_lastDate 前次完成時間 ,archive_lastActionDate 本次作業時間 + var mySql = $@"BEGIN TRANSACTION; IF OBJECT_ID(N'dbo.archive_electric_meter_day_{dbDateName}', N'U') is null BEGIN @@ -1302,7 +1305,7 @@ namespace BackendWorkerService.Quartz.Jobs string sql2 = string.Empty; foreach (var kv in dicError) { - sql2 += $@"update device set archive_lastDate = '{kv.Value}' where device_number = '{kv.Key}' , archive_lastActionDate = now();"; + sql2 += $@"update device set archive_lastDate = '{kv.Value}', archive_lastActionDate = now() where device_number = '{kv.Key}' ;"; } if (!string.IsNullOrEmpty(sql2)) { diff --git a/BackendWorkerService/Services/Implement/ProcEletricMeterService.cs b/BackendWorkerService/Services/Implement/ProcEletricMeterService.cs index ee6d9fb..5abd190 100644 --- a/BackendWorkerService/Services/Implement/ProcEletricMeterService.cs +++ b/BackendWorkerService/Services/Implement/ProcEletricMeterService.cs @@ -978,7 +978,7 @@ namespace BackendWorkerService.Services.Implement var startDay = string.Format("{0}T00:00:00.000+08:00", deviceNumberPoint.archive_lastDate.ToString("yyyy-MM-dd").Replace(" ", "T")); var endDay = System.DateTime.Now.ToString("yyyy-MM-dd"); - logger.LogInformation($@"before startDay = {startDay} endDay={endDay}"); // ----------- log + //logger.LogInformation($@"before startDay = {startDay} endDay={endDay}"); // ----------- log #region foreach (DateTime day in EachDay(startDay, endDay)) @@ -1002,7 +1002,7 @@ namespace BackendWorkerService.Services.Implement "; string device_number = deviceNumberPoint.FullDeviceNumberPoint.Replace("$3", ""); - logger.LogInformation($@" {device_number} after sDay = {sDay} eDay={eDay}"); // ----------- log + //logger.LogInformation($@" {device_number} after sDay = {sDay} eDay={eDay}"); // ----------- log var station = backgroundServiceRepository.GetOneAsync($@"select parent_path from import_niagara_item_history where device_building_tag = '{device_number.Split("_")[1].Replace("$3", "")}' and device_system_tag = '{device_number.Split("_")[2]}' and device_name_tag = '{device_number.Split("_")[3]}' @@ -1016,7 +1016,7 @@ namespace BackendWorkerService.Services.Implement archiveRequest.Headers.Add("Authorization", "Basic " + encoded); archiveRequest.PreAuthenticate = true; - logger.LogInformation($@" {device_number} after station = {station}"); // ----------- log + logger.LogInformation($@" {device_number} station = {station} task= {startDay} ~ {endDay} action ={sDay} ~ {eDay}"); // ----------- log byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); using (Stream reqStream = archiveRequest.GetRequestStream()) @@ -1071,7 +1071,7 @@ namespace BackendWorkerService.Services.Implement var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveJsonResult, ref dicError); // <-- 解析內容中 也有判斷是否 max == 0 的收集 if (ArrangeRawDatas != null && ArrangeRawDatas.Count() > 0) { - logger.LogInformation(@$"obix result {deviceNumberPoint.DeviceNumber} day = {day.ToString("yyyy-MM-dd")} ArrangeRawDatas.count() = {ArrangeRawDatas.Count().ToString()}"); + //logger.LogInformation(@$"obix result {deviceNumberPoint.DeviceNumber} day = {day.ToString("yyyy-MM-dd")} ArrangeRawDatas.count() = {ArrangeRawDatas.Count().ToString()}"); resultArchiveDayRawDatas.AddRange(ArrangeRawDatas); } else { @@ -1087,7 +1087,7 @@ namespace BackendWorkerService.Services.Implement #endregion 水電錶作業 save to DB end - // string funish = string.Empty; + string funish = string.Empty; } public void obixData_collect_range(XmlDocument xmlDocument, List DeviceNumberPoints, ObixApiConfig obixApiConfig, string encoded, List> resultArchiveDayRawDatas)