From 0571ebd7ac99115f346740e3f52725123b2f5d3a Mon Sep 17 00:00:00 2001 From: dev02 Date: Tue, 6 Jun 2023 16:43:46 +0800 Subject: [PATCH 01/21] =?UTF-8?q?[=E5=BE=8C=E7=AB=AF]=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8E=92=E7=A8=8B=E9=83=A8=E5=88=86=E6=9B=B4=E6=94=B9=E5=9B=9E?= =?UTF-8?q?=E5=8E=9F=E5=85=88=E5=B0=88=E6=A1=88,=20=E4=BD=BF=E7=94=A8windo?= =?UTF-8?q?ws=20service=E5=9F=B7=E8=A1=8C=20[=E5=89=8D=E7=AB=AF]=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9alert.html=20=E5=BB=BA=E7=AB=8B=E7=B6=AD?= =?UTF-8?q?=E4=BF=AE=E5=96=AE=E9=8C=AF=E8=AA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Backend/Quartz/JobSchedule.cs | 198 --- .../Quartz/Jobs/ArchiveElectricMeterDayJob.cs | 1461 ----------------- .../Jobs/ArchiveElectricMeterHourJob.cs | 335 ---- Backend/Quartz/Jobs/DataDeliveryJob.cs | 269 --- .../Jobs/ExecutionBackgroundServicePlanJob.cs | 113 -- Backend/Quartz/Jobs/MessageNotificationJob.cs | 163 -- Backend/Quartz/Jobs/ParkingJob.cs | 324 ---- .../Quartz/Jobs/RegularUpdateDBTableJob.cs | 77 - Backend/Quartz/Jobs/WeatherAPIJob.cs | 559 ------- Backend/Quartz/QuartzHostedService.cs | 69 - Backend/Quartz/SingletonJobFactory.cs | 26 - .../Implement/ProcEletricMeterService.cs | 935 ----------- Backend/Services/Implement/Quicktype.cs | 640 -------- Backend/Services/Implement/RainApi.cs | 213 --- .../Services/Implement/SendEmailService.cs | 81 - .../Implement/SendLineNotifyService.cs | 54 - Backend/Services/Implement/SendSMSService.cs | 84 - Backend/Services/Implement/TyphoonApi.cs | 213 --- .../Services/Interface/ISendEmailService.cs | 12 - .../Interface/ISendLineNotifyService.cs | 11 - Backend/Services/Interface/ISendSMSService.cs | 11 - Backend/Startup.cs | 22 - Backend/appsettings.Development.json | 14 +- Backend/appsettings.json | 3 +- BackendWorkerService/Program.cs | 43 +- .../Quartz/Jobs/ArchiveElectricMeterDayJob.cs | 6 +- BackendWorkerService/Worker.cs | 3 + .../appsettings.Development.json | 29 +- BackendWorkerService/appsettings.json | 28 +- BackendWorkerService/root/PowerfulRain.xml | 536 ++---- Frontend/_alert.html | 17 +- 31 files changed, 155 insertions(+), 6394 deletions(-) delete mode 100644 Backend/Quartz/JobSchedule.cs delete mode 100644 Backend/Quartz/Jobs/ArchiveElectricMeterDayJob.cs delete mode 100644 Backend/Quartz/Jobs/ArchiveElectricMeterHourJob.cs delete mode 100644 Backend/Quartz/Jobs/DataDeliveryJob.cs delete mode 100644 Backend/Quartz/Jobs/ExecutionBackgroundServicePlanJob.cs delete mode 100644 Backend/Quartz/Jobs/MessageNotificationJob.cs delete mode 100644 Backend/Quartz/Jobs/ParkingJob.cs delete mode 100644 Backend/Quartz/Jobs/RegularUpdateDBTableJob.cs delete mode 100644 Backend/Quartz/Jobs/WeatherAPIJob.cs delete mode 100644 Backend/Quartz/QuartzHostedService.cs delete mode 100644 Backend/Quartz/SingletonJobFactory.cs delete mode 100644 Backend/Services/Implement/ProcEletricMeterService.cs delete mode 100644 Backend/Services/Implement/Quicktype.cs delete mode 100644 Backend/Services/Implement/RainApi.cs delete mode 100644 Backend/Services/Implement/SendEmailService.cs delete mode 100644 Backend/Services/Implement/SendLineNotifyService.cs delete mode 100644 Backend/Services/Implement/SendSMSService.cs delete mode 100644 Backend/Services/Implement/TyphoonApi.cs delete mode 100644 Backend/Services/Interface/ISendEmailService.cs delete mode 100644 Backend/Services/Interface/ISendLineNotifyService.cs delete mode 100644 Backend/Services/Interface/ISendSMSService.cs diff --git a/Backend/Quartz/JobSchedule.cs b/Backend/Quartz/JobSchedule.cs deleted file mode 100644 index 7d62e67..0000000 --- a/Backend/Quartz/JobSchedule.cs +++ /dev/null @@ -1,198 +0,0 @@ -using Microsoft.Extensions.Logging; -using Repository.BackendRepository.Implement; -using Repository.BackendRepository.Interface; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Text; -using System.Threading.Tasks; -using NCrontab; -using static NCrontab.CrontabSchedule; - -namespace Backend.Quartz -{ - /// - /// Job調度中間對象 - /// - public class JobSchedule - { - public JobSchedule(Type jobType, string cronExpression) - { - this.JobType = jobType ?? throw new ArgumentNullException(nameof(jobType)); - CronExpression = cronExpression ?? throw new ArgumentNullException(nameof(cronExpression)); - } - /// - /// Job類型 - /// - public Type JobType { get; private set; } - /// - /// Cron表達式 - /// - public string CronExpression { get; private set; } - /// - /// Job狀態 - /// - public JobStatus JobStatu { get; set; } = JobStatus.Init; - } - /// - /// Job運行狀態 - /// - public enum JobStatus : byte - { - [Description("初始化")] - Init = 0, - [Description("運行中")] - Running = 1, - [Description("調度中")] - Scheduling = 2, - [Description("已停止")] - Stopped = 3, - } - - public class Task_Detail - { - private readonly IBackendRepository backendRepository; - private readonly ILogger logger; - public Task_Detail(ILogger logger, IBackendRepository backendRepository) - { - this.logger = logger; - this.backendRepository = backendRepository; - } - /// - /// 取得時間規則 - /// - /// - /// - /// - private async Task GetWorkRule(string task,string task_item) - { - string Times = null; - try - { - var sql = $@"select b.system_value from task_detail a - join variable b on a.variable_id = b.id - where a.task = '{task}' and a.task_item = '{task_item}'"; - Times = await backendRepository.GetOneAsync(sql); - } - catch(Exception exception) - { - logger.LogError("【Task_Detail】【任務時間獲取失敗】"); - logger.LogError("【Task_Detail】【任務時間獲取失敗】[Exception]：{0},Task:{1},task_item:{2}", exception.ToString(),task,task_item); - } - return Times; - } - /// - /// 是否執行任務 - /// - /// - /// - /// - public async Task GetNeedWorkTask(string task, string task_item) - { - try - { - var sql = $@"select a.lastwork_time from task_detail a - where a.task = '{task}' and a.task_item = '{task_item}'"; - - var lastworkTime = await backendRepository.GetOneAsync(sql); - - - - DateTime dateTime = lastworkTime != null ? Convert.ToDateTime(lastworkTime) : Convert.ToDateTime("1970-01-01 00:00:01"); - - var nextTime = CrontabSchedule.Parse(await GetWorkRule(task, task_item), new ParseOptions { IncludingSeconds = true } ).GetNextOccurrence(dateTime); - if (DateTime.Now >= nextTime) - { - return true; - } - } - catch(Exception exception) - { - logger.LogError("【Task_Detail】【時間解析失敗】[Exception]：{0},Task:{1},task_item:{2}", exception.ToString(), task, task_item); - } - return false; - } - /// - /// 紀錄任務開始執行時間 - /// - /// - /// - /// - public async Task InsertWorkTime(string task, string task_item ,string LoggerWord = null) - { - try - { - Dictionary worktime = new Dictionary() - { - { "@lastwork_time", DateTime.Now}, - { "@success", 2}, - { "@updated_at", DateTime.Now}, - }; - await backendRepository.UpdateOneByCustomTable(worktime, "task_detail", $" task = '{task}' and task_item = '{task_item}'"); - - if(LoggerWord == null) - { - logger.LogInformation($"【Task_Detail】【開始{task},{task_item}任務】"); - } - logger.LogInformation($"【Task_Detail】【{LoggerWord}】"); - } - catch (Exception exception) - { - logger.LogError("【Task_Detail】【任務輸入開始時間】[Exception]：{0},Task:{1},task_item:{2}", exception.ToString(), task, task_item); - } - } - /// - /// 紀錄任務結束時間 - /// - /// - /// - /// - public async Task InsertWorkTime_End(string task, string task_item,string LoggerWord = null) - { - try - { - Dictionary worktime = new Dictionary() - { - { "@success", 0}, - { "@lastwork_end_time", DateTime.Now}, - { "@updated_at", DateTime.Now}, - }; - await backendRepository.UpdateOneByCustomTable(worktime, "task_detail", $" task = '{task}' and task_item = '{task_item}'"); - if (LoggerWord == null) - { - logger.LogInformation($"【Task_Detail】【結束{task},{task_item}任務】"); - } - logger.LogInformation($"【Task_Detail】【{LoggerWord}】"); - } - catch (Exception exception) - { - logger.LogError("【Task_Detail】【任務輸入結束時間】[Exception]：{0},Task:{1},task_item:{2}", exception.ToString(), task, task_item); - } - } - /// - /// 執行失敗紀錄 - /// - /// - /// - /// - public async Task WorkFail(string task, string task_item,string reason = "") - { - try - { - Dictionary worktime = new Dictionary() - { - { "@success", 1}, - { "@updated_at", DateTime.Now}, - }; - await backendRepository.UpdateOneByCustomTable(worktime, "task_detail", $" task = '{task}' and task_item = '{task_item}'"); - logger.LogError("【Task_Detail】【任務執行失敗】[Exception]：{0},Task:{1},task_item:{2}", reason, task, task_item); - } - catch (Exception exception) - { - logger.LogError("【Task_Detail】【任務執行失敗】[Exception]：{0},Task:{1},task_item:{2}", exception.ToString(), task, task_item); - } - } - - } - -} diff --git a/Backend/Quartz/Jobs/ArchiveElectricMeterDayJob.cs b/Backend/Quartz/Jobs/ArchiveElectricMeterDayJob.cs deleted file mode 100644 index 49244b1..0000000 --- a/Backend/Quartz/Jobs/ArchiveElectricMeterDayJob.cs +++ /dev/null @@ -1,1461 +0,0 @@ -using Backend.Models; -using BackendWorkerService.Services.Implement; -using Dapper; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Options; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; -using Quartz; -using Repository.BackendRepository.Interface; -using Repository.Helper; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Linq; -using System.Net; -using System.Text; -using System.Threading.Tasks; -using System.Xml; - - -namespace Backend.Quartz.Jobs -{ - [DisallowConcurrentExecution] - class ArchiveElectricMeterDayJob : IJob - { - private readonly ILogger logger; - private readonly IBackgroundServiceRepository backgroundServiceRepository; - private readonly IBackgroundServiceMsSqlRepository backgroundServiceMsSqlRepository; - protected readonly IDatabaseHelper _databaseHelper; - private readonly ILogger loggers; - - - public ArchiveElectricMeterDayJob( - ILogger logger, - IBackgroundServiceRepository backgroundServiceRepository, - IBackgroundServiceMsSqlRepository backgroundServiceMySqlRepository, - IDatabaseHelper databaseHelper, ILogger loggers, IBackendRepository backendRepository) - { - this.logger = logger; - this.backgroundServiceRepository = backgroundServiceRepository; - this.backgroundServiceMsSqlRepository = backgroundServiceMySqlRepository; - this._databaseHelper = databaseHelper; - this.loggers = loggers; - } - - public async Task Execute(IJobExecutionContext context) - { - Task_Detail task_Detail = new Task_Detail(loggers, backgroundServiceRepository); - try - { - if(await task_Detail.GetNeedWorkTask("ArchiveElectricMeterDayJob", "All")) - { - await task_Detail.InsertWorkTime("ArchiveElectricMeterDayJob", "All", "水電表開始任務開始"); - EDFunction ed = new EDFunction(); - XmlDocument xmlDocument = new XmlDocument(); - - var sqlArchive = $@"SELECT system_value as Value, system_key as Name FROM variable WHERE deleted = 0 AND system_type = 'archiveConfig'"; - var saveToMSDB = await backgroundServiceRepository.GetOneAsync("select system_value from variable where system_type = 'save_to_ms_db' and deleted = 0"); - - var variableArchive = await backgroundServiceRepository.GetAllAsync(sqlArchive); - var electricMeterGuid = variableArchive.Where(x => x.Name == "ElectricMeterGuid").Select(x => x.Value).FirstOrDefault(); - var waterMeterGuid = variableArchive.Where(x => x.Name == "WaterMeterGuid").Select(x => x.Value).FirstOrDefault(); - - #region 找出所有電錶設備 - var sWhere = "deleted = 0 AND device_name_tag = @sub_system_guid"; - var electricMeters = await backgroundServiceRepository.GetAllAsync("device", sWhere, new { sub_system_guid = electricMeterGuid }); - var waterMeters = await backgroundServiceRepository.GetAllAsync("device", sWhere, new { sub_system_guid = waterMeterGuid }); - #endregion 找出所有電錶設備 - - #region 找出所有電錶系統的點位 - var sPointWhere = "deleted = 0 AND device_name_tag = @sub_system_guid"; - var electricPoints = await backgroundServiceRepository.GetAllAsync("device_item", sPointWhere, new { sub_system_guid = electricMeterGuid }); - var waterPoints = await backgroundServiceRepository.GetAllAsync("device_item", sPointWhere, new { sub_system_guid = waterMeterGuid }); - #endregion 找出所有電錶系統的點位 - - #region 組合出所有電錶設備點位 - List electricDeviceNumberPoints = new List(); - foreach (var electricMeter in electricMeters) - { - foreach (var point in electricPoints) - { - DeviceNumberPoint deviceNumberPoint = new DeviceNumberPoint(); - deviceNumberPoint.DeviceNumber = electricMeter.Device_number; - deviceNumberPoint.Point = point.points; - deviceNumberPoint.FullDeviceNumberPoint = string.Format("{0}_{1}", electricMeter.Device_number, point.points); - - electricDeviceNumberPoints.Add(deviceNumberPoint); - } - } - #endregion 組合出所有電錶設備點位 - #region 組合出所有水錶設備點位 - List waterDeviceNumberPoints = new List(); - foreach (var waterMeter in waterMeters) - { - foreach (var point in waterPoints) - { - DeviceNumberPoint deviceNumberPoint = new DeviceNumberPoint(); - deviceNumberPoint.DeviceNumber = waterMeter.Device_number; - deviceNumberPoint.Point = point.points; - deviceNumberPoint.FullDeviceNumberPoint = string.Format("{0}_{1}", waterMeter.Device_number, point.points); - - waterDeviceNumberPoints.Add(deviceNumberPoint); - } - } - #endregion 組合出所有電錶設備點位 - - #region 取得obix 設定 - var obixApiConfig = new ObixApiConfig(); - - var sqlObix = $@"SELECT system_value as Value, system_key as Name FROM variable WHERE deleted = 0 AND system_type = 'obixConfig'"; - - var variableObix = await backgroundServiceRepository.GetAllAsync(sqlObix); - obixApiConfig.ApiBase = variableObix.Where(x => x.Name == "ApiBase").Select(x => x.Value).FirstOrDefault(); - obixApiConfig.UserName = ed.AESDecrypt(variableObix.Where(x => x.Name == "UserName").Select(x => x.Value).FirstOrDefault()); - obixApiConfig.Password = ed.AESDecrypt(variableObix.Where(x => x.Name == "Password").Select(x => x.Value).FirstOrDefault()); - - String encoded = System.Convert.ToBase64String(System.Text.Encoding.GetEncoding("ISO-8859-1").GetBytes(obixApiConfig.UserName + ":" + obixApiConfig.Password)); - #endregion 取得obix 設定 - - var now = DateTime.Now; - - #region 天歸檔 - if (await task_Detail.GetNeedWorkTask("ArchiveElectricMeterDayJob", "Day")) - { - try - { - await task_Detail.InsertWorkTime("ArchiveElectricMeterDayJob", "Day", "水電表天任務開始"); - var preDay = now.AddDays(-1); //取得前一天 - var dbDateName = preDay.Year.ToString().PadLeft(4, '0') + preDay.Month.ToString().PadLeft(2, '0'); - - var startTimestamp = string.Format("{0}T00:00:00.000+08:00", preDay.ToString("yyyy-MM-dd")); - var endTimestamp = string.Format("{0}T23:59:59.000+08:00", preDay.ToString("yyyy-MM-dd")); - - var historyQueryFilter = $@" - - - - "; - - //Stopwatch stopWatch = new Stopwatch(); - //stopWatch.Start(); - - //抓取每個設備的資料 - List> electericArchiveDayRawDatas = new List>(); - List> waterArchiveDayRawDatas = new List>(); - foreach (var deviceNumberPoint in electricDeviceNumberPoints) - { - - HttpWebRequest archiveDayRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); - //HttpWebRequest archiveDayRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); - archiveDayRequest.Method = "POST"; - archiveDayRequest.Headers.Add("Authorization", "Basic " + encoded); - archiveDayRequest.PreAuthenticate = true; - - byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); - using (Stream reqStream = archiveDayRequest.GetRequestStream()) - { - reqStream.Write(byteArray, 0, byteArray.Length); - } - - HttpWebResponse archiveDayResponse = (HttpWebResponse)archiveDayRequest.GetResponse(); - var archiveDayResponseContent = new StreamReader(archiveDayResponse.GetResponseStream()).ReadToEnd(); - - xmlDocument.LoadXml(archiveDayResponseContent); - string archiveDayJson = JsonConvert.SerializeXmlNode(xmlDocument); - JObject archiveDayJsonResult = (JObject)JsonConvert.DeserializeObject(archiveDayJson); - - if (archiveDayJsonResult.ContainsKey("err")) //抓取錯誤 - { - //logger.LogError("【ArchiveElectricMeterDayJob】【天歸檔】【取得資料失敗】"); - //logger.LogError("【ArchiveElectricMeterDayJob】【天歸檔】【取得資料失敗】[錯誤內容]：{0}", archiveDayJsonResult); - - Dictionary archiveDayRawData = new Dictionary(); - archiveDayRawData.Add("@device_number", deviceNumberPoint.DeviceNumber); - archiveDayRawData.Add("@point", deviceNumberPoint.Point); - archiveDayRawData.Add("@start_timestamp", startTimestamp.Replace("T", " ").Substring(0, 19)); - archiveDayRawData.Add("@end_timestamp", endTimestamp.Replace("T", " ").Substring(0, 19)); - archiveDayRawData.Add("@is_complete", 0); - archiveDayRawData.Add("@repeat_times", 0); - archiveDayRawData.Add("@fail_reason", archiveDayJson); - - archiveDayRawData.Add("@count_rawdata", 0); - archiveDayRawData.Add("@min_rawdata", 0); - archiveDayRawData.Add("@max_rawdata", 0); - archiveDayRawData.Add("@avg_rawdata", 0); - archiveDayRawData.Add("@sum_rawdata", 0); - archiveDayRawData.Add("@updated_at", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")); - - electericArchiveDayRawDatas.Add(archiveDayRawData); - } - - if (archiveDayJsonResult.ContainsKey("obj")) //表示可以讀取到內容 - { - var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveDayJsonResult); - if (ArrangeRawDatas != null && ArrangeRawDatas.Count() > 0) - { - electericArchiveDayRawDatas.AddRange(ArrangeRawDatas); - } - } - } - foreach (var deviceNumberPoint in waterDeviceNumberPoints) - { - - HttpWebRequest archiveDayRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); - //HttpWebRequest archiveDayRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); - archiveDayRequest.Method = "POST"; - archiveDayRequest.Headers.Add("Authorization", "Basic " + encoded); - archiveDayRequest.PreAuthenticate = true; - - byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); - using (Stream reqStream = archiveDayRequest.GetRequestStream()) - { - reqStream.Write(byteArray, 0, byteArray.Length); - } - - HttpWebResponse archiveDayResponse = (HttpWebResponse)archiveDayRequest.GetResponse(); - var archiveDayResponseContent = new StreamReader(archiveDayResponse.GetResponseStream()).ReadToEnd(); - - xmlDocument.LoadXml(archiveDayResponseContent); - string archiveDayJson = JsonConvert.SerializeXmlNode(xmlDocument); - JObject archiveDayJsonResult = (JObject)JsonConvert.DeserializeObject(archiveDayJson); - - if (archiveDayJsonResult.ContainsKey("err")) //抓取錯誤 - { - //logger.LogError("【ArchiveElectricMeterDayJob】【天歸檔】【取得資料失敗】"); - //logger.LogError("【ArchiveElectricMeterDayJob】【天歸檔】【取得資料失敗】[錯誤內容]：{0}", archiveDayJsonResult); - - Dictionary archiveDayRawData = new Dictionary(); - archiveDayRawData.Add("@device_number", deviceNumberPoint.DeviceNumber); - archiveDayRawData.Add("@point", deviceNumberPoint.Point); - archiveDayRawData.Add("@start_timestamp", startTimestamp.Replace("T", " ").Substring(0, 19)); - archiveDayRawData.Add("@end_timestamp", endTimestamp.Replace("T", " ").Substring(0, 19)); - archiveDayRawData.Add("@is_complete", 0); - archiveDayRawData.Add("@repeat_times", 0); - archiveDayRawData.Add("@fail_reason", archiveDayJson); - - archiveDayRawData.Add("@count_rawdata", 0); - archiveDayRawData.Add("@min_rawdata", 0); - archiveDayRawData.Add("@max_rawdata", 0); - archiveDayRawData.Add("@avg_rawdata", 0); - archiveDayRawData.Add("@sum_rawdata", 0); - archiveDayRawData.Add("@updated_at", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")); - - waterArchiveDayRawDatas.Add(archiveDayRawData); - } - - if (archiveDayJsonResult.ContainsKey("obj")) //表示可以讀取到內容 - { - var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveDayJsonResult); - if (ArrangeRawDatas != null && ArrangeRawDatas.Count() > 0) - { - waterArchiveDayRawDatas.AddRange(ArrangeRawDatas); - } - } - } - - //stopWatch.Stop(); - //logger.LogInformation("【ArchiveElectricMeterDayJob】【天歸檔】【效能檢驗】[取得資料花費時間]{0} 毫秒", stopWatch.ElapsedMilliseconds); - - if (electericArchiveDayRawDatas.Count() > 0) - { - var sql = $@"CREATE TABLE IF NOT EXISTS `archive_electric_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, - `start_timestamp` datetime(6) NOT NULL, - `end_timestamp` datetime(6) NULL DEFAULT NULL, - `count_rawdata` int(11) NULL DEFAULT NULL, - `min_rawdata` decimal(15, 3) NULL DEFAULT NULL, - `max_rawdata` decimal(15, 3) NULL DEFAULT NULL, - `avg_rawdata` decimal(15, 3) NULL DEFAULT NULL, - `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 '失敗原因', - `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; - - SET FOREIGN_KEY_CHECKS = 1; - UPDATE archive_electric_meter_day_{dbDateName} SET - count_rawdata = @count_rawdata, - min_rawdata = @min_rawdata, - max_rawdata = @max_rawdata, - avg_rawdata = @avg_rawdata, - sum_rawdata = @sum_rawdata, - is_complete = @is_complete, - repeat_times = @repeat_times, - fail_reason = @fail_reason, - updated_at = @updated_at - WHERE device_number = @device_number - AND point = @point - AND start_timestamp = @start_timestamp; - - INSERT INTO archive_electric_meter_day_{dbDateName} ( - device_number, - point, - start_timestamp, - end_timestamp, - count_rawdata, - min_rawdata, - max_rawdata, - avg_rawdata, - sum_rawdata, - is_complete, - repeat_times, - fail_reason) - SELECT - @device_number, - @point, - @start_timestamp, - @end_timestamp, - @count_rawdata, - @min_rawdata, - @max_rawdata, - @avg_rawdata, - @sum_rawdata, - @is_complete, - @repeat_times, - @fail_reason - WHERE ROW_COUNT() = 0;"; - - var mySql = $@"BEGIN TRANSACTION; - IF OBJECT_ID(N'dbo.archive_electric_meter_day_{dbDateName}', N'U') is null - BEGIN - CREATE TABLE [dbo].[archive_electric_meter_day_{dbDateName}]( - [device_number] [varchar](50) NOT NULL, - [point] [varchar](20) NOT NULL, - [start_timestamp] [datetime] NOT NULL, - [end_timestamp] [datetime] NULL, - [count_rawdata] [int] NULL, - [min_rawdata] [decimal](15, 3) NULL, - [max_rawdata] [decimal](15, 3) NULL, - [avg_rawdata] [decimal](15, 3) NULL, - [sum_rawdata] [decimal](15, 3) NULL, - [is_complete] [tinyint] NULL, - [repeat_times] [int] NULL, - [fail_reason] [nvarchar](max) NULL, - [created_at] [datetime] NULL, - [updated_at] [datetime] NULL, - CONSTRAINT [PK_archive_electric_meter_day_{dbDateName}] PRIMARY KEY CLUSTERED - ( - [device_number] ASC, - [point] ASC, - [start_timestamp] ASC - )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [PRIMARY] - ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] - - ALTER TABLE [dbo].[archive_electric_meter_day_{dbDateName}] ADD CONSTRAINT [DF_archive_electric_meter_day_{dbDateName}_repeat_times] DEFAULT ((0)) FOR [repeat_times] - - ALTER TABLE [dbo].[archive_electric_meter_day_{dbDateName}] ADD CONSTRAINT [DF_archive_electric_meter_day_{dbDateName}_created_at] DEFAULT (getdate()) FOR [created_at] - - ALTER TABLE [dbo].[archive_electric_meter_day_{dbDateName}] ADD CONSTRAINT [DF_archive_electric_meter_day_{dbDateName}_updated_at] DEFAULT (NULL) FOR [updated_at] - - EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'是否完成，0:未完成 1:完成' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'archive_electric_meter_day_{dbDateName}', @level2type=N'COLUMN',@level2name=N'is_complete' - - EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'重複次數' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'archive_electric_meter_day_{dbDateName}', @level2type=N'COLUMN',@level2name=N'repeat_times' - - EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'失敗原因' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'archive_electric_meter_day_{dbDateName}', @level2type=N'COLUMN',@level2name=N'fail_reason' - END - - UPDATE archive_electric_meter_day_{dbDateName} SET - count_rawdata = @count_rawdata, - min_rawdata = @min_rawdata, - max_rawdata = @max_rawdata, - avg_rawdata = @avg_rawdata, - sum_rawdata = @sum_rawdata, - is_complete = @is_complete, - repeat_times = @repeat_times, - fail_reason = @fail_reason, - updated_at = @updated_at - WHERE device_number = @device_number - AND point = @point - AND start_timestamp = @start_timestamp; - - IF @@ROWCOUNT = 0 - BEGIN - INSERT INTO archive_electric_meter_day_{dbDateName} ( - device_number, - point, - start_timestamp, - end_timestamp, - count_rawdata, - min_rawdata, - max_rawdata, - avg_rawdata, - sum_rawdata, - is_complete, - repeat_times, - fail_reason) - VALUES ( - @device_number, - @point, - @start_timestamp, - @end_timestamp, - @count_rawdata, - @min_rawdata, - @max_rawdata, - @avg_rawdata, - @sum_rawdata, - @is_complete, - @repeat_times, - @fail_reason) - END - - COMMIT TRANSACTION;"; - await backgroundServiceRepository.ExecuteSql(sql, electericArchiveDayRawDatas); - if (!string.IsNullOrEmpty(saveToMSDB) && saveToMSDB == "1") - { - await backgroundServiceMsSqlRepository.ExecuteSql(mySql, electericArchiveDayRawDatas); - } - } - if (waterArchiveDayRawDatas.Count() > 0) - { - var sql = $@" - CREATE TABLE IF NOT EXISTS `archive_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, - `start_timestamp` datetime(6) NOT NULL, - `end_timestamp` datetime(6) NULL DEFAULT NULL, - `count_rawdata` int(11) NULL DEFAULT NULL, - `min_rawdata` decimal(15, 3) NULL DEFAULT NULL, - `max_rawdata` decimal(15, 3) NULL DEFAULT NULL, - `avg_rawdata` decimal(15, 3) NULL DEFAULT NULL, - `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 '失敗原因', - `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; - - UPDATE archive_water_meter_day_{dbDateName} SET - count_rawdata = @count_rawdata, - min_rawdata = @min_rawdata, - max_rawdata = @max_rawdata, - avg_rawdata = @avg_rawdata, - sum_rawdata = @sum_rawdata, - is_complete = @is_complete, - repeat_times = @repeat_times, - fail_reason = @fail_reason, - updated_at = @updated_at - WHERE device_number = @device_number - AND point = @point - AND start_timestamp = @start_timestamp; - - - INSERT INTO archive_water_meter_day_{dbDateName} ( - device_number, - point, - start_timestamp, - end_timestamp, - count_rawdata, - min_rawdata, - max_rawdata, - avg_rawdata, - sum_rawdata, - is_complete, - repeat_times, - fail_reason) - SELECT - @device_number, - @point, - @start_timestamp, - @end_timestamp, - @count_rawdata, - @min_rawdata, - @max_rawdata, - @avg_rawdata, - @sum_rawdata, - @is_complete, - @repeat_times, - @fail_reason - WHERE ROW_COUNT() = 0;"; - - var mySql = $@"BEGIN TRANSACTION; - IF OBJECT_ID(N'dbo.archive_water_meter_day_{dbDateName}', N'U') is null - BEGIN - CREATE TABLE [dbo].[archive_water_meter_day_{dbDateName}]( - [device_number] [varchar](50) NOT NULL, - [point] [varchar](20) NOT NULL, - [start_timestamp] [datetime] NOT NULL, - [end_timestamp] [datetime] NULL, - [count_rawdata] [int] NULL, - [min_rawdata] [decimal](15, 3) NULL, - [max_rawdata] [decimal](15, 3) NULL, - [avg_rawdata] [decimal](15, 3) NULL, - [sum_rawdata] [decimal](15, 3) NULL, - [is_complete] [tinyint] NULL, - [repeat_times] [int] NULL, - [fail_reason] [nvarchar](max) NULL, - [created_at] [datetime] NULL, - [updated_at] [datetime] NULL, - CONSTRAINT [PK_archive_water_meter_day_{dbDateName}] PRIMARY KEY CLUSTERED - ( - [device_number] ASC, - [point] ASC, - [start_timestamp] ASC - )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [PRIMARY] - ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] - - ALTER TABLE [dbo].[archive_water_meter_day_{dbDateName}] ADD CONSTRAINT [DF_archive_water_meter_day_{dbDateName}_repeat_times] DEFAULT ((0)) FOR [repeat_times] - - ALTER TABLE [dbo].[archive_water_meter_day_{dbDateName}] ADD CONSTRAINT [DF_archive_water_meter_day_{dbDateName}_created_at] DEFAULT (getdate()) FOR [created_at] - - ALTER TABLE [dbo].[archive_water_meter_day_{dbDateName}] ADD CONSTRAINT [DF_archive_water_meter_day_{dbDateName}_updated_at] DEFAULT (NULL) FOR [updated_at] - - EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'是否完成，0:未完成 1:完成' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'archive_water_meter_day_{dbDateName}', @level2type=N'COLUMN',@level2name=N'is_complete' - - EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'重複次數' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'archive_water_meter_day_{dbDateName}', @level2type=N'COLUMN',@level2name=N'repeat_times' - - EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'失敗原因' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'archive_water_meter_day_{dbDateName}', @level2type=N'COLUMN',@level2name=N'fail_reason' - END - - UPDATE archive_water_meter_day_{dbDateName} SET - count_rawdata = @count_rawdata, - min_rawdata = @min_rawdata, - max_rawdata = @max_rawdata, - avg_rawdata = @avg_rawdata, - sum_rawdata = @sum_rawdata, - is_complete = @is_complete, - repeat_times = @repeat_times, - fail_reason = @fail_reason, - updated_at = @updated_at - WHERE device_number = @device_number - AND point = @point - AND start_timestamp = @start_timestamp; - - IF @@ROWCOUNT = 0 - BEGIN - INSERT INTO archive_water_meter_day_{dbDateName} ( - device_number, - point, - start_timestamp, - end_timestamp, - count_rawdata, - min_rawdata, - max_rawdata, - avg_rawdata, - sum_rawdata, - is_complete, - repeat_times, - fail_reason) - VALUES ( - @device_number, - @point, - @start_timestamp, - @end_timestamp, - @count_rawdata, - @min_rawdata, - @max_rawdata, - @avg_rawdata, - @sum_rawdata, - @is_complete, - @repeat_times, - @fail_reason) - END - - COMMIT TRANSACTION;"; - await backgroundServiceRepository.ExecuteSql(sql, waterArchiveDayRawDatas); - if (!string.IsNullOrEmpty(saveToMSDB) && saveToMSDB == "1") - { - await backgroundServiceMsSqlRepository.ExecuteSql(mySql, waterArchiveDayRawDatas); - } - } - await task_Detail.InsertWorkTime_End("ArchiveElectricMeterDayJob", "Day", "任務完成"); - } - catch (Exception exception) - { - await task_Detail.WorkFail("ArchiveElectricMeterDayJob", "Day", exception.ToString()); - logger.LogError("【ArchiveElectricMeterDayJob】【天歸檔】【任務失敗】"); - logger.LogError("【ArchiveElectricMeterDayJob】【天歸檔】【任務失敗】[Exception]：{0}", exception.ToString()); - } - } - #endregion 天歸檔 - - #region 週歸檔 - if (await task_Detail.GetNeedWorkTask("ArchiveElectricMeterDayJob", "Week")) - { - try - { - await task_Detail.InsertWorkTime("ArchiveElectricMeterDayJob", "Week", "水電表周任務開始"); - int week = Convert.ToInt32(now.DayOfWeek); - week = week == 0 ? 7 : week; - - var startTimestamp = string.Format("{0}T00:00:00.000+08:00", now.AddDays(1 - week).ToString("yyyy-MM-dd")); - var endTimestamp = string.Format("{0}T23:59:59.000+08:00", now.AddDays(7 - week).ToString("yyyy-MM-dd")); - - var historyQueryFilter = $@" - - - - "; - - //Stopwatch stopWatch = new Stopwatch(); - //stopWatch.Start(); - - //抓取每個設備的資料 - List> electricArchiveWeekRawDatas = new List>(); - List> waterArchiveWeekRawDatas = new List>(); - foreach (var deviceNumberPoint in electricDeviceNumberPoints) - { - HttpWebRequest archiveWeekRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); - //HttpWebRequest archiveWeekRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); - archiveWeekRequest.Method = "POST"; - archiveWeekRequest.Headers.Add("Authorization", "Basic " + encoded); - archiveWeekRequest.PreAuthenticate = true; - - byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); - using (Stream reqStream = archiveWeekRequest.GetRequestStream()) - { - reqStream.Write(byteArray, 0, byteArray.Length); - } - - HttpWebResponse archiveWeekResponse = (HttpWebResponse)archiveWeekRequest.GetResponse(); - var archiveWeekResponseContent = new StreamReader(archiveWeekResponse.GetResponseStream()).ReadToEnd(); - - xmlDocument.LoadXml(archiveWeekResponseContent); - string archiveWeekJson = JsonConvert.SerializeXmlNode(xmlDocument); - JObject archiveWeekJsonResult = (JObject)JsonConvert.DeserializeObject(archiveWeekJson); - - if (archiveWeekJsonResult.ContainsKey("err")) //抓取錯誤 - { - //logger.LogError("【ArchiveElectricMeterDayJob】【週歸檔】【取得資料失敗】"); - //logger.LogError("【ArchiveElectricMeterDayJob】【週歸檔】【取得資料失敗】[錯誤內容]：{0}", archiveWeekJsonResult); - - Dictionary archiveWeekRawData = new Dictionary(); - archiveWeekRawData.Add("@device_number", deviceNumberPoint.DeviceNumber); - archiveWeekRawData.Add("@point", deviceNumberPoint.Point); - archiveWeekRawData.Add("@start_timestamp", startTimestamp.Replace("T", " ").Substring(0, 19)); - archiveWeekRawData.Add("@end_timestamp", endTimestamp.Replace("T", " ").Substring(0, 19)); - archiveWeekRawData.Add("@is_complete", 0); - archiveWeekRawData.Add("@repeat_times", 0); - archiveWeekRawData.Add("@fail_reason", archiveWeekJson); - - archiveWeekRawData.Add("@count_rawdata", 0); - archiveWeekRawData.Add("@min_rawdata", 0); - archiveWeekRawData.Add("@max_rawdata", 0); - archiveWeekRawData.Add("@avg_rawdata", 0); - archiveWeekRawData.Add("@sum_rawdata", 0); - archiveWeekRawData.Add("@updated_at", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")); - - electricArchiveWeekRawDatas.Add(archiveWeekRawData); - } - - if (archiveWeekJsonResult.ContainsKey("obj")) //表示可以讀取到內容 - { - var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveWeekJsonResult); - if (ArrangeRawDatas != null && ArrangeRawDatas.Count() > 0) - { - electricArchiveWeekRawDatas.AddRange(ArrangeRawDatas); - } - } - } - foreach (var deviceNumberPoint in waterDeviceNumberPoints) - { - HttpWebRequest archiveWeekRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); - //HttpWebRequest archiveWeekRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); - archiveWeekRequest.Method = "POST"; - archiveWeekRequest.Headers.Add("Authorization", "Basic " + encoded); - archiveWeekRequest.PreAuthenticate = true; - - byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); - using (Stream reqStream = archiveWeekRequest.GetRequestStream()) - { - reqStream.Write(byteArray, 0, byteArray.Length); - } - - HttpWebResponse archiveWeekResponse = (HttpWebResponse)archiveWeekRequest.GetResponse(); - var archiveWeekResponseContent = new StreamReader(archiveWeekResponse.GetResponseStream()).ReadToEnd(); - - xmlDocument.LoadXml(archiveWeekResponseContent); - string archiveWeekJson = JsonConvert.SerializeXmlNode(xmlDocument); - JObject archiveWeekJsonResult = (JObject)JsonConvert.DeserializeObject(archiveWeekJson); - - if (archiveWeekJsonResult.ContainsKey("err")) //抓取錯誤 - { - //logger.LogError("【ArchiveElectricMeterDayJob】【週歸檔】【取得資料失敗】"); - //logger.LogError("【ArchiveElectricMeterDayJob】【週歸檔】【取得資料失敗】[錯誤內容]：{0}", archiveWeekJsonResult); - - Dictionary archiveWeekRawData = new Dictionary(); - archiveWeekRawData.Add("@device_number", deviceNumberPoint.DeviceNumber); - archiveWeekRawData.Add("@point", deviceNumberPoint.Point); - archiveWeekRawData.Add("@start_timestamp", startTimestamp.Replace("T", " ").Substring(0, 19)); - archiveWeekRawData.Add("@end_timestamp", endTimestamp.Replace("T", " ").Substring(0, 19)); - archiveWeekRawData.Add("@is_complete", 0); - archiveWeekRawData.Add("@repeat_times", 0); - archiveWeekRawData.Add("@fail_reason", archiveWeekJson); - - archiveWeekRawData.Add("@count_rawdata", 0); - archiveWeekRawData.Add("@min_rawdata", 0); - archiveWeekRawData.Add("@max_rawdata", 0); - archiveWeekRawData.Add("@avg_rawdata", 0); - archiveWeekRawData.Add("@sum_rawdata", 0); - archiveWeekRawData.Add("@updated_at", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")); - - waterArchiveWeekRawDatas.Add(archiveWeekRawData); - } - - if (archiveWeekJsonResult.ContainsKey("obj")) //表示可以讀取到內容 - { - var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveWeekJsonResult); - if (ArrangeRawDatas != null && ArrangeRawDatas.Count() > 0) - { - waterArchiveWeekRawDatas.AddRange(ArrangeRawDatas); - } - } - } - - //stopWatch.Stop(); - //logger.LogInformation("【ArchiveElectricMeterDayJob】【週歸檔】【效能檢驗】[取得資料花費時間]{0} 毫秒", stopWatch.ElapsedMilliseconds); - - if (electricArchiveWeekRawDatas.Count() > 0) - { - var sql = $@" - - UPDATE archive_electric_meter_week SET - count_rawdata = @count_rawdata, - min_rawdata = @min_rawdata, - max_rawdata = @max_rawdata, - avg_rawdata = @avg_rawdata, - sum_rawdata = @sum_rawdata, - is_complete = @is_complete, - repeat_times = @repeat_times, - fail_reason = @fail_reason, - updated_at = @updated_at - WHERE device_number = @device_number - AND point = @point - AND start_timestamp = @start_timestamp; - - - INSERT INTO archive_electric_meter_week ( - device_number, - point, - start_timestamp, - end_timestamp, - count_rawdata, - min_rawdata, - max_rawdata, - avg_rawdata, - sum_rawdata, - is_complete, - repeat_times, - fail_reason) - SELECT - @device_number, - @point, - @start_timestamp, - @end_timestamp, - @count_rawdata, - @min_rawdata, - @max_rawdata, - @avg_rawdata, - @sum_rawdata, - @is_complete, - @repeat_times, - @fail_reason - WHERE ROW_COUNT() = 0; - "; - - var mySql = $@"BEGIN TRANSACTION; - - UPDATE archive_electric_meter_week SET - count_rawdata = @count_rawdata, - min_rawdata = @min_rawdata, - max_rawdata = @max_rawdata, - avg_rawdata = @avg_rawdata, - sum_rawdata = @sum_rawdata, - is_complete = @is_complete, - repeat_times = @repeat_times, - fail_reason = @fail_reason, - updated_at = @updated_at - WHERE device_number = @device_number - AND point = @point - AND start_timestamp = @start_timestamp; - - IF @@ROWCOUNT = 0 - BEGIN - INSERT INTO archive_electric_meter_week ( - device_number, - point, - start_timestamp, - end_timestamp, - count_rawdata, - min_rawdata, - max_rawdata, - avg_rawdata, - sum_rawdata, - is_complete, - repeat_times, - fail_reason) - VALUES ( - @device_number, - @point, - @start_timestamp, - @end_timestamp, - @count_rawdata, - @min_rawdata, - @max_rawdata, - @avg_rawdata, - @sum_rawdata, - @is_complete, - @repeat_times, - @fail_reason) - END - - COMMIT TRANSACTION;"; - await backgroundServiceRepository.ExecuteSql(sql, electricArchiveWeekRawDatas); - if (!string.IsNullOrEmpty(saveToMSDB) && saveToMSDB == "1") - { - await backgroundServiceMsSqlRepository.ExecuteSql(mySql, electricArchiveWeekRawDatas); - } - - } - if (waterArchiveWeekRawDatas.Count() > 0) - { - var sql = $@" - - UPDATE archive_water_meter_week SET - count_rawdata = @count_rawdata, - min_rawdata = @min_rawdata, - max_rawdata = @max_rawdata, - avg_rawdata = @avg_rawdata, - sum_rawdata = @sum_rawdata, - is_complete = @is_complete, - repeat_times = @repeat_times, - fail_reason = @fail_reason, - updated_at = @updated_at - WHERE device_number = @device_number - AND point = @point - AND start_timestamp = @start_timestamp; - - - INSERT INTO archive_water_meter_week ( - device_number, - point, - start_timestamp, - end_timestamp, - count_rawdata, - min_rawdata, - max_rawdata, - avg_rawdata, - sum_rawdata, - is_complete, - repeat_times, - fail_reason) - SELECT - @device_number, - @point, - @start_timestamp, - @end_timestamp, - @count_rawdata, - @min_rawdata, - @max_rawdata, - @avg_rawdata, - @sum_rawdata, - @is_complete, - @repeat_times, - @fail_reason - WHERE ROW_COUNT() = 0; - "; - - var mySql = $@"BEGIN TRANSACTION; - - UPDATE archive_water_meter_week SET - count_rawdata = @count_rawdata, - min_rawdata = @min_rawdata, - max_rawdata = @max_rawdata, - avg_rawdata = @avg_rawdata, - sum_rawdata = @sum_rawdata, - is_complete = @is_complete, - repeat_times = @repeat_times, - fail_reason = @fail_reason, - updated_at = @updated_at - WHERE device_number = @device_number - AND point = @point - AND start_timestamp = @start_timestamp; - - IF @@ROWCOUNT = 0 - BEGIN - INSERT INTO archive_water_meter_week ( - device_number, - point, - start_timestamp, - end_timestamp, - count_rawdata, - min_rawdata, - max_rawdata, - avg_rawdata, - sum_rawdata, - is_complete, - repeat_times, - fail_reason) - VALUES ( - @device_number, - @point, - @start_timestamp, - @end_timestamp, - @count_rawdata, - @min_rawdata, - @max_rawdata, - @avg_rawdata, - @sum_rawdata, - @is_complete, - @repeat_times, - @fail_reason) - END - - COMMIT TRANSACTION;"; - await backgroundServiceRepository.ExecuteSql(sql, waterArchiveWeekRawDatas); - if (!string.IsNullOrEmpty(saveToMSDB) && saveToMSDB == "1") - { - await backgroundServiceMsSqlRepository.ExecuteSql(mySql, waterArchiveWeekRawDatas); - } - } - await task_Detail.InsertWorkTime_End("ArchiveElectricMeterDayJob", "Week", "任務完成"); - } - catch (Exception exception) - { - await task_Detail.WorkFail("ArchiveElectricMeterDayJob", "Week", exception.ToString()); - logger.LogError("【ArchiveElectricMeterDayJob】【週歸檔】【任務失敗】"); - logger.LogError("【ArchiveElectricMeterDayJob】【週歸檔】【任務失敗】[Exception]：{0}", exception.ToString()); - } - } - #endregion 週歸檔 - - #region 月歸檔 - if (await task_Detail.GetNeedWorkTask("ArchiveElectricMeterDayJob", "Month")) - { - try - { - await task_Detail.InsertWorkTime("ArchiveElectricMeterDayJob", "Month", "水電表月任務開始"); - var FirstDay = now.AddDays(-now.Day + 1); - var LastDay = now.AddMonths(1).AddDays(-now.AddMonths(1).Day); - - var dayInMonth = DateTime.DaysInMonth(now.Year, now.Month); - - var startTimestamp = string.Format("{0}T00:00:00.000+08:00", FirstDay.ToString("yyyy-MM-dd")); - var endTimestamp = string.Format("{0}T23:59:59.000+08:00", LastDay.ToString("yyyy-MM-dd")); - - var historyQueryFilter = $@" - - - - "; - - //Stopwatch stopWatch = new Stopwatch(); - //stopWatch.Start(); - - //抓取每個設備的資料 - List> electricArchiveMonthRawDatas = new List>(); - List> waterArchiveMonthRawDatas = new List>(); - foreach (var deviceNumberPoint in electricDeviceNumberPoints) - { - HttpWebRequest archiveMonthRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); - //HttpWebRequest archiveMonthRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); - archiveMonthRequest.Method = "POST"; - archiveMonthRequest.Headers.Add("Authorization", "Basic " + encoded); - archiveMonthRequest.PreAuthenticate = true; - - byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); - using (Stream reqStream = archiveMonthRequest.GetRequestStream()) - { - reqStream.Write(byteArray, 0, byteArray.Length); - } - - HttpWebResponse archiveMonthResponse = (HttpWebResponse)archiveMonthRequest.GetResponse(); - var archiveMonthResponseContent = new StreamReader(archiveMonthResponse.GetResponseStream()).ReadToEnd(); - - xmlDocument.LoadXml(archiveMonthResponseContent); - string archiveMonthJson = JsonConvert.SerializeXmlNode(xmlDocument); - JObject archiveMonthJsonResult = (JObject)JsonConvert.DeserializeObject(archiveMonthJson); - - if (archiveMonthJsonResult.ContainsKey("err")) //抓取錯誤 - { - //logger.LogError("【ArchiveElectricMeterDayJob】【月歸檔】【取得資料失敗】"); - //logger.LogError("【ArchiveElectricMeterDayJob】【月歸檔】【取得資料失敗】[錯誤內容]：{0}", archiveMonthJsonResult); - - Dictionary archiveMonthRawData = new Dictionary(); - archiveMonthRawData.Add("@device_number", deviceNumberPoint.DeviceNumber); - archiveMonthRawData.Add("@point", deviceNumberPoint.Point); - archiveMonthRawData.Add("@start_timestamp", startTimestamp.Replace("T", " ").Substring(0, 19)); - archiveMonthRawData.Add("@end_timestamp", endTimestamp.Replace("T", " ").Substring(0, 19)); - archiveMonthRawData.Add("@is_complete", 0); - archiveMonthRawData.Add("@repeat_times", 0); - archiveMonthRawData.Add("@fail_reason", archiveMonthJson); - - archiveMonthRawData.Add("@count_rawdata", 0); - archiveMonthRawData.Add("@min_rawdata", 0); - archiveMonthRawData.Add("@max_rawdata", 0); - archiveMonthRawData.Add("@avg_rawdata", 0); - archiveMonthRawData.Add("@sum_rawdata", 0); - archiveMonthRawData.Add("@updated_at", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")); - - electricArchiveMonthRawDatas.Add(archiveMonthRawData); - } - - if (archiveMonthJsonResult.ContainsKey("obj")) //表示可以讀取到內容 - { - var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveMonthJsonResult); - if (ArrangeRawDatas != null && ArrangeRawDatas.Count() > 0) - { - electricArchiveMonthRawDatas.AddRange(ArrangeRawDatas); - } - } - } - foreach (var deviceNumberPoint in waterDeviceNumberPoints) - { - HttpWebRequest archiveMonthRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); - //HttpWebRequest archiveMonthRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); - archiveMonthRequest.Method = "POST"; - archiveMonthRequest.Headers.Add("Authorization", "Basic " + encoded); - archiveMonthRequest.PreAuthenticate = true; - - byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); - using (Stream reqStream = archiveMonthRequest.GetRequestStream()) - { - reqStream.Write(byteArray, 0, byteArray.Length); - } - - HttpWebResponse archiveMonthResponse = (HttpWebResponse)archiveMonthRequest.GetResponse(); - var archiveMonthResponseContent = new StreamReader(archiveMonthResponse.GetResponseStream()).ReadToEnd(); - - xmlDocument.LoadXml(archiveMonthResponseContent); - string archiveMonthJson = JsonConvert.SerializeXmlNode(xmlDocument); - JObject archiveMonthJsonResult = (JObject)JsonConvert.DeserializeObject(archiveMonthJson); - - if (archiveMonthJsonResult.ContainsKey("err")) //抓取錯誤 - { - //logger.LogError("【ArchiveElectricMeterDayJob】【月歸檔】【取得資料失敗】"); - //logger.LogError("【ArchiveElectricMeterDayJob】【月歸檔】【取得資料失敗】[錯誤內容]：{0}", archiveMonthJsonResult); - - Dictionary archiveMonthRawData = new Dictionary(); - archiveMonthRawData.Add("@device_number", deviceNumberPoint.DeviceNumber); - archiveMonthRawData.Add("@point", deviceNumberPoint.Point); - archiveMonthRawData.Add("@start_timestamp", startTimestamp.Replace("T", " ").Substring(0, 19)); - archiveMonthRawData.Add("@end_timestamp", endTimestamp.Replace("T", " ").Substring(0, 19)); - archiveMonthRawData.Add("@is_complete", 0); - archiveMonthRawData.Add("@repeat_times", 0); - archiveMonthRawData.Add("@fail_reason", archiveMonthJson); - - archiveMonthRawData.Add("@count_rawdata", 0); - archiveMonthRawData.Add("@min_rawdata", 0); - archiveMonthRawData.Add("@max_rawdata", 0); - archiveMonthRawData.Add("@avg_rawdata", 0); - archiveMonthRawData.Add("@sum_rawdata", 0); - archiveMonthRawData.Add("@updated_at", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")); - - waterArchiveMonthRawDatas.Add(archiveMonthRawData); - } - - if (archiveMonthJsonResult.ContainsKey("obj")) //表示可以讀取到內容 - { - var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveMonthJsonResult); - if (ArrangeRawDatas != null && ArrangeRawDatas.Count() > 0) - { - waterArchiveMonthRawDatas.AddRange(ArrangeRawDatas); - } - } - } - - //stopWatch.Stop(); - //logger.LogInformation("【ArchiveElectricMeterDayJob】【月歸檔效能檢驗】[取得資料花費時間]{0} 毫秒", stopWatch.ElapsedMilliseconds); - - if (electricArchiveMonthRawDatas.Count() > 0) - { - var sql = $@" - UPDATE archive_electric_meter_month SET - count_rawdata = @count_rawdata, - min_rawdata = @min_rawdata, - max_rawdata = @max_rawdata, - avg_rawdata = @avg_rawdata, - sum_rawdata = @sum_rawdata, - is_complete = @is_complete, - repeat_times = @repeat_times, - fail_reason = @fail_reason, - updated_at = @updated_at - WHERE device_number = @device_number - AND point = @point - AND start_timestamp = @start_timestamp; - - INSERT INTO archive_electric_meter_month ( - device_number, - point, - start_timestamp, - end_timestamp, - count_rawdata, - min_rawdata, - max_rawdata, - avg_rawdata, - sum_rawdata, - is_complete, - repeat_times, - fail_reason) - SELECT - @device_number, - @point, - @start_timestamp, - @end_timestamp, - @count_rawdata, - @min_rawdata, - @max_rawdata, - @avg_rawdata, - @sum_rawdata, - @is_complete, - @repeat_times, - @fail_reason - WHERE ROW_COUNT() = 0;"; - - var mySql = $@"BEGIN TRANSACTION; - - UPDATE archive_electric_meter_month SET - count_rawdata = @count_rawdata, - min_rawdata = @min_rawdata, - max_rawdata = @max_rawdata, - avg_rawdata = @avg_rawdata, - sum_rawdata = @sum_rawdata, - is_complete = @is_complete, - repeat_times = @repeat_times, - fail_reason = @fail_reason, - updated_at = @updated_at - WHERE device_number = @device_number - AND point = @point - AND start_timestamp = @start_timestamp; - - IF @@ROWCOUNT = 0 - BEGIN - INSERT INTO archive_electric_meter_month ( - device_number, - point, - start_timestamp, - end_timestamp, - count_rawdata, - min_rawdata, - max_rawdata, - avg_rawdata, - sum_rawdata, - is_complete, - repeat_times, - fail_reason) - VALUES ( - @device_number, - @point, - @start_timestamp, - @end_timestamp, - @count_rawdata, - @min_rawdata, - @max_rawdata, - @avg_rawdata, - @sum_rawdata, - @is_complete, - @repeat_times, - @fail_reason) - END - - COMMIT TRANSACTION;"; - await backgroundServiceRepository.ExecuteSql(sql, electricArchiveMonthRawDatas); - if (!string.IsNullOrEmpty(saveToMSDB) && saveToMSDB == "1") - { - await backgroundServiceMsSqlRepository.ExecuteSql(mySql, electricArchiveMonthRawDatas); - } - } - if (waterArchiveMonthRawDatas.Count() > 0) - { - var sql = $@" - UPDATE archive_water_meter_month SET - count_rawdata = @count_rawdata, - min_rawdata = @min_rawdata, - max_rawdata = @max_rawdata, - avg_rawdata = @avg_rawdata, - sum_rawdata = @sum_rawdata, - is_complete = @is_complete, - repeat_times = @repeat_times, - fail_reason = @fail_reason, - updated_at = @updated_at - WHERE device_number = @device_number - AND point = @point - AND start_timestamp = @start_timestamp; - - INSERT INTO archive_water_meter_month ( - device_number, - point, - start_timestamp, - end_timestamp, - count_rawdata, - min_rawdata, - max_rawdata, - avg_rawdata, - sum_rawdata, - is_complete, - repeat_times, - fail_reason) - SELECT - @device_number, - @point, - @start_timestamp, - @end_timestamp, - @count_rawdata, - @min_rawdata, - @max_rawdata, - @avg_rawdata, - @sum_rawdata, - @is_complete, - @repeat_times, - @fail_reason - WHERE ROW_COUNT() = 0;"; - - var mySql = $@"BEGIN TRANSACTION; - - UPDATE archive_water_meter_month SET - count_rawdata = @count_rawdata, - min_rawdata = @min_rawdata, - max_rawdata = @max_rawdata, - avg_rawdata = @avg_rawdata, - sum_rawdata = @sum_rawdata, - is_complete = @is_complete, - repeat_times = @repeat_times, - fail_reason = @fail_reason, - updated_at = @updated_at - WHERE device_number = @device_number - AND point = @point - AND start_timestamp = @start_timestamp; - - IF @@ROWCOUNT = 0 - BEGIN - INSERT INTO archive_water_meter_month ( - device_number, - point, - start_timestamp, - end_timestamp, - count_rawdata, - min_rawdata, - max_rawdata, - avg_rawdata, - sum_rawdata, - is_complete, - repeat_times, - fail_reason) - VALUES ( - @device_number, - @point, - @start_timestamp, - @end_timestamp, - @count_rawdata, - @min_rawdata, - @max_rawdata, - @avg_rawdata, - @sum_rawdata, - @is_complete, - @repeat_times, - @fail_reason) - END - - COMMIT TRANSACTION;"; - await backgroundServiceRepository.ExecuteSql(sql, waterArchiveMonthRawDatas); - if (!string.IsNullOrEmpty(saveToMSDB) && saveToMSDB == "1") - { - await backgroundServiceMsSqlRepository.ExecuteSql(mySql, waterArchiveMonthRawDatas); - } - } - await task_Detail.InsertWorkTime_End("ArchiveElectricMeterDayJob", "Month", "任務完成"); - } - catch (Exception exception) - { - await task_Detail.WorkFail("ArchiveElectricMeterDayJob", "Month", exception.ToString()); - logger.LogError("【ArchiveElectricMeterDayJob】【月歸檔】【任務失敗】"); - logger.LogError("【ArchiveElectricMeterDayJob】【月歸檔】【任務失敗】[Exception]：{0}", exception.ToString()); - } - } - #endregion 月歸檔 - - #region 補償機制 - //取得連線字串 - if (await task_Detail.GetNeedWorkTask("ArchiveElectricMeterDayJob", "Compensate")) - { - try - { - await task_Detail.InsertWorkTime("ArchiveElectricMeterDayJob", "Compensate", "水電表補償任務開始"); - ProcEletricMeterService procEletricMeterService = new ProcEletricMeterService(backgroundServiceRepository, backgroundServiceMsSqlRepository); - await procEletricMeterService.ArchiveData(); - await task_Detail.InsertWorkTime_End("ArchiveElectricMeterDayJob", "Compensate", "任務完成"); - } - catch(Exception ex) - { - await task_Detail.WorkFail("ArchiveElectricMeterDayJob", "Compensate", ex.ToString()); - logger.LogError("【ArchiveElectricMeterDayJob】【補償機制】【任務失敗】"); - logger.LogError("【ArchiveElectricMeterDayJob】【補償機制】【任務失敗】[Exception]：{0}", ex.ToString()); - } - } - #endregion 補償機制 - - await task_Detail.InsertWorkTime_End("ArchiveElectricMeterDayJob", "All","任務完成"); - } - } - catch (Exception exception) - { - await task_Detail.WorkFail("ArchiveElectricMeterDayJob", "All", exception.ToString()); - logger.LogError("【ArchiveElectricMeterDayJob】【任務失敗】"); - logger.LogError("【ArchiveElectricMeterDayJob】【任務失敗】[Exception]：{0}", exception.ToString()); - } - } - - private List> ArrangeRawData(DeviceNumberPoint deviceNumberPoint, JObject jsonResult) - { - List> arrangeRawDatas = new List>(); - var histories = jsonResult["obj"]["list"]; - var rawdateCount = Convert.ToInt32(jsonResult["obj"]["int"]["@val"].ToString()); - - if(rawdateCount == 0) - { - return null; - } - - if (histories != null && histories.HasValues) - { - if (rawdateCount > 1) - { //多筆資料 - foreach (var history in histories) - { - Dictionary arrangeRawData = new Dictionary(); - arrangeRawData.Add("@device_number", deviceNumberPoint.DeviceNumber); - arrangeRawData.Add("@point", deviceNumberPoint.Point); - - //時間 - if (history["abstime"] != null && history["abstime"].HasValues) - { - foreach (var abstime in history["abstime"]) - { - var name = abstime["@name"].ToString(); - switch (name) - { - case "start": - var startTimstamp = Convert.ToDateTime(abstime["@val"].ToString()).ToString("yyyy-MM-dd HH:mm:ss"); - arrangeRawData.Add("@start_timestamp", startTimstamp); - break; - case "end": - var endTimstamp = Convert.ToDateTime(abstime["@val"].ToString()).ToString("yyyy-MM-dd HH:mm:ss"); - arrangeRawData.Add("@end_timestamp", endTimstamp); - break; - } - } - } - - //區間內資料筆數 - if (history["int"] != null && history["int"].HasValues) - { - var count = Convert.ToInt32(histories["obj"]["int"]["@val"].ToString()); - arrangeRawData.Add("@count_rawdata", count); - } - - //整合數值(最大、最小、平均、總和) - if (history["real"] != null && history["real"].HasValues) - { - foreach (var real in history["real"]) - { - var name = real["@name"].ToString(); - switch (name) - { - case "min": - var min = Convert.ToDecimal(real["@val"].ToString()); - arrangeRawData.Add("@min_rawdata", min); - break; - case "max": - var max = Convert.ToDecimal(real["@val"].ToString()); - arrangeRawData.Add("@max_rawdata", max); - break; - case "avg": - var avg = Convert.ToDecimal(real["@val"].ToString()); - arrangeRawData.Add("@avg_rawdata", avg); - break; - case "sum": - var sum = Decimal.Parse(real["@val"].ToString(), System.Globalization.NumberStyles.Float); - arrangeRawData.Add("@sum_rawdata", sum); - break; - } - } - } - arrangeRawData.Add("@is_complete", 1); - arrangeRawData.Add("@repeat_times", 0); - arrangeRawData.Add("@fail_reason", null); - arrangeRawData.Add("@updated_at", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")); - - arrangeRawDatas.Add(arrangeRawData); - } - } - else - { //單筆資料 - Dictionary arrangeRawData = new Dictionary(); - arrangeRawData.Add("@device_number", deviceNumberPoint.DeviceNumber); - arrangeRawData.Add("@point", deviceNumberPoint.Point); - - //時間 - if (histories["obj"]["abstime"] != null && histories["obj"]["abstime"].HasValues) - { - foreach (var abstime in histories["obj"]["abstime"]) - { - var name = abstime["@name"].ToString(); - switch (name) - { - case "start": - var startTimstamp = Convert.ToDateTime(abstime["@val"].ToString()).ToString("yyyy-MM-dd HH:mm:ss"); - arrangeRawData.Add("@start_timestamp", startTimstamp); - break; - case "end": - var endTimstamp = Convert.ToDateTime(abstime["@val"].ToString()).ToString("yyyy-MM-dd HH:mm:ss"); - arrangeRawData.Add("@end_timestamp", endTimstamp); - break; - } - } - } - - //區間內資料筆數 - if (histories["obj"]["int"] != null && histories["obj"]["int"].HasValues) - { - var count = Convert.ToInt32(histories["obj"]["int"]["@val"].ToString()); - arrangeRawData.Add("@count_rawdata", count); - } - - //整合數值(最大、最小、平均、總和) - if (histories["obj"]["real"] != null && histories["obj"]["real"].HasValues) - { - foreach (var real in histories["obj"]["real"]) - { - var name = real["@name"].ToString(); - switch (name) - { - case "min": - var min = Convert.ToDecimal(real["@val"].ToString()); - arrangeRawData.Add("@min_rawdata", min); - break; - case "max": - var max = Convert.ToDecimal(real["@val"].ToString()); - arrangeRawData.Add("@max_rawdata", max); - break; - case "avg": - var avg = Convert.ToDecimal(real["@val"].ToString()); - arrangeRawData.Add("@avg_rawdata", avg); - break; - case "sum": - var sum = Decimal.Parse(real["@val"].ToString(), System.Globalization.NumberStyles.Float); - arrangeRawData.Add("@sum_rawdata", sum); - break; - } - } - } - arrangeRawData.Add("@is_complete", 1); - arrangeRawData.Add("@repeat_times", 0); - arrangeRawData.Add("@fail_reason", null); - arrangeRawData.Add("@updated_at", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")); - - arrangeRawDatas.Add(arrangeRawData); - } - } - - return arrangeRawDatas; - } - } -} diff --git a/Backend/Quartz/Jobs/ArchiveElectricMeterHourJob.cs b/Backend/Quartz/Jobs/ArchiveElectricMeterHourJob.cs deleted file mode 100644 index dda8ae2..0000000 --- a/Backend/Quartz/Jobs/ArchiveElectricMeterHourJob.cs +++ /dev/null @@ -1,335 +0,0 @@ -using Backend.Models; -using Microsoft.Extensions.Logging; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; -using Quartz; -using Repository.BackendRepository.Interface; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Linq; -using System.Net; -using System.Text; -using System.Threading.Tasks; -using System.Xml; - -namespace Backend.Quartz.Jobs -{ - /// - /// 電錶歸檔，每小時執行，只執行小時歸檔 - /// - [DisallowConcurrentExecution] - class ArchiveElectricMeterHourJob : IJob - { - private readonly ILogger logger; - private readonly IBackgroundServiceRepository backgroundServiceRepository; - private readonly ILogger loggers; - - public ArchiveElectricMeterHourJob( - ILogger logger, - IBackgroundServiceRepository backgroundServiceRepository, ILogger loggers) - { - this.logger = logger; - this.backgroundServiceRepository = backgroundServiceRepository; - this.loggers = loggers; - } - - public async Task Execute(IJobExecutionContext context) - { - Task_Detail task_Detail = new Task_Detail(loggers, backgroundServiceRepository); - try - { - if(await task_Detail.GetNeedWorkTask("ArchiveElectricMeterHourJob", "All")) - { - await task_Detail.InsertWorkTime("ArchiveElectricMeterHourJob", "All", "任務開始"); - EDFunction ed = new EDFunction(); - XmlDocument xmlDocument = new XmlDocument(); - - var sqlArchive = $@"SELECT system_value as Value, system_key as Name FROM variable WHERE deleted = 0 AND system_type = 'archiveConfig'"; - - var variableArchive = await backgroundServiceRepository.GetAllAsync(sqlArchive); - var electricMeterGuid = variableArchive.Where(x => x.Name == "ElectricMeterGuid").Select(x => x.Value).FirstOrDefault(); - - #region 找出所有電錶設備 - var sWhere = "deleted = 0 AND sub_system_guid = @sub_system_guid"; - var electricMeters = await backgroundServiceRepository.GetAllAsync("device", sWhere, new { sub_system_guid = electricMeterGuid }); - #endregion 找出所有電錶設備 - - #region 找出所有電錶系統的點位 - var sPointWhere = "deleted = 0 AND sub_system_guid = @sub_system_guid"; - var points = await backgroundServiceRepository.GetAllAsync("device_item", sPointWhere, new { sub_system_guid = electricMeterGuid }); - #endregion 找出所有電錶系統的點位 - - #region 組合出所有電錶設備點位 - List deviceNumberPoints = new List(); - foreach (var electricMeter in electricMeters) - { - foreach (var point in points) - { - DeviceNumberPoint deviceNumberPoint = new DeviceNumberPoint(); - deviceNumberPoint.DeviceNumber = electricMeter.Device_number; - deviceNumberPoint.Point = point.points; - deviceNumberPoint.FullDeviceNumberPoint = string.Format("{0}_{1}", electricMeter.Device_number, point.points); - - deviceNumberPoints.Add(deviceNumberPoint); - } - } - #endregion 組合出所有電錶設備點位 - - #region 取得obix 設定 - var obixApiConfig = new ObixApiConfig(); - - var sqlObix = $@"SELECT system_value as Value, system_key as Name FROM variable WHERE deleted = 0 AND system_type = 'obixConfig'"; - - var variableObix = await backgroundServiceRepository.GetAllAsync(sqlObix); - obixApiConfig.ApiBase = variableObix.Where(x => x.Name == "ApiBase").Select(x => x.Value).FirstOrDefault(); - obixApiConfig.UserName = ed.AESDecrypt(variableObix.Where(x => x.Name == "UserName").Select(x => x.Value).FirstOrDefault()); - obixApiConfig.Password = ed.AESDecrypt(variableObix.Where(x => x.Name == "Password").Select(x => x.Value).FirstOrDefault()); - - String encoded = System.Convert.ToBase64String(System.Text.Encoding.GetEncoding("ISO-8859-1").GetBytes(obixApiConfig.UserName + ":" + obixApiConfig.Password)); - #endregion 取得obix 設定 - - var now = DateTime.Now; - - #region 小時歸檔 - try - { - var preHour = now.AddHours(-1); //取得前一小時 - - var tempHour = string.Empty; - if (preHour.Hour < 10) - { - tempHour = "0" + preHour.Hour.ToString(); - } - else - { - tempHour = preHour.Hour.ToString(); - } - - var startTimestamp = string.Format("{0}T{1}:00:00.000+08:00", preHour.ToString("yyyy-MM-dd"), tempHour); - var endTimestamp = string.Format("{0}T{1}:59:59.000+08:00", preHour.ToString("yyyy-MM-dd"), tempHour); - - var historyQueryFilter = $@" - - - - "; - - //Stopwatch stopWatch = new Stopwatch(); - //stopWatch.Start(); - - //抓取每個設備的資料 - List> archiveHourRawDatas = new List>(); - foreach (var deviceNumberPoint in deviceNumberPoints) - { - - HttpWebRequest archiveHourRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); - //HttpWebRequest archiveHourRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); - archiveHourRequest.Method = "POST"; - archiveHourRequest.Headers.Add("Authorization", "Basic " + encoded); - archiveHourRequest.PreAuthenticate = true; - - byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); - using (Stream reqStream = archiveHourRequest.GetRequestStream()) - { - reqStream.Write(byteArray, 0, byteArray.Length); - } - - HttpWebResponse archiveHourResponse = (HttpWebResponse)archiveHourRequest.GetResponse(); - var archiveHourResponseContent = new StreamReader(archiveHourResponse.GetResponseStream()).ReadToEnd(); - - xmlDocument.LoadXml(archiveHourResponseContent); - string archiveHourJson = JsonConvert.SerializeXmlNode(xmlDocument); - JObject archiveHourJsonResult = (JObject)JsonConvert.DeserializeObject(archiveHourJson); - - if (archiveHourJsonResult.ContainsKey("err")) //抓取錯誤 - { - //logger.LogError("【ArchiveElectricMeterHourJob】【小時歸檔】【取得資料失敗】"); - //logger.LogError("【ArchiveElectricMeterHourJob】【小時歸檔】【取得資料失敗】[錯誤內容]：{0}", archiveHourJsonResult); - - Dictionary archiveHourRawData = new Dictionary(); - archiveHourRawData.Add("@device_number", deviceNumberPoint.DeviceNumber); - archiveHourRawData.Add("@point", deviceNumberPoint.Point); - archiveHourRawData.Add("@start_timestamp", startTimestamp.Replace("T", " ").Substring(0, 19)); - archiveHourRawData.Add("@end_timestamp", endTimestamp.Replace("T", " ").Substring(0, 19)); - archiveHourRawData.Add("@is_complete", 0); - archiveHourRawData.Add("@repeat_times", 0); - archiveHourRawData.Add("@fail_reason", archiveHourJson); - - archiveHourRawDatas.Add(archiveHourRawData); - } - - if (archiveHourJsonResult.ContainsKey("obj")) //表示可以讀取到內容 - { - var histories = archiveHourJsonResult["obj"]["list"]; - var rawdateCount = Convert.ToInt32(archiveHourJsonResult["obj"]["int"]["@val"].ToString()); - if (histories != null && histories.HasValues) - { - if (rawdateCount > 1) - { //多筆資料 - foreach (var history in histories) - { - Dictionary archiveHourRawData = new Dictionary(); - archiveHourRawData.Add("@device_number", deviceNumberPoint.DeviceNumber); - archiveHourRawData.Add("@point", deviceNumberPoint.Point); - - //時間 - if (history["abstime"] != null && history["abstime"].HasValues) - { - foreach (var abstime in history["abstime"]) - { - var name = abstime["@name"].ToString(); - switch (name) - { - case "start": - var startTimstamp = Convert.ToDateTime(abstime["@val"].ToString()).ToString("yyyy-MM-dd HH:mm:ss"); - archiveHourRawData.Add("@start_timestamp", startTimstamp); - break; - case "end": - var endTimstamp = Convert.ToDateTime(abstime["@val"].ToString()).ToString("yyyy-MM-dd HH:mm:ss"); - archiveHourRawData.Add("@end_timestamp", endTimstamp); - break; - } - } - } - - //區間內資料筆數 - if (history["int"] != null && history["int"].HasValues) - { - var count = Convert.ToInt32(histories["obj"]["int"]["@val"].ToString()); - archiveHourRawData.Add("@count_rawdata", count); - } - - //整合數值(最大、最小、平均、總和) - if (history["real"] != null && history["real"].HasValues) - { - foreach (var real in history["real"]) - { - var name = real["@name"].ToString(); - switch (name) - { - case "min": - var min = Convert.ToDecimal(real["@val"].ToString()); - archiveHourRawData.Add("@min_rawdata", min); - break; - case "max": - var max = Convert.ToDecimal(real["@val"].ToString()); - archiveHourRawData.Add("@max_rawdata", max); - break; - case "avg": - var avg = Convert.ToDecimal(real["@val"].ToString()); - archiveHourRawData.Add("@avg_rawdata", avg); - break; - case "sum": - var sum = Convert.ToDecimal(real["@val"].ToString()); - archiveHourRawData.Add("@sum_rawdata", sum); - break; - } - } - } - archiveHourRawData.Add("@is_complete", 1); - - archiveHourRawDatas.Add(archiveHourRawData); - } - } - else - { //單筆資料 - Dictionary archiveHourRawData = new Dictionary(); - archiveHourRawData.Add("@device_number", deviceNumberPoint.DeviceNumber); - archiveHourRawData.Add("@point", deviceNumberPoint.Point); - - //時間 - if (histories["obj"]["abstime"] != null && histories["obj"]["abstime"].HasValues) - { - foreach (var abstime in histories["obj"]["abstime"]) - { - var name = abstime["@name"].ToString(); - switch (name) - { - case "start": - var startTimstamp = Convert.ToDateTime(abstime["@val"].ToString()).ToString("yyyy-MM-dd HH:mm:ss"); - archiveHourRawData.Add("@start_timestamp", startTimstamp); - break; - case "end": - var endTimstamp = Convert.ToDateTime(abstime["@val"].ToString()).ToString("yyyy-MM-dd HH:mm:ss"); - archiveHourRawData.Add("@end_timestamp", endTimstamp); - break; - } - } - } - - //區間內資料筆數 - if (histories["obj"]["int"] != null && histories["obj"]["int"].HasValues) - { - var count = Convert.ToInt32(histories["obj"]["int"]["@val"].ToString()); - archiveHourRawData.Add("@count_rawdata", count); - } - - //整合數值(最大、最小、平均、總和) - if (histories["obj"]["real"] != null && histories["obj"]["real"].HasValues) - { - foreach (var real in histories["obj"]["real"]) - { - var name = real["@name"].ToString(); - switch (name) - { - case "min": - var min = Convert.ToDecimal(real["@val"].ToString()); - archiveHourRawData.Add("@min_rawdata", min); - break; - case "max": - var max = Convert.ToDecimal(real["@val"].ToString()); - archiveHourRawData.Add("@max_rawdata", max); - break; - case "avg": - var avg = Convert.ToDecimal(real["@val"].ToString()); - archiveHourRawData.Add("@avg_rawdata", avg); - break; - case "sum": - var sum = Convert.ToDecimal(real["@val"].ToString()); - archiveHourRawData.Add("@sum_rawdata", sum); - break; - } - } - } - archiveHourRawData.Add("@is_complete", 1); - - archiveHourRawDatas.Add(archiveHourRawData); - } - } - } - } - - //stopWatch.Stop(); - //logger.LogInformation("【ArchiveElectricMeterHourJob】【小時歸檔】【效能檢驗】[取得資料花費時間]{0} 毫秒", stopWatch.ElapsedMilliseconds); - - if (archiveHourRawDatas.Count() > 0) - { - await backgroundServiceRepository.AddMutiByCustomTable(archiveHourRawDatas, "archive_electric_meter_hour"); - } - - - await task_Detail.InsertWorkTime_End("ArchiveElectricMeterHourJob", "All", "任務完成"); - } - catch (Exception exception) - { - await task_Detail.WorkFail("ArchiveElectricMeterHourJob", "All", exception.ToString()); - logger.LogError("【ArchiveElectricMeterHourJob】【小時歸檔】【任務失敗】"); - logger.LogError("【ArchiveElectricMeterHourJob】【小時歸檔】【任務失敗】[Exception]：{0}", exception.ToString()); - } - #endregion 小時歸檔 - - - } - - } - catch (Exception exception) - { - await task_Detail.WorkFail("ArchiveElectricMeterHourJob", "All", exception.ToString()); - logger.LogError("【ArchiveElectricMeterHourJob】【任務失敗】"); - logger.LogError("【ArchiveElectricMeterHourJob】【任務失敗】[Exception]：{0}", exception.ToString()); - } - } - } -} diff --git a/Backend/Quartz/Jobs/DataDeliveryJob.cs b/Backend/Quartz/Jobs/DataDeliveryJob.cs deleted file mode 100644 index 7a2b7b9..0000000 --- a/Backend/Quartz/Jobs/DataDeliveryJob.cs +++ /dev/null @@ -1,269 +0,0 @@ -using Backend.Models; -using Microsoft.AspNetCore.Http; -using Microsoft.Extensions.Logging; -using Newtonsoft.Json.Linq; -using Quartz; -using Repository.BackendRepository.Interface; -using System; -using System.Collections.Generic; -using System.IO; -using System.Net; -using System.Text; -using System.Text.Json; -using System.Threading.Tasks; - -namespace Backend.Quartz.Jobs -{ - [DisallowConcurrentExecution] - class DataDeliveryJob : IJob - { - private readonly ILogger logger; - private readonly IBackgroundServiceRepository backgroundServiceRepository; - - public DataDeliveryJob( - ILogger logger, - IBackgroundServiceRepository backgroundServiceRepository) - { - this.logger = logger; - this.backgroundServiceRepository = backgroundServiceRepository; - } - - public async Task Execute(IJobExecutionContext context) - { - Dictionary insertLog = new Dictionary() - { - { "@task_id", 0 }, - { "@log_level", "" }, - { "@log_content", "" } - }; - - try - { - logger.LogInformation("【DataDeliveryJob】【任務開始】"); - insertLog["@log_level"] = $@"INFO"; - insertLog["@log_content"] = $@"【DataDeliveryJob】任務開始"; - await backgroundServiceRepository.AddOneByCustomTable(insertLog, "background_service_task_log"); - - //找出所有要派送的資料 - string sWhere = @"is_complete = 0 AND task_type = @Task_type AND repeat_times < 10"; - var backgroundServiceTasks = await backgroundServiceRepository.GetAllAsync("background_service_task", sWhere, new { Task_type = BackgroundServiceTaskType.data_delivery }); - - if (backgroundServiceTasks.Count == 0) - { - logger.LogInformation("【DataDeliveryJob】【查無任務列表】"); - - insertLog["@log_level"] = $@"INFO"; - insertLog["@log_content"] = $@"【DataDeliveryJob】查無任務列表"; - await backgroundServiceRepository.AddOneByCustomTable(insertLog, "background_service_task_log"); - } - else - { - List> updateObjs = new List>(); - foreach (var task in backgroundServiceTasks) - { - var DateTimeNow = DateTime.Now; - Dictionary updateObj = new Dictionary() - { - { "Id", task.Id }, - { "@repeat_times", 0 }, - { "@is_complete", 0 }, - { "@fail_reason", null }, - { "@complete_at", null }, - { "@updated_at", DateTimeNow } - }; - - insertLog["@task_id"] = task.Id; - - //var parameters = JsonSerializer.Deserialize>(task.Target_data); - try - { - logger.LogInformation("【DataDeliveryJob】【開始派送】[棟別IP]：{0}", task.Target_ip); - insertLog["@log_level"] = $@"INFO"; - insertLog["@log_content"] = $@"開始派送"; - await backgroundServiceRepository.AddOneByCustomTable(insertLog, "background_service_task_log"); - - var boundary = "----------------------------" + DateTime.Now.Ticks.ToString("x"); - - var boundaryBytes = Encoding.ASCII.GetBytes("\r\n--" + boundary + "\r\n"); - var endBoundaryBytes = Encoding.ASCII.GetBytes("\r\n--" + boundary + "--"); - - HttpWebRequest Postrequest = (HttpWebRequest)WebRequest.Create($"http://{task.Target_ip}/api/ReceiveDataDelivery/GetData"); - Postrequest.ContentType = "multipart/form-data; boundary=" + boundary; - Postrequest.Method = "POST"; - - if (!string.IsNullOrEmpty(task.Target_table)) - { - using (Stream requestStream = Postrequest.GetRequestStream()) - { - //Id - requestStream.Write(boundaryBytes, 0, boundaryBytes.Length); - string task_id = "Content-Disposition: form-data; name=\"" + "Id" + "\"\r\n\r\n" + task.Id; - byte[] task_id_bytes = System.Text.Encoding.UTF8.GetBytes(task_id); - requestStream.Write(task_id_bytes, 0, task_id_bytes.Length); - - //Target Table - requestStream.Write(boundaryBytes, 0, boundaryBytes.Length); - string target_table = "Content-Disposition: form-data; name=\"" + "TargetTable" + "\"\r\n\r\n" + task.Target_table; - byte[] target_table_bytes = System.Text.Encoding.UTF8.GetBytes(target_table); - requestStream.Write(target_table_bytes, 0, target_table_bytes.Length); - - //mode - requestStream.Write(boundaryBytes, 0, boundaryBytes.Length); - string target_mode = "Content-Disposition: form-data; name=\"" + "mode" + "\"\r\n\r\n" + task.Mode; - byte[] target_mode_bytes = System.Text.Encoding.UTF8.GetBytes(target_mode); - requestStream.Write(target_mode_bytes, 0, target_mode_bytes.Length); - - //Target data - requestStream.Write(boundaryBytes, 0, boundaryBytes.Length); - string target_data = "Content-Disposition: form-data; name=\"" + "TargetData" + "\"\r\n\r\n" + task.Target_data; - byte[] target_data_bytes = System.Text.Encoding.UTF8.GetBytes(target_data); - requestStream.Write(target_data_bytes, 0, target_data_bytes.Length); - - //解析Files - if (task.Target_files != null) - { - var target_files = JsonSerializer.Deserialize>(task.Target_files); - var file_index = 0; - - foreach (var file in target_files) - { - //file Folder - requestStream.Write(boundaryBytes, 0, boundaryBytes.Length); - string file_folder = "Content-Disposition: form-data; name=\"" + $"FileInfos[{file_index}].Folder" + "\"\r\n\r\n" + file.Folder; - byte[] file_folder_bytes = System.Text.Encoding.UTF8.GetBytes(file_folder); - requestStream.Write(file_folder_bytes, 0, file_folder_bytes.Length); - - //file OriginalFileName - requestStream.Write(boundaryBytes, 0, boundaryBytes.Length); - string orig_file_name = "Content-Disposition: form-data; name=\"" + $"FileInfos[{file_index}].OriginalFileName" + "\"\r\n\r\n" + file.OriginalFileName; - byte[] orig_file_name_bytes = System.Text.Encoding.UTF8.GetBytes(orig_file_name); - requestStream.Write(orig_file_name_bytes, 0, orig_file_name_bytes.Length); - - //file FileName - requestStream.Write(boundaryBytes, 0, boundaryBytes.Length); - string file_name = "Content-Disposition: form-data; name=\"" + $"FileInfos[{file_index}].FileName" + "\"\r\n\r\n" + file.FileName; - byte[] file_name_bytes = System.Text.Encoding.UTF8.GetBytes(file_name); - requestStream.Write(file_name_bytes, 0, file_name_bytes.Length); - - //取得Content-Type - var content_type = string.Empty; - string ext = Path.GetExtension(file.File); - using (Microsoft.Win32.RegistryKey registryKey = Microsoft.Win32.Registry.ClassesRoot.OpenSubKey(ext)) - { - if (registryKey != null) - { - var value = registryKey.GetValue("Content Type"); - if (value != null) - { - content_type = value.ToString(); - } - } - } - - if (file.File != null) - { - string file_header = "Content-Disposition: form-data; name=\"" + $"FileInfos[{file_index}].File" + "\"; filename=\"" + file.FileName + "\"\r\nContent-Type: " + content_type + "\r\n\r\n"; - byte[] file_header_bytes = System.Text.Encoding.UTF8.GetBytes(file_header); - - requestStream.Write(boundaryBytes, 0, boundaryBytes.Length); - requestStream.Write(file_header_bytes, 0, file_header_bytes.Length); - byte[] buffer = new byte[32768]; - int bytesRead; - - // upload from file - using (FileStream fileStream = File.OpenRead(file.File)) - { - while ((bytesRead = fileStream.Read(buffer, 0, buffer.Length)) != 0) - requestStream.Write(buffer, 0, bytesRead); - fileStream.Close(); - } - } - } - } - - requestStream.Write(endBoundaryBytes, 0, endBoundaryBytes.Length); - requestStream.Close(); - } - } - - HttpWebResponse response = (HttpWebResponse)Postrequest.GetResponse(); - var responseString = new StreamReader(response.GetResponseStream()).ReadToEnd(); - var statusNumber = (int)response.StatusCode; - if (statusNumber != 200) - { - logger.LogError("【DataDeliveryJob】【派送失敗】[棟別IP]：{0}", task.Target_ip); - logger.LogError("【DataDeliveryJob】【派送失敗】[response]：{0}", responseString); - updateObj["@repeat_times"] = task.Repeat_times + 1; - updateObj["@fail_reason"] = responseString; - - insertLog["@log_level"] = $@"ERR"; - insertLog["@log_content"] = $@"派送失敗 - [失敗原因]：{responseString}"; - await backgroundServiceRepository.AddOneByCustomTable(insertLog, "background_service_task_log"); - } - else - { - //解析回傳內容 - var final = JObject.Parse(responseString); - var code = final["code"].ToString(); - if (code == "0000") - { - logger.LogInformation("【DataDeliveryJob】【派送成功】[棟別IP]：{0}", task.Target_ip); - updateObj["@repeat_times"] = task.Repeat_times; - updateObj["@is_complete"] = 1; - updateObj["@complete_at"] = DateTime.Now; - - insertLog["@log_level"] = $@"INFO"; - insertLog["@log_content"] = $@"派送成功"; - await backgroundServiceRepository.AddOneByCustomTable(insertLog, "background_service_task_log"); - } - else - { - logger.LogError("【DataDeliveryJob】【派送失敗】[棟別IP]：{0}", task.Target_ip); - logger.LogError("【DataDeliveryJob】【派送失敗】[response]：{0}", responseString); - updateObj["@repeat_times"] = task.Repeat_times + 1; - updateObj["@fail_reason"] = responseString; - - insertLog["@log_level"] = $@"ERR"; - insertLog["@log_content"] = $@"派送失敗 - [失敗原因]：{responseString}"; - await backgroundServiceRepository.AddOneByCustomTable(insertLog, "background_service_task_log"); - } - } - } - catch (Exception exception) - { - logger.LogError("【DataDeliveryJob】【派送失敗】[棟別IP]：{0}", task.Target_ip); - logger.LogError("【DataDeliveryJob】【派送失敗】[Exception]：{0}", exception.ToString()); - updateObj["@repeat_times"] = task.Repeat_times + 1; - updateObj["@fail_reason"] = exception.ToString(); - - insertLog["@log_level"] = $@"ERR"; - insertLog["@log_content"] = $@"派送失敗 - [失敗原因(Exception)]：{exception.ToString()}"; - await backgroundServiceRepository.AddOneByCustomTable(insertLog, "background_service_task_log"); - } - - updateObjs.Add(updateObj); - } - - await backgroundServiceRepository.UpdateListByCustomTable(updateObjs, "background_service_task", "id = @Id"); - logger.LogInformation("【DataDeliveryJob】【任務完成】"); - - insertLog["@task_id"] = 0; - insertLog["@log_level"] = $@"INFO"; - insertLog["@log_content"] = $@"任務完成"; - await backgroundServiceRepository.AddOneByCustomTable(insertLog, "background_service_task_log"); - } - } - catch (Exception exception) - { - logger.LogError("【DataDeliveryJob】【任務失敗】"); - logger.LogError("【DataDeliveryJob】【任務失敗】[Exception]：{0}", exception.ToString()); - - insertLog["@task_id"] = 0; - insertLog["@log_level"] = $@"ERR"; - insertLog["@log_content"] = $@"任務失敗"; - await backgroundServiceRepository.AddOneByCustomTable(insertLog, "background_service_task_log"); - } - - } - } -} diff --git a/Backend/Quartz/Jobs/ExecutionBackgroundServicePlanJob.cs b/Backend/Quartz/Jobs/ExecutionBackgroundServicePlanJob.cs deleted file mode 100644 index fae06f2..0000000 --- a/Backend/Quartz/Jobs/ExecutionBackgroundServicePlanJob.cs +++ /dev/null @@ -1,113 +0,0 @@ -using Backend.Models; -using Microsoft.Extensions.Logging; -using Quartz; -using Repository.BackendRepository.Interface; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading.Tasks; - -namespace Backend.Quartz.Jobs -{ - [DisallowConcurrentExecution] - public class ExecutionBackgroundServicePlanJob : IJob - { - private readonly ILogger logger; - private readonly IBackgroundServiceRepository backgroundServiceRepository; - - public ExecutionBackgroundServicePlanJob( - ILogger logger, - IBackgroundServiceRepository backgroundServiceRepository) - { - this.logger = logger; - this.backgroundServiceRepository = backgroundServiceRepository; - } - - public async Task Execute(IJobExecutionContext context) - { - try - { - logger.LogInformation("【ExecutionBackgroundServicePlanJob】【任務開始】"); - - // 找出當前在起始與結束時間所有計畫 - var DateTimeNow = DateTime.Now; - var sPlanWhere = @"deleted = 0 - AND - ( - @DateTimeNow Between start_time AND end_time - OR (end_time IS NULL AND @DateTimeNow > start_time) - ) - "; - var backgroundServicePlans = await backgroundServiceRepository.GetAllAsync("background_service_plan", sPlanWhere, new { DateTimeNow = DateTimeNow.ToString("yyyy-MM-dd HH:mm:ss") }); - - foreach (var plan in backgroundServicePlans) - { - //logger.LogInformation("【ExecutionBackgroundServicePlanJob】【計畫編號：{0}，計畫名稱：{1}】 - 開始生成下次任務項目", plan.Id, plan.Plane_name); - #region 紀錄最後生成任務的時間 - try - { - var lastCreateTime = Convert.ToDateTime(plan.Last_create_time); - if (lastCreateTime == default(DateTime)) - { - lastCreateTime = Convert.ToDateTime(plan.Start_time); - } - - DateTime nextCreateTime; //下次待生成的時間 - nextCreateTime = plan.Execution_type switch - { - (byte)ExecutionTypeEnum.Min => Convert.ToDateTime(lastCreateTime).AddMinutes(plan.Execution_time), - (byte)ExecutionTypeEnum.Hour => Convert.ToDateTime(lastCreateTime).AddHours(plan.Execution_time), - (byte)ExecutionTypeEnum.Day => Convert.ToDateTime(lastCreateTime).AddDays(plan.Execution_time), - (byte)ExecutionTypeEnum.Week => Convert.ToDateTime(lastCreateTime).AddDays(plan.Execution_time * 7), - (byte)ExecutionTypeEnum.Month => Convert.ToDateTime(lastCreateTime).AddMonths(plan.Execution_time), - _ => default(DateTime) - }; - - if (nextCreateTime != default(DateTime) && nextCreateTime < DateTimeNow) - { - Dictionary servicePlanDic = new Dictionary() - { - { "@last_create_time", nextCreateTime}, - { "@updated_at", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}, - }; - - await backgroundServiceRepository.UpdateOneByCustomTable(servicePlanDic, "background_service_plan", "id=" + plan.Id + ""); - - #region 建立任務 - try - { - BackgroundServiceTask backgroundServiceTask = new BackgroundServiceTask() - { - - }; - } - catch(Exception exception) - { - - } - #endregion 建立任務 - } - - } - catch (Exception exception) - { - //logger.LogError("【ExecutionBackgroundServicePlanJob】【計畫編號：{0}，計畫名稱：{1}】 - 產生下次任務時間失敗", plan.Id, plan.Plane_name); - //logger.LogError("【ExecutionBackgroundServicePlanJob】【計畫編號：{0}，計畫名稱：{1}】 - 產生下次任務時間失敗[Exception]- {2}", plan.Id, plan.Plane_name, exception.Message); ; - } - #endregion 紀錄最後該生成任務的時間 - - } - - - - logger.LogInformation("【ExecutionBackgroundServicePlanJob】【任務完成】"); - } - catch (Exception exception) - { - logger.LogError("【ExecutionBackgroundServicePlanJob】【任務失敗】"); - logger.LogError("【ExecutionBackgroundServicePlanJob】【任務失敗】[Exception]：{0}", exception.Message); ; - } - - } - } -} diff --git a/Backend/Quartz/Jobs/MessageNotificationJob.cs b/Backend/Quartz/Jobs/MessageNotificationJob.cs deleted file mode 100644 index 50e6100..0000000 --- a/Backend/Quartz/Jobs/MessageNotificationJob.cs +++ /dev/null @@ -1,163 +0,0 @@ -using Backend.Models; -using BackendWorkerService.Services.Interface; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Options; -using Quartz; -using Repository.BackendRepository.Interface; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading.Tasks; - -namespace Backend.Quartz.Jobs -{ - [DisallowConcurrentExecution] - class MessageNotificationJob : IJob - { - private readonly ILogger logger; - private readonly IBackgroundServiceRepository backgroundServiceRepository; - - private readonly ISendEmailService sendEmailService; - private readonly ISendSMSService sendSMSService; - private readonly ISendLineNotifyService sendLineNotifyService; - - - public MessageNotificationJob( - ILogger logger, - IBackgroundServiceRepository backgroundServiceRepository, - ISendEmailService sendEmailService, - ISendSMSService sendSMSService, - ISendLineNotifyService sendLineNotifyService) - { - this.logger = logger; - this.backgroundServiceRepository = backgroundServiceRepository; - this.sendEmailService = sendEmailService; - this.sendSMSService = sendSMSService; - this.sendLineNotifyService = sendLineNotifyService; - } - - public async Task Execute(IJobExecutionContext context) - { - Dictionary insertLog = new Dictionary() - { - { "@task_id", 0 }, - { "@log_level", "" }, - { "@log_content", "" } - }; - - try - { - logger.LogInformation("【MessageNotificationJob】【任務開始】"); - insertLog["@log_level"] = $@"INFO"; - insertLog["@log_content"] = $@"任務開始"; - await backgroundServiceRepository.AddOneByCustomTable(insertLog, "background_service_message_notification_task_log"); - - //找出所有要通知的清單 - string sWhere = @"is_complete = 0"; - var messageNotificationTasks = await backgroundServiceRepository.GetAllAsync("background_service_message_notification_task", sWhere); - - if(messageNotificationTasks.Count == 0) - { - logger.LogInformation("【MessageNotificationJob】【查無任務列表】"); - - insertLog["@log_level"] = $@"INFO"; - insertLog["@log_content"] = $@"查無任務列表"; - await backgroundServiceRepository.AddOneByCustomTable(insertLog, "background_service_message_notification_task_log"); - } - else - { - List> updateObjs = new List>(); - foreach (var task in messageNotificationTasks) - { - var DateTimeNow = DateTime.Now; - Dictionary updateObj = new Dictionary() - { - { "Id", task.Id }, - { "@updated_at", DateTimeNow } - }; - - try - { - switch (task.Task_type) - { - case (byte)MessageNotificationTaskType.email: - List recipientEmails = new List() - { - task.Recipient_email - }; - - if (sendEmailService.Send(task.Id, recipientEmails, task.Email_subject, task.Message_content)) - { - updateObj.Add("@is_complete", 1); - updateObj.Add("@complete_at", DateTimeNow); - } - else - { - updateObj.Add("@repeat_times", task.Repeat_times + 1); - } - - updateObjs.Add(updateObj); - break; - case (byte)MessageNotificationTaskType.sms: - if (sendSMSService.Send(task.Id, task.Recipient_phone, task.Message_content)) - { - updateObj.Add("@is_complete", 1); - updateObj.Add("@complete_at", DateTimeNow); - } - else - { - updateObj.Add("@repeat_times", task.Repeat_times + 1); - } - - updateObjs.Add(updateObj); - break; - case (byte)MessageNotificationTaskType.line_notify: - if (sendLineNotifyService.Send(task.Id, task.Line_token, task.Message_content)) - { - updateObj.Add("@is_complete", 1); - updateObj.Add("@complete_at", DateTimeNow); - } - else - { - updateObj.Add("@repeat_times", task.Repeat_times + 1); - } - - updateObjs.Add(updateObj); - break; - } - } - catch(Exception exception) - { - logger.LogError("【MessageNotificationJob】【通知失敗】[任務id]：{0}", task.Id); - logger.LogError("【MessageNotificationJob】【通知失敗】[Exception]：{0}", exception.ToString()); - - insertLog["@log_level"] = $@"ERR"; - insertLog["@log_content"] = $@"通知失敗 - [失敗原因(Exception)]：{exception.ToString()}"; - await backgroundServiceRepository.AddOneByCustomTable(insertLog, "background_service_message_notification_task_log"); - } - - } - - await backgroundServiceRepository.UpdateListByCustomTable(updateObjs, "background_service_message_notification_task", "id = @Id"); - logger.LogInformation("【MessageNotificationJob】【任務完成】"); - - insertLog["@task_id"] = 0; - insertLog["@log_level"] = $@"INFO"; - insertLog["@log_content"] = $@"任務完成"; - await backgroundServiceRepository.AddOneByCustomTable(insertLog, "background_service_message_notification_task_log"); - } - } - catch (Exception exception) - { - logger.LogError("【MessageNotificationJob】【任務失敗】"); - logger.LogError("【MessageNotificationJob】【任務失敗】[Exception]：{0}", exception.ToString()); - - insertLog["@task_id"] = 0; - insertLog["@log_level"] = $@"ERR"; - insertLog["@log_content"] = $@"任務失敗"; - await backgroundServiceRepository.AddOneByCustomTable(insertLog, "background_service_message_notification_task_log"); - } - - } - } -} diff --git a/Backend/Quartz/Jobs/ParkingJob.cs b/Backend/Quartz/Jobs/ParkingJob.cs deleted file mode 100644 index 2486bf4..0000000 --- a/Backend/Quartz/Jobs/ParkingJob.cs +++ /dev/null @@ -1,324 +0,0 @@ -using Backend.Models; -using Microsoft.Extensions.Logging; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; -using Quartz; -using Repository.BackendRepository.Interface; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Linq; -using System.Net; -using System.Text; -using System.Threading.Tasks; -using System.Xml; - -namespace Backend.Quartz.Jobs -{ - /// - /// 停車場管理 - /// - [DisallowConcurrentExecution] - class ParkingJob : IJob - { - private readonly ILogger logger; - private readonly IBackgroundServiceRepository backgroundServiceRepository; - private readonly IBackendRepository backendRepository; - private readonly ILogger loggers; - - public ParkingJob( - ILogger logger, - IBackgroundServiceRepository backgroundServiceRepository, ILogger loggers, IBackendRepository backendRepository) - { - this.logger = logger; - this.backgroundServiceRepository = backgroundServiceRepository; - this.backendRepository = backendRepository; - this.loggers = loggers; - } - - public async Task Execute(IJobExecutionContext context) - { - Task_Detail task_Detail = new Task_Detail(loggers, backendRepository); - try - { - if(await task_Detail.GetNeedWorkTask("ParkingJob", "All")) - { - await task_Detail.InsertWorkTime("ParkingJob", "All", "任務開始"); - EDFunction ed = new EDFunction(); - var parkingConfig = new ParkingConfig(); - - var sqlParking = $@"SELECT system_value as Value, system_key as Name FROM variable WHERE deleted = 0 AND system_type = 'parkingConfig'"; - - var variable = await backgroundServiceRepository.GetAllAsync(sqlParking); - parkingConfig.Host = variable.Where(x => x.Name == "Host").Select(x => x.Value).FirstOrDefault(); - parkingConfig.Prefix = variable.Where(x => x.Name == "Prefix").Select(x => x.Value).FirstOrDefault(); - parkingConfig.ApiBase = variable.Where(x => x.Name == "ApiBase").Select(x => x.Value).FirstOrDefault(); - parkingConfig.UserName = ed.AESDecrypt(variable.Where(x => x.Name == "UserName").Select(x => x.Value).FirstOrDefault()); - parkingConfig.Password = ed.AESDecrypt(variable.Where(x => x.Name == "Password").Select(x => x.Value).FirstOrDefault()); - - String encoded = System.Convert.ToBase64String(System.Text.Encoding.GetEncoding("ISO-8859-1").GetBytes(parkingConfig.UserName + ":" + parkingConfig.Password)); - - #region 取得停車場資訊 - if (await task_Detail.GetNeedWorkTask("ParkingJob", "Parking")) - { - try - { - await task_Detail.InsertWorkTime("ParkingJob", "Parking", "開始執行停車場剩餘車位Job"); - HttpWebRequest spaceRequest = (HttpWebRequest)WebRequest.Create($"{parkingConfig.Host}{parkingConfig.Prefix}/api/space/details"); - spaceRequest.Method = "GET"; - //request.Headers.Add("Authorization", "Basic " + encoded); - spaceRequest.PreAuthenticate = true; - - //Stopwatch stopWatch = new Stopwatch(); - //stopWatch.Start(); - - HttpWebResponse spaceResponse = (HttpWebResponse)spaceRequest.GetResponse(); - var spaceResponseContent = new StreamReader(spaceResponse.GetResponseStream()).ReadToEnd(); - //logger.LogInformation("【ParkingJob】【取得成功停車場車位資訊】"); - //stopWatch.Stop(); - //logger.LogInformation("【ParkingJob】【取得停車場車位資訊】【效能檢驗】[取得資料花費時間]{0} 毫秒", stopWatch.ElapsedMilliseconds); - - var spaceResponseResult = JsonConvert.DeserializeObject(spaceResponseContent); - - //取得停車場車位對應表 - var sqlSapceMapping = $@"SELECT * FROM variable WHERE deleted = 0 AND system_type = 'parkingSapceMapping'"; - var parkingSapceMapping = await backgroundServiceRepository.GetAllAsync(sqlSapceMapping); - - if (spaceResponseResult != null && spaceResponseResult.Code == "20000") - { - foreach (var area in spaceResponseResult.Payload.Areas) - { - //找出對定的設備代碼 - var selectedMapping = parkingSapceMapping.Where(x => x.System_key == area.Name).FirstOrDefault(); - if (selectedMapping != null) - { - var tagName = selectedMapping.system_value; - var apiFormat = @"{0}obix/config/Arena/{1}/{2}/{3}/{4}/{5}/CV/set"; - - var tagNameSplit = tagName.Split("_"); - - var parames = new List(); - parames.Add(parkingConfig.ApiBase); - for (var i = 0; i < tagNameSplit.Length; i++) - { - if (i != tagNameSplit.Length - 1) - { - parames.Add(tagNameSplit[i]); - } - else - { - parames.Add(tagName); - } - } - - HttpWebRequest request = (HttpWebRequest)WebRequest.Create(string.Format(apiFormat, parames.ToArray())); - request.Method = "POST"; - request.Headers.Add("Authorization", "Basic " + encoded); - request.PreAuthenticate = true; - - var real = $@""; - byte[] realByteArray = Encoding.UTF8.GetBytes(real); - using (Stream reqStream = request.GetRequestStream()) - { - reqStream.Write(realByteArray, 0, realByteArray.Length); - } - - HttpWebResponse response = (HttpWebResponse)request.GetResponse(); - var responseContent = new StreamReader(response.GetResponseStream()).ReadToEnd(); - - XmlDocument xmlDocument = new XmlDocument(); - xmlDocument.LoadXml(responseContent); - string json = JsonConvert.SerializeXmlNode(xmlDocument); - JObject jsonResult = (JObject)JsonConvert.DeserializeObject(json); - - if (jsonResult.ContainsKey("err")) //抓取錯誤 - { - logger.LogError("【ParkingJob】【停車場剩餘車位資訊】"); - logger.LogError("【ParkingJob】【停車場剩餘車位資訊】[錯誤內容]：{0}", json); - } - else - { - if (jsonResult.ContainsKey("real")) //表示可以讀取到內容 - { - List> ontimeRawDatas = new List>(); - - var realList = jsonResult["real"]; - var display = realList["@display"]; - if (display != null) - { - var tempStrSplit = display.ToString().Split(" "); - if (tempStrSplit[0] != area.Remain.ToString()) - { - logger.LogError("【ParkingJob】【停車場剩餘車位資訊】[修改失敗]：{0}", display.ToString()); - } - } - } - } - } - else - { - logger.LogWarning("【ParkingJob】【停車場剩餘車位資訊】[查無該名稱對應表]：{0}", area.Name); - } - } - - } - else - { - logger.LogWarning("【ParkingJob】【停車場剩餘車位資訊】 - [查無資料]"); - } - await task_Detail.InsertWorkTime_End("ParkingJob", "Parking", "執行成功停車場剩餘車位Job"); - //logger.LogInformation("【ParkingJob】【執行成功停車場剩餘車位Job】"); - } - catch (Exception exception) - { - await task_Detail.WorkFail("ParkingJob", "Parking", exception.ToString()); - logger.LogInformation("【ParkingJob】【執行失敗停車場剩餘車位Job】"); - logger.LogInformation("【ParkingJob】【執行失敗停車場剩餘車位Job】[Exception]：{0}", exception.ToString()); - } - } - #endregion - - #region 取得設備資訊 - if (await task_Detail.GetNeedWorkTask("ParkingJob", "Device")) - { - try - { - await task_Detail.InsertWorkTime("ParkingJob", "Device", "開始執行設備資訊Job"); - //logger.LogInformation("【ParkingJob】【開始執行設備資訊Job】"); - - HttpWebRequest equipmentRequest = (HttpWebRequest)WebRequest.Create($"{parkingConfig.Host}{parkingConfig.Prefix}/api/equipment/state"); - equipmentRequest.Method = "GET"; - //request.Headers.Add("Authorization", "Basic " + encoded); - equipmentRequest.PreAuthenticate = true; - - HttpWebResponse equipmentResponse = (HttpWebResponse)equipmentRequest.GetResponse(); - var equipmentResponseContent = new StreamReader(equipmentResponse.GetResponseStream()).ReadToEnd(); - - var equipmentResponseResult = JsonConvert.DeserializeObject(equipmentResponseContent); - - //取得設備對應表 - var sqlEquipmentMapping = $@"SELECT * FROM variable WHERE deleted = 0 AND system_type = 'parkingEquipmentMapping'"; - var parkingEquipmentMapping = await backgroundServiceRepository.GetAllAsync(sqlEquipmentMapping); - - //List parkingEquipmentMapping = new List(); - //VariableInfo variableInfo_1 = new VariableInfo(); - //variableInfo_1.System_key = "APS-000"; - //variableInfo_1.system_value = "D3_P_B4F_CAPS_B413"; - - //parkingEquipmentMapping.Add(variableInfo_1); - - //VariableInfo variableInfo_2 = new VariableInfo(); - //variableInfo_2.System_key = "APS-001"; - //variableInfo_2.system_value = "D3_P_B4F_CAPS_B414"; - //parkingEquipmentMapping.Add(variableInfo_2); - - if (equipmentResponseResult != null && equipmentResponseResult.Code == "20000") - { - foreach (var equipment in equipmentResponseResult.Payload) - { - //找出對定的設備代碼 - var selectedMapping = parkingEquipmentMapping.Where(x => x.System_key == equipment.Name).FirstOrDefault(); - if (selectedMapping != null) - { - - var tagName = selectedMapping.system_value; - var apiFormat = @"{0}obix/config/Arena/{1}/{2}/{3}/{4}/{5}/ST/set"; - - var tagNameSplit = tagName.Split("_"); - - var parames = new List(); - parames.Add(parkingConfig.ApiBase); - for (var i = 0; i < tagNameSplit.Length; i++) - { - if (i != tagNameSplit.Length - 1) - { - parames.Add(tagNameSplit[i]); - } - else - { - parames.Add(tagName); - } - } - - HttpWebRequest request = (HttpWebRequest)WebRequest.Create(string.Format(apiFormat, parames.ToArray())); - request.Method = "POST"; - request.Headers.Add("Authorization", "Basic " + encoded); - request.PreAuthenticate = true; - - var real = $@""; - byte[] realByteArray = Encoding.UTF8.GetBytes(real); - using (Stream reqStream = request.GetRequestStream()) - { - reqStream.Write(realByteArray, 0, realByteArray.Length); - } - - HttpWebResponse response = (HttpWebResponse)request.GetResponse(); - var responseContent = new StreamReader(response.GetResponseStream()).ReadToEnd(); - - XmlDocument xmlDocument = new XmlDocument(); - xmlDocument.LoadXml(responseContent); - string json = JsonConvert.SerializeXmlNode(xmlDocument); - JObject jsonResult = (JObject)JsonConvert.DeserializeObject(json); - - if (jsonResult.ContainsKey("err")) //抓取錯誤 - { - logger.LogError("【ParkingJob】【設備資訊】"); - logger.LogError("【ParkingJob】【設備資訊】[錯誤內容]：{0}", json); - } - else - { - if (jsonResult.ContainsKey("bool")) //表示可以讀取到內容 - { - List> ontimeRawDatas = new List>(); - - var realList = jsonResult["bool"]; - var val = realList["@val"]; - if (val != null) - { - var tempStrSplit = val.ToString(); - if (tempStrSplit != equipment.Alive.ToString().ToLower()) - { - logger.LogError("【ParkingJob】【設備資訊】[修改失敗]：{0}", val.ToString()); - } - } - } - } - } - else - { - logger.LogWarning("【ParkingJob】【設備資訊】[查無該名稱對應表]：{0}", equipment.Name); - } - } - } - else - { - logger.LogWarning("【ParkingJob】【設備資訊】 - [查無資料]"); - } - await task_Detail.InsertWorkTime_End("ParkingJob", "Device", "執行成功設備資訊Job"); - //logger.LogInformation("【ParkingJob】【執行成功設備資訊Job】"); - } - catch (Exception exception) - { - await task_Detail.WorkFail("ParkingJob", "Device", exception.ToString()); - logger.LogInformation("【ParkingJob】【執行失敗設備資訊Job】"); - logger.LogInformation("【ParkingJob】【執行失敗設備資訊Job】[Exception]：{0}", exception.ToString()); - } - } - #endregion - - await task_Detail.InsertWorkTime_End("ParkingJob", "All", "任務完成"); - } - - - } - catch (Exception exception) - { - await task_Detail.WorkFail("ParkingJob", "All", exception.ToString()); - logger.LogError("【ParkingJob】【任務失敗】"); - logger.LogError("【ParkingJob】【任務失敗】[Exception]：{0}", exception.ToString()); - } - - } - } -} diff --git a/Backend/Quartz/Jobs/RegularUpdateDBTableJob.cs b/Backend/Quartz/Jobs/RegularUpdateDBTableJob.cs deleted file mode 100644 index dc9d577..0000000 --- a/Backend/Quartz/Jobs/RegularUpdateDBTableJob.cs +++ /dev/null @@ -1,77 +0,0 @@ -using Backend.Services.Implement; -using Microsoft.Extensions.Logging; -using Quartz; -using Repository.BackendRepository.Interface; -using System; -using System.Collections.Generic; -using System.Reflection; -using System.Text; -using System.Threading.Tasks; - -namespace Backend.Quartz.Jobs -{ - /// - /// 定時將資料表加入派送任務 - /// - [DisallowConcurrentExecution] - class RegularUpdateDBTableJob: IJob - { - private readonly ILogger logger; - private readonly IBackgroundServiceRepository backgroundServiceRepository; - private readonly IBackendRepository backendRepository; - - public RegularUpdateDBTableJob( - ILogger logger, - IBackgroundServiceRepository backgroundServiceRepository, - IBackendRepository backendRepository) - { - this.logger = logger; - this.backgroundServiceRepository = backgroundServiceRepository; - this.backendRepository = backendRepository; - } - - public async Task Execute(IJobExecutionContext context) - { - try - { - logger.LogInformation("【RegularUpdateDBTableJob】【任務開始】"); - - //要派送的資料表 - List db_tables = new List() { "variable" }; - - foreach (var db_table in db_tables) - { - try - { - logger.LogInformation("【RegularUpdateDBTableJob】【新增資料表 [{0}] 至派送任務】", db_table); - //取得資料表所有資料 - var temp_datas = (await backgroundServiceRepository.GetAllAsync(db_table, "")); - - List> dicts = new List>(); - foreach (var temp_data in temp_datas) - { - var dict = new Dictionary((IDictionary)temp_data); - - dicts.Add(dict); - } - - await backendRepository.ManualInsertBackgroundServiceTask("", "", db_table, "purge_all_insert", dicts); - - logger.LogError("【RegularUpdateDBTableJob】【新增成功 資料表 [{0}] 至派送任務】", db_table); - } - catch(Exception exception) - { - logger.LogError("【RegularUpdateDBTableJob】【新增失敗 資料表 [{0}] 至派送任務】", db_table); - logger.LogError("【RegularUpdateDBTableJob】【新增失敗 資料表 [{0}] 至派送任務】[Exception]：{1}", db_table, exception.ToString()); - } - } - } - catch (Exception exception) - { - logger.LogError("【RegularUpdateDBTableJob】【任務失敗】"); - logger.LogError("【RegularUpdateDBTableJob】【任務失敗】[Exception]：{0}", exception.ToString()); - } - - } - } -} diff --git a/Backend/Quartz/Jobs/WeatherAPIJob.cs b/Backend/Quartz/Jobs/WeatherAPIJob.cs deleted file mode 100644 index 77adc5f..0000000 --- a/Backend/Quartz/Jobs/WeatherAPIJob.cs +++ /dev/null @@ -1,559 +0,0 @@ -using Backend.Models; -using Microsoft.Extensions.Logging; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; -using Quartz; -using Repository.BackendRepository.Implement; -using Repository.BackendRepository.Interface; -using System; -using System.Collections.Generic; -using System.IO; -using System.Net; -using System.Net.Http; -using System.Text; -using System.Threading.Tasks; -using System.Xml; -using System.Xml.Serialization; -using System.Linq; -using NCrontab; -using BackendWorkerService.Services.Implement; - -namespace Backend.Quartz.Jobs -{ - [DisallowConcurrentExecution] - class WeatherAPIJob : IJob - { - private readonly ILogger logger; - private readonly IBackgroundServiceRepository backgroundServiceRepository; - private readonly IBackendRepository backendRepository; - private readonly ILogger loggers; - public WeatherAPIJob(ILogger logger, - IBackgroundServiceRepository backgroundServiceRepository, IBackendRepository backendRepository, ILogger loggers) - { - this.logger = logger; - this.backgroundServiceRepository = backgroundServiceRepository; - this.backendRepository = backendRepository; - this.loggers = loggers; - } - public string Fetch_PostWithJSONFormat(string url, string paramter) - { - try - { - string username = "stanGG"; - string password = "St12345678"; - string encoded = Convert.ToBase64String(System.Text.Encoding.GetEncoding("ISO-8859-1").GetBytes(username + ":" + password)); - HttpWebRequest Postrequest = (HttpWebRequest)WebRequest.Create(url); - Postrequest.Method = "POST"; - Postrequest.Headers.Add("Authorization", "Basic " + encoded); - Postrequest.PreAuthenticate = true; - - using (var streamWriter = new StreamWriter(Postrequest.GetRequestStream())) - { - if (paramter != "NULL") - { - string json = ""; - streamWriter.Write(json); - } - else - { - string json = ""; - streamWriter.Write(json); - } - } - HttpWebResponse response = (HttpWebResponse)Postrequest.GetResponse(); - var responseString = new StreamReader(response.GetResponseStream()).ReadToEnd(); - XmlDocument xmlDoc = new XmlDocument(); - xmlDoc.LoadXml(responseString); - string jsonText = JsonConvert.SerializeXmlNode(xmlDoc); - //JObject resultVal = (JObject)JsonConvert.DeserializeObject(jsonText); - - return jsonText; - - } - catch (Exception ex) - { - logger.LogError("【WeatherAPIJob】" + "Fetch_PostWithJSONFormat:" + ex.ToString()); - throw ex; - } - } - - - public async Task Execute(IJobExecutionContext context) - { - Task_Detail task_Detail = new Task_Detail(loggers, backendRepository); - try - { - var obixApiConfig = new ObixApiConfig(); - string encoded = string.Empty; - #region 取得obix 設定 - var sqlObix = $@"SELECT system_value as Value, system_key as Name FROM variable WHERE deleted = 0 AND system_type = 'obixConfig'"; - - var variableObix = await backgroundServiceRepository.GetAllAsync(sqlObix); - obixApiConfig.ApiBase = variableObix.Where(x => x.Name == "ApiBase").Select(x => x.Value).FirstOrDefault(); - obixApiConfig.UserName = variableObix.Where(x => x.Name == "UserName").Select(x => x.Value).FirstOrDefault(); - obixApiConfig.Password = variableObix.Where(x => x.Name == "Password").Select(x => x.Value).FirstOrDefault(); - - encoded = System.Convert.ToBase64String(System.Text.Encoding.GetEncoding("ISO-8859-1").GetBytes(obixApiConfig.UserName + ":" + obixApiConfig.Password)); - #endregion 取得obix 設定 - //取得氣象預報 - if (await task_Detail.GetNeedWorkTask("WeatherAPI", "api_weateher")) - { - try - { - await task_Detail.InsertWorkTime("WeatherAPI", "api_weateher"); - var client = new HttpClient(); - var DataNO = "F-D0047-061"; - var UVUri = "https://opendata.cwb.gov.tw/api/v1/rest/datastore/F-D0047-061?Authorization=CWB-EA24220B-DDCC-4188-84E5-AD37A0E03F80&format=JSON&locationName=%E4%BF%A1%E7%BE%A9%E5%8D%80&elementName=Wx,PoP12h,T,RH"; - HttpResponseMessage response = client.GetAsync(UVUri).Result; - String jsonUVs = response.Content.ReadAsStringAsync().Result.ToString(); - - var observation = JsonConvert.DeserializeObject(jsonUVs); - logger.LogInformation("【WeatherAPIJob】【取得成功氣象預報】"); - - if (observation.Success != "true") - { - logger.LogInformation("【WeatherAPIJob】【取得氣象預報資料不正確】"); - } - else - { - logger.LogInformation("【WeatherAPIJob】【開始存入氣象預報到資料庫】"); - List> WeatherAPIdbS = new List>(); - var Type_ALL = observation.Records.Locations[0].Location[0].WeatherElement; - - foreach (var a in Type_ALL) - { - - foreach (var b in a.Time) - { - if (a.ElementName == "PoP12h" || a.ElementName == "Wx") - { - if (Convert.ToDateTime(b.StartTime) > DateTime.Now.AddDays(1)) - { - break; - } - } - else - { - if (Convert.ToDateTime(b.DataTime) > DateTime.Now.AddDays(1)) - { - break; - } - } - Dictionary WeatherAPIdb = new Dictionary() - { - { "@weather_type", a.ElementName}, - { "@data_no", DataNO}, - { "@get_value", b.ElementValue[0].Value}, - { "@measures", b.ElementValue[0].Measures}, - { "@created_by", "system"}, - { "@created_at", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}, - }; - if (a.ElementName == "PoP12h" || a.ElementName == "Wx") - { - WeatherAPIdb.Add("@start_time", b.StartTime); - WeatherAPIdb.Add("@end_time", b.EndTime); - } - else - { - WeatherAPIdb.Add("@start_time", b.DataTime); - WeatherAPIdb.Add("@end_time", null); - } - WeatherAPIdbS.Add(WeatherAPIdb); - - if (a.ElementName == "Wx") - { - Dictionary TWeatherAPIdb = new Dictionary() - { - { "@weather_type", "WxV"}, - { "@data_no", DataNO}, - { "@get_value", b.ElementValue[1].Value}, - { "@measures", b.ElementValue[1].Measures}, - { "@start_time", b.StartTime}, - { "@end_time", b.EndTime}, - { "@created_by", "system"}, - { "@created_at", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}, - }; - WeatherAPIdbS.Add(TWeatherAPIdb); - } - - } - } - await backendRepository.AddMutiByCustomTable(WeatherAPIdbS, "api_weateher"); - } - - await task_Detail.InsertWorkTime_End("WeatherAPI", "api_weateher"); - } - catch (Exception ex) - { - await task_Detail.WorkFail("WeatherAPI", "api_weateher", ex.Message.ToString()); - } - } - - if (await task_Detail.GetNeedWorkTask("WeatherAPI", "api_rain")) - { - try - { - await task_Detail.InsertWorkTime("WeatherAPI", "api_rain"); - WebClient mywebClient = new WebClient(); - mywebClient.DownloadFile("https://opendata.cwb.gov.tw/fileapi/v1/opendataapi/W-C0033-003?Authorization=CWB-EA24220B-DDCC-4188-84E5-AD37A0E03F80&downloadType=WEB&format=CAP", @"root/PowerfulRain.xml"); - XmlDocument doc = new XmlDocument(); - doc.Load("root/PowerfulRain.xml"); - var json = JsonConvert.SerializeXmlNode(doc); - var haveinfo = json.Split("info"); - if (haveinfo.Length > 2) - { - var observation = RainApi.Welcome.FromJson(json); - var area = observation.Alert.Info.Area.Where(a => a.Geocode.Value == "63").Select(a => a.AreaDesc).FirstOrDefault(); - var sql = $"select id from api_rain where msgType = '{observation.Alert.MsgType}' and onset = '{observation.Alert.Info.Onset.ToString("yyyy-MM-dd HH:mm:ss")}' and expires = '{observation.Alert.Info.Expires.ToString("yyyy-MM-dd HH:mm:ss")}'"; - var NeedCallApi = await backendRepository.GetOneAsync(sql); - - Dictionary RainAPIdb = new Dictionary() - { - { "@msgType", observation.Alert.MsgType}, - { "@headline", observation.Alert.Info.Headline}, - { "@areaDesc", area}, - { "@onset", observation.Alert.Info.Onset}, - { "@expires", observation.Alert.Info.Expires}, - { "@created_by", "system"}, - { "@created_at", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}, - }; - var id = await backendRepository.AddOneByCustomTableReturnId(RainAPIdb, "api_rain"); - if (NeedCallApi != 0) - { - var val = RainValue(observation.Alert.MsgType, observation.Alert.Info.Headline); - if (val < 5) - { - var ReStr = Fetch_PostWithJSONFormat($@"{obixApiConfig.ApiBase}obix/config/Arena/D2/CWB/L110/CAP/D2_CWB_L110_CAP_MET1/SeverityLEVL_RAIN/set", val.ToString()); - UpdatedNiagara("api_rain", ReStr, id); - } - } - - FolderFunction folderFunction = new FolderFunction(); - folderFunction.DeleteFile("root/PowerfulRain.xml"); - await task_Detail.InsertWorkTime_End("WeatherAPI", "api_rain"); - } - else - { - var observation = RainApi.Welcome.FromJson(json); - var area = observation.Alert.Info.Area.Where(a => a.Geocode.Value == "63").Select(a => a.AreaDesc).FirstOrDefault(); - var sql = $"select id from api_rain where msgType = '{observation.Alert.MsgType}' and onset = '{observation.Alert.Info.Onset.ToString("yyyy-MM-dd HH:mm:ss")}' and expires = '{observation.Alert.Info.Expires.ToString("yyyy-MM-dd HH:mm:ss")}'"; - var NeedCallApi = await backendRepository.GetOneAsync(sql); - - Dictionary RainAPIdb = new Dictionary() - { - { "@msgType", observation.Alert.MsgType}, - { "@headline", observation.Alert.Info.Headline}, - { "@areaDesc", area}, - { "@onset", observation.Alert.Info.Onset.ToString("yyyy-MM-dd HH:mm:ss")}, - { "@expires", observation.Alert.Info.Expires.ToString("yyyy-MM-dd HH:mm:ss")}, - { "@created_by", "system"}, - { "@created_at", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}, - }; - var id = await backendRepository.AddOneByCustomTableReturnId(RainAPIdb, "api_rain"); - if (NeedCallApi != 0) - { - var val = RainValue(observation.Alert.MsgType, observation.Alert.Info.Headline); - if (val < 5) - { - var ReStr = Fetch_PostWithJSONFormat($@"{obixApiConfig.ApiBase}obix/config/Arena/D2/CWB/L110/CAP/D2_CWB_L110_CAP_MET1/SeverityLEVL_RAIN/set", val.ToString()); - UpdatedNiagara("api_rain", ReStr, id); - } - } - - FolderFunction folderFunction = new FolderFunction(); - folderFunction.DeleteFile("root/PowerfulRain.xml"); - await task_Detail.InsertWorkTime_End("WeatherAPI", "api_rain"); - - } - } - catch (Exception ex) - { - await task_Detail.WorkFail("WeatherAPI", "api_rain", ex.Message.ToString()); - } - } - - if (await task_Detail.GetNeedWorkTask("WeatherAPI", "api_typhoon")) - { - try - { - await task_Detail.InsertWorkTime("WeatherAPI", "api_typhoon"); - WebClient mywebClient = new WebClient(); - mywebClient.DownloadFile("https://opendata.cwb.gov.tw/fileapi/v1/opendataapi/W-C0034-001?Authorization=CWB-EA24220B-DDCC-4188-84E5-AD37A0E03F80&downloadType=WEB&format=CAP", @"root/Typhoon.xml"); - XmlDocument doc = new XmlDocument(); - doc.Load("root/Typhoon.xml"); - var json = JsonConvert.SerializeXmlNode(doc); - var haveinfo = json.Split("info"); - - if (haveinfo.Length > 2) - { - var observation = TyphoonApi.Welcome.FromJson(json); - var area = observation.Alert.Info.Area.Where(a => a.Geocode.Value == "63").Select(a => a.AreaDesc).FirstOrDefault(); - var sql = $"select id from api_typhoon where msgType = '{observation.Alert.MsgType}' and onset = '{observation.Alert.Info.Onset.ToString("yyyy-MM-dd HH:mm:ss")}' and expires = '{observation.Alert.Info.Expires.ToString("yyyy-MM-dd HH:mm:ss")}'"; - var NeedCallApi = await backendRepository.GetOneAsync(sql); - Dictionary EarthquakeAPIdb = new Dictionary() - { - { "@msgType", observation.Alert.MsgType}, - { "@headline", observation.Alert.Info.Headline}, - { "@areaDesc", area}, - { "@urgency",observation.Alert.Info.Urgency}, - { "@severity",observation.Alert.Info.Severity}, - { "@onset", observation.Alert.Info.Onset}, - { "@expires", observation.Alert.Info.Expires}, - { "@created_by", "system"}, - { "@created_at", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}, - }; - var id = await backendRepository.AddOneByCustomTableReturnId(EarthquakeAPIdb, "api_typhoon"); - if (NeedCallApi != 0) - { - if (observation.Alert.Info.Urgency != null && observation.Alert.Info.Urgency != "Expected") - { - - var ReStr = Fetch_PostWithJSONFormat($@"{obixApiConfig.ApiBase}obix/config/Arena/D2/CWB/L110/CAP/D2_CWB_L110_CAP_MET2/SeverityLEVL_Typhoon/set", observation.Alert.Info.Urgency); - UpdatedNiagara("api_typhoon", ReStr, id); - } - } - FolderFunction folderFunction = new FolderFunction(); - folderFunction.DeleteFile("root/Typhoon.xml"); - await task_Detail.InsertWorkTime_End("WeatherAPI", "api_typhoon"); - } - else - { - var observation = TyphoonApi.Welcome.FromJson(json); - //var area = observation.Alert.Info.Area.Where(a => a.Geocode.Value == "63").Select(a => a.AreaDesc).FirstOrDefault(); - var sql = $"select id from api_typhoon where msgType = '{observation.Alert.MsgType}' and onset = '{observation.Alert.Info.Onset.ToString("yyyy-MM-dd HH:mm:ss")}' and expires = '{observation.Alert.Info.Expires.ToString("yyyy-MM-dd HH:mm:ss")}'"; - var NeedCallApi = await backendRepository.GetOneAsync(sql); - Dictionary EarthquakeAPIdb = new Dictionary() - { - { "@msgType", observation.Alert.MsgType}, - { "@headline", observation.Alert.Info.Headline}, - //{ "@areaDesc", area}, - { "@urgency",observation.Alert.Info.Urgency}, - { "@severity",observation.Alert.Info.Severity}, - { "@onset", observation.Alert.Info.Onset.ToString("yyyy-MM-dd HH:mm:ss")}, - { "@expires", observation.Alert.Info.Expires.ToString("yyyy-MM-dd HH:mm:ss")}, - { "@created_by", "system"}, - { "@created_at", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}, - }; - var id = await backendRepository.AddOneByCustomTableReturnId(EarthquakeAPIdb, "api_typhoon"); - if (NeedCallApi != 0) - { - if (observation.Alert.Info.Urgency != null && observation.Alert.Info.Urgency != "Expected") - { - - var ReStr = Fetch_PostWithJSONFormat($@"{obixApiConfig.ApiBase}obix/config/Arena/D2/CWB/L110/CAP/D2_CWB_L110_CAP_MET2/SeverityLEVL_Typhoon/set", observation.Alert.Info.Urgency); - UpdatedNiagara("api_typhoon", ReStr, id); - } - } - FolderFunction folderFunction = new FolderFunction(); - folderFunction.DeleteFile("root/Typhoon.xml"); - await task_Detail.InsertWorkTime_End("WeatherAPI", "api_typhoon"); - - } - - } - catch (Exception ex) - { - await task_Detail.WorkFail("WeatherAPI", "api_typhoon", ex.Message.ToString()); - } - } - if (await task_Detail.GetNeedWorkTask("WeatherAPI", "api_earthquake")) - { - try - { - await task_Detail.InsertWorkTime("WeatherAPI", "api_earthquake"); - var client = new HttpClient(); - var UVUri = "https://opendata.cwb.gov.tw/api/v1/rest/datastore/E-A0015-001?Authorization=CWB-EA24220B-DDCC-4188-84E5-AD37A0E03F80&format=JSON&areaName=%E8%87%BA%E5%8C%97%E5%B8%82"; - HttpResponseMessage response = client.GetAsync(UVUri).Result; - String jsonUVs = response.Content.ReadAsStringAsync().Result.ToString(); - var observation = QuickType.Welcome.FromJson(jsonUVs); - if (!observation.Success) - { - logger.LogInformation("【WeatherAPIJob】【取得地震觀測資料不正確】"); - } - else - { - logger.LogInformation("【WeatherAPIJob】【開始存入地震觀測到資料庫】"); - List> EarthquakeAPIdbS = new List>(); - var nowNo = await backendRepository.GetOneAsync("select if( Max(earthquakeNo) is null ,0,Max(earthquakeNo)) earthquakeNo from api_earthquake where newEarthquake = 1"); - foreach (var a in observation.Records.Earthquake) - { - if (a.EarthquakeNo <= nowNo) - { - Dictionary EarthquakeAPIdb = new Dictionary() - { - { "@earthquakeNo", a.EarthquakeNo}, - { "@newEarthquake", 0}, - { "@originTime", DateTime.Parse(a.EarthquakeInfo.OriginTime.ToString(), System.Globalization.CultureInfo.CurrentCulture)}, - { "@magnitudeValue", a.EarthquakeInfo.EarthquakeMagnitude.MagnitudeValue}, - { "@areaName", null}, - { "@areaIntensity", null}, - { "@created_by", "system"}, - { "@created_at", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}, - }; - EarthquakeAPIdbS.Add(EarthquakeAPIdb); - break; - } - else - { - if (a.Intensity.ShakingArea.Length > 0) - { - Dictionary EarthquakeAPIdb = new Dictionary() - { - { "@earthquakeNo", a.EarthquakeNo}, - { "@newEarthquake", 1}, - { "@originTime", DateTime.Parse(a.EarthquakeInfo.OriginTime.ToString(), System.Globalization.CultureInfo.CurrentCulture)}, - { "@magnitudeValue", a.EarthquakeInfo.EarthquakeMagnitude.MagnitudeValue}, - { "@areaName", a.Intensity.ShakingArea[0].CountyName}, - { "@areaIntensity", a.Intensity.ShakingArea[0].AreaIntensity}, - { "@created_by", "system"}, - { "@created_at", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}, - }; - - - var Nag = Fetch_PostWithJSONFormat($@"{obixApiConfig.ApiBase}obix/config/Arena/D2/CWB/L110/CAP/D2_CWB_L110_CAP_GEO/SeverityLEVL_LMI/set", a.Intensity.ShakingArea[0].AreaIntensity.ToString()); - - if (Nag.Contains("err")) - { - EarthquakeAPIdb.Add("@niagara", Nag); - } - else - { - EarthquakeAPIdb.Add("@niagara", "success"); - } - - - EarthquakeAPIdbS.Add(EarthquakeAPIdb); - } - else - { - Dictionary EarthquakeAPIdb = new Dictionary() - { - { "@earthquakeNo", a.EarthquakeNo}, - { "@newEarthquake", 1}, - { "@originTime", DateTime.Parse(a.EarthquakeInfo.OriginTime.ToString(), System.Globalization.CultureInfo.CurrentCulture)}, - { "@magnitudeValue", a.EarthquakeInfo.EarthquakeMagnitude.MagnitudeValue}, - { "@areaName", null}, - { "@areaIntensity", null}, - { "@created_by", "system"}, - { "@created_at", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}, - }; - - var Nag = Fetch_PostWithJSONFormat($@"{obixApiConfig.ApiBase}obix/config/Arena/D2/CWB/L110/CAP/D2_CWB_L110_CAP_GEO/SeverityLEVL_LMI/set", "NULL"); - if (Nag.Contains("err")) - { - EarthquakeAPIdb.Add("@niagara", Nag); - } - else - { - EarthquakeAPIdb.Add("@niagara", "success"); - } - EarthquakeAPIdbS.Add(EarthquakeAPIdb); - } - } - } - await backendRepository.AddMutiByCustomTable(EarthquakeAPIdbS, "api_earthquake"); - } - await task_Detail.InsertWorkTime_End("WeatherAPI", "api_earthquake"); - } - catch (Exception ex) - { - await task_Detail.WorkFail("WeatherAPI", "api_earthquake", ex.Message.ToString()); - } - } - if (await task_Detail.GetNeedWorkTask("WeatherAPI", "set_weather")) - { - try - { - await task_Detail.InsertWorkTime("WeatherAPI", "set_weather"); - var sql = @$"SELECT - id, - weather_type, - get_value - FROM api_weateher - where id in (select MAX(id) from api_weateher where start_time < NOW() group by weather_type) - order by start_time desc"; - var types = await backendRepository.GetAllAsync(sql); - var T = types.Where(a => a.weather_type == "T").FirstOrDefault(); - var RbT = Fetch_PostWithJSONFormat($@"{obixApiConfig.ApiBase}obix/config/Arena/D2/CWB/L110/OPD/D2_CWB_L110_OPD_element/T/set", T.get_value); - UpdatedNiagara("api_weateher", RbT, T.id); - - var RH = types.Where(a => a.weather_type == "RH").FirstOrDefault(); - var RHT = Fetch_PostWithJSONFormat($@"{obixApiConfig.ApiBase}obix/config/Arena/D2/CWB/L110/OPD/D2_CWB_L110_OPD_element/RH/set", RH.get_value); - UpdatedNiagara("api_weateher", RHT, RH.id); - - var PoP12h = types.Where(a => a.weather_type == "PoP12h").FirstOrDefault(); - var PoP12hT = Fetch_PostWithJSONFormat($@"{obixApiConfig.ApiBase}obix/config/Arena/D2/CWB/L110/OPD/D2_CWB_L110_OPD_element/PoP6h/set", PoP12h.get_value); - UpdatedNiagara("api_weateher", PoP12hT, PoP12h.id); - - var Wx = types.Where(a => a.weather_type == "Wx").FirstOrDefault(); - var WxT = Fetch_PostWithJSONFormat($@"{obixApiConfig.ApiBase}obix/config/Arena/D2/CWB/L110/OPD/D2_CWB_L110_OPD_element/Wx/set", Wx.get_value); - UpdatedNiagara("api_weateher", WxT, Wx.id); - await task_Detail.InsertWorkTime_End("WeatherAPI", "set_weather"); - } - catch (Exception ex) - { - await task_Detail.WorkFail("WeatherAPI", "set_weather", ex.Message.ToString()); - } - } - } - catch (Exception exception) - { - logger.LogError("【WeatherAPIJob】【任務失敗】"); - logger.LogError("【WeatherAPIJob】【任務失敗】[Exception]：{0}", exception.ToString()); - } - } - - public int RainValue(string Ty, string Headline) - { - var rint = 5; - if (Ty == "") - { - return 0; - - } - else - { - if (Headline.Contains("大雨")) - { - rint = 1; - } - else if (Headline.Contains("豪雨")) - { - rint = 2; - } - else if (Headline.Contains("大豪雨")) - { - rint = 3; - } - else if (Headline.Contains("超大豪雨")) - { - rint = 4; - } - } - return rint; - } - - public async void UpdatedNiagara(string DBTableName, string ResponseStr, int CheckNumId) - { - try - { - var Su = "success"; - - if (ResponseStr.Contains("err")) - { - Su = ResponseStr; - } - Dictionary RainAPIdb = new Dictionary() - { - { "@niagara", Su} - }; - await backendRepository.UpdateOneByCustomTable(RainAPIdb, DBTableName, " id = " + CheckNumId); - } - catch (Exception ex) - { - logger.LogError("【WeatherAPIJob】" + "UpdatedNiagara:" + ex.ToString()); - throw ex; - } - } - } -} diff --git a/Backend/Quartz/QuartzHostedService.cs b/Backend/Quartz/QuartzHostedService.cs deleted file mode 100644 index b111409..0000000 --- a/Backend/Quartz/QuartzHostedService.cs +++ /dev/null @@ -1,69 +0,0 @@ -using Microsoft.Extensions.Hosting; -using Quartz; -using Quartz.Spi; -using System; -using System.Collections.Generic; -using System.Text; -using System.Threading; -using System.Threading.Tasks; - -namespace Backend.Quartz -{ - public class QuartzHostedService : IHostedService - { - private readonly ISchedulerFactory _schedulerFactory; - private readonly IJobFactory _jobFactory; - private readonly IEnumerable _jobSchedules; - public QuartzHostedService(ISchedulerFactory schedulerFactory, IJobFactory jobFactory, IEnumerable jobSchedules) - { - _schedulerFactory = schedulerFactory ?? throw new ArgumentNullException(nameof(schedulerFactory)); - _jobFactory = jobFactory ?? throw new ArgumentNullException(nameof(jobFactory)); - _jobSchedules = jobSchedules ?? throw new ArgumentNullException(nameof(jobSchedules)); - } - public IScheduler Scheduler { get; set; } - public async Task StartAsync(CancellationToken cancellationToken) - { - Scheduler = await _schedulerFactory.GetScheduler(cancellationToken); - Scheduler.JobFactory = _jobFactory; - foreach (var jobSchedule in _jobSchedules) - { - var job = CreateJob(jobSchedule); - var trigger = CreateTrigger(jobSchedule); - await Scheduler.ScheduleJob(job, trigger, cancellationToken); - jobSchedule.JobStatu = JobStatus.Scheduling; - } - await Scheduler.Start(cancellationToken); - foreach (var jobSchedule in _jobSchedules) - { - jobSchedule.JobStatu = JobStatus.Running; - } - } - public async Task StopAsync(CancellationToken cancellationToken) - { - await Scheduler?.Shutdown(cancellationToken); - foreach (var jobSchedule in _jobSchedules) - { - - jobSchedule.JobStatu = JobStatus.Stopped; - } - } - private static IJobDetail CreateJob(JobSchedule schedule) - { - var jobType = schedule.JobType; - return JobBuilder - .Create(jobType) - .WithIdentity(jobType.FullName) - .WithDescription(jobType.Name) - .Build(); - } - private static ITrigger CreateTrigger(JobSchedule schedule) - { - return TriggerBuilder - .Create() - .WithIdentity($"{schedule.JobType.FullName}.trigger") - .WithCronSchedule(schedule.CronExpression) - .WithDescription(schedule.CronExpression) - .Build(); - } - } -} diff --git a/Backend/Quartz/SingletonJobFactory.cs b/Backend/Quartz/SingletonJobFactory.cs deleted file mode 100644 index c925edd..0000000 --- a/Backend/Quartz/SingletonJobFactory.cs +++ /dev/null @@ -1,26 +0,0 @@ -using Microsoft.Extensions.DependencyInjection; -using Quartz; -using Quartz.Spi; -using System; -using System.Collections.Generic; -using System.Text; - -namespace Backend.Quartz -{ - public class SingletonJobFactory : IJobFactory - { - private readonly IServiceProvider _serviceProvider; - public SingletonJobFactory(IServiceProvider serviceProvider) - { - _serviceProvider = serviceProvider ?? throw new ArgumentNullException(nameof(serviceProvider)); - } - public IJob NewJob(TriggerFiredBundle bundle, IScheduler scheduler) - { - return _serviceProvider.GetRequiredService(bundle.JobDetail.JobType) as IJob; - } - public void ReturnJob(IJob job) - { - - } - } -} diff --git a/Backend/Services/Implement/ProcEletricMeterService.cs b/Backend/Services/Implement/ProcEletricMeterService.cs deleted file mode 100644 index 8478c30..0000000 --- a/Backend/Services/Implement/ProcEletricMeterService.cs +++ /dev/null @@ -1,935 +0,0 @@ -using Backend.Models; -using System; -using System.Collections.Generic; -using System.Configuration; -using System.Data; -using System.Data.SqlClient; -using System.Text; -using Dapper; -using System.Linq; -using Newtonsoft.Json.Linq; -using System.Xml; -using System.Net; -using System.IO; -using Newtonsoft.Json; -using Repository.Helper; -using Repository.BackendRepository.Interface; -using Repository.BackendRepository.Implement; -using System.Threading.Tasks; - -namespace BackendWorkerService.Services.Implement -{ - /// - /// 電錶補償歸檔 - /// - public class ProcEletricMeterService - { - private readonly IBackgroundServiceRepository backgroundServiceRepository; - private readonly IBackgroundServiceMsSqlRepository backgroundServiceMsSqlRepository; - - public ProcEletricMeterService(IBackgroundServiceRepository backgroundServiceRepository, - IBackgroundServiceMsSqlRepository backgroundServiceMySqlRepository) - { - this.backgroundServiceRepository = backgroundServiceRepository; - this.backgroundServiceMsSqlRepository = backgroundServiceMySqlRepository; - } - - public async Task ArchiveData() - { - bool result = false; - int repeatTimes = 0; - string targetTable = string.Empty; - - EDFunction ed = new EDFunction(); - XmlDocument xmlDocument = new XmlDocument(); - var obixApiConfig = new ObixApiConfig(); - string encoded = string.Empty; - - try - { - //取得可錯誤次數 - var sqlArchive = $@"SELECT system_value as Value, system_key as Name FROM variable WHERE deleted = 0 AND system_type = 'archiveConfig'"; - - var variableArchive = await backgroundServiceRepository.GetAllAsync(sqlArchive); - repeatTimes = Convert.ToInt32(variableArchive.Where(x => x.Name == "RepeatTimes").Select(x => x.Value).FirstOrDefault()); - var saveToMSDB = await backgroundServiceRepository.GetOneAsync("select system_value from variable where system_type = 'save_to_ms_db' and deleted = 0"); - - #region 取得obix 設定 - var sqlObix = $@"SELECT system_value as Value, system_key as Name FROM variable WHERE deleted = 0 AND system_type = 'obixConfig'"; - - var variableObix = await backgroundServiceRepository.GetAllAsync(sqlObix); - obixApiConfig.ApiBase = variableObix.Where(x => x.Name == "ApiBase").Select(x => x.Value).FirstOrDefault(); - obixApiConfig.UserName = variableObix.Where(x => x.Name == "UserName").Select(x => x.Value).FirstOrDefault(); - obixApiConfig.Password = variableObix.Where(x => x.Name == "Password").Select(x => x.Value).FirstOrDefault(); - - encoded = System.Convert.ToBase64String(System.Text.Encoding.GetEncoding("ISO-8859-1").GetBytes(obixApiConfig.UserName + ":" + obixApiConfig.Password)); - #endregion 取得obix 設定 - - //取得錯誤的設備sql format - var sql_error_format = @"SELECT * FROM {0} WHERE is_complete = 0 AND repeat_times < @RepeatTimes"; - - //MY 新增/修改sql format - var MYsql_update_format = @" - UPDATE {0} SET - count_rawdata = @count_rawdata, - min_rawdata = @min_rawdata, - max_rawdata = @max_rawdata, - avg_rawdata = @avg_rawdata, - sum_rawdata = @sum_rawdata, - is_complete = @is_complete, - repeat_times = @repeat_times, - fail_reason = @fail_reason, - updated_at = @updated_at - WHERE device_number = @device_number - AND point = @point - AND start_timestamp = @start_timestamp; - - INSERT INTO {0} ( - device_number, - point, - start_timestamp, - end_timestamp, - count_rawdata, - min_rawdata, - max_rawdata, - avg_rawdata, - sum_rawdata, - is_complete, - repeat_times, - fail_reason) - SELECT - @device_number, - @point, - @start_timestamp, - @end_timestamp, - @count_rawdata, - @min_rawdata, - @max_rawdata, - @avg_rawdata, - @sum_rawdata, - @is_complete, - @repeat_times, - @fail_reason - WHERE ROW_COUNT() = 0;"; - //新增/修改sql format - var sql_update_format = @"BEGIN TRANSACTION; - - UPDATE {0} SET - count_rawdata = @count_rawdata, - min_rawdata = @min_rawdata, - max_rawdata = @max_rawdata, - avg_rawdata = @avg_rawdata, - sum_rawdata = @sum_rawdata, - is_complete = @is_complete, - repeat_times = @repeat_times, - fail_reason = @fail_reason, - updated_at = @updated_at - WHERE device_number = @device_number - AND point = @point - AND start_timestamp = @start_timestamp; - - IF @@ROWCOUNT = 0 - BEGIN - INSERT INTO {0} ( - device_number, - point, - start_timestamp, - end_timestamp, - count_rawdata, - min_rawdata, - max_rawdata, - avg_rawdata, - sum_rawdata, - is_complete, - repeat_times, - fail_reason) - VALUES ( - @device_number, - @point, - @start_timestamp, - @end_timestamp, - @count_rawdata, - @min_rawdata, - @max_rawdata, - @avg_rawdata, - @sum_rawdata, - @is_complete, - @repeat_times, - @fail_reason) - END - - COMMIT TRANSACTION;"; - - #region 時歸檔補償 - //using (IDbConnection conn = new SqlConnection(Connection1)) - //{ - // //取得所有須補償的設備資訊 - // targetTable = "archive_electric_meter_hour"; - // var sql_error_hour = string.Format(sql_error_format, targetTable); - // var error_hours = conn.Query(sql_error_hour, new { RepeatTimes = repeatTimes }).ToList(); - - // List> archiveHourRawDatas = new List>(); - // if (error_hours.Count() > 0) - // { - // foreach (var error_hour in error_hours) - // { - // DeviceNumberPoint deviceNumberPoint = new DeviceNumberPoint(); - // deviceNumberPoint.DeviceNumber = error_hour.Device_number; - // deviceNumberPoint.Point = error_hour.Point; - // deviceNumberPoint.FullDeviceNumberPoint = string.Format("{0}_{1}", error_hour.Device_number, error_hour.Point); - - // var startTimestamp = string.Format("{0}+08:00", error_hour.Start_timestamp.Replace(" ", "T")); - // var endTimestamp = string.Format("{0}+08:00", error_hour.End_timestamp.Replace(" ", "T")); - - // var historyQueryFilter = $@" - // - // - // - // "; - - // HttpWebRequest archiveHourRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); - // //HttpWebRequest archiveHourRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); - // archiveHourRequest.Method = "POST"; - // archiveHourRequest.Headers.Add("Authorization", "Basic " + encoded); - // archiveHourRequest.PreAuthenticate = true; - - // byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); - // using (Stream reqStream = archiveHourRequest.GetRequestStream()) - // { - // reqStream.Write(byteArray, 0, byteArray.Length); - // } - - // HttpWebResponse archiveHourResponse = (HttpWebResponse)archiveHourRequest.GetResponse(); - // var archiveHourResponseContent = new StreamReader(archiveHourResponse.GetResponseStream()).ReadToEnd(); - - // xmlDocument.LoadXml(archiveHourResponseContent); - // string archiveHourJson = JsonConvert.SerializeXmlNode(xmlDocument); - // JObject archiveHourJsonResult = (JObject)JsonConvert.DeserializeObject(archiveHourJson); - - // if (archiveHourJsonResult.ContainsKey("err")) //抓取錯誤 - // { - // Dictionary archiveDayRawData = new Dictionary(); - // archiveDayRawData.Add("@device_number", error_hour.Device_number); - // archiveDayRawData.Add("@point", error_hour.Point); - // archiveDayRawData.Add("@start_timestamp", error_hour.Start_timestamp); - // archiveDayRawData.Add("@end_timestamp", error_hour.End_timestamp); - // archiveDayRawData.Add("@is_complete", 0); - // archiveDayRawData.Add("@repeat_times", ++error_hour.Repeat_times); - // archiveDayRawData.Add("@fail_reason", archiveHourJson); - - // archiveDayRawData.Add("@count_rawdata", 0); - // archiveDayRawData.Add("@min_rawdata", 0); - // archiveDayRawData.Add("@max_rawdata", 0); - // archiveDayRawData.Add("@avg_rawdata", 0); - // archiveDayRawData.Add("@sum_rawdata", 0); - // archiveDayRawData.Add("@updated_at", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")); - - // archiveHourRawDatas.Add(archiveDayRawData); - // } - - // if (archiveHourJsonResult.ContainsKey("obj")) //表示可以讀取到內容 - // { - // var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveHourJsonResult); - // if (ArrangeRawDatas != null && ArrangeRawDatas.Count() > 0) - // { - // archiveHourRawDatas.AddRange(ArrangeRawDatas); - // } - // } - // } - - // if (archiveHourRawDatas.Count() > 0) - // { - // var sql_error_update = string.Format(sql_update_format, targetTable); - // conn.Execute(sql_error_update, archiveHourRawDatas); - // } - // } - // conn.Close(); - //} - #endregion 時歸檔補償 - - #region 天歸檔補償 - //取得所有須補償的設備資訊 - targetTable = "archive_electric_meter_day"; - var sql_error_day = string.Format(sql_error_format, targetTable); - var electric_error_days = await backgroundServiceRepository.GetAllAsync(sql_error_day, new { RepeatTimes = repeatTimes }); - List> electricArchiveDayRawDatas = new List>(); - if (electric_error_days.Count() > 0) - { - foreach (var error_day in electric_error_days) - { - DeviceNumberPoint deviceNumberPoint = new DeviceNumberPoint(); - deviceNumberPoint.DeviceNumber = error_day.Device_number; - deviceNumberPoint.Point = error_day.Point; - deviceNumberPoint.FullDeviceNumberPoint = string.Format("{0}_{1}", error_day.Device_number, error_day.Point); - - var startTimestamp = string.Format("{0}+08:00", error_day.Start_timestamp.Replace(" ", "T")); - var endTimestamp = string.Format("{0}+08:00", error_day.End_timestamp.Replace(" ", "T")); - - var historyQueryFilter = $@" - - - - "; - - HttpWebRequest archiveDayRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); - //HttpWebRequest archiveDayRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); - archiveDayRequest.Method = "POST"; - archiveDayRequest.Headers.Add("Authorization", "Basic " + encoded); - archiveDayRequest.PreAuthenticate = true; - - byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); - using (Stream reqStream = archiveDayRequest.GetRequestStream()) - { - reqStream.Write(byteArray, 0, byteArray.Length); - } - - HttpWebResponse archiveDayResponse = (HttpWebResponse)archiveDayRequest.GetResponse(); - var archiveDayResponseContent = new StreamReader(archiveDayResponse.GetResponseStream()).ReadToEnd(); - - xmlDocument.LoadXml(archiveDayResponseContent); - string archiveDayJson = JsonConvert.SerializeXmlNode(xmlDocument); - JObject archiveDayJsonResult = (JObject)JsonConvert.DeserializeObject(archiveDayJson); - - if (archiveDayJsonResult.ContainsKey("err")) //抓取錯誤 - { - Dictionary archiveDayRawData = new Dictionary(); - archiveDayRawData.Add("@device_number", error_day.Device_number); - archiveDayRawData.Add("@point", error_day.Point); - archiveDayRawData.Add("@start_timestamp", DateTime.Parse(error_day.Start_timestamp, System.Globalization.CultureInfo.CurrentCulture)); - archiveDayRawData.Add("@end_timestamp", DateTime.Parse(error_day.End_timestamp, System.Globalization.CultureInfo.CurrentCulture)); - archiveDayRawData.Add("@is_complete", 0); - archiveDayRawData.Add("@repeat_times", ++error_day.Repeat_times); - archiveDayRawData.Add("@fail_reason", archiveDayJson); - - archiveDayRawData.Add("@count_rawdata", 0); - archiveDayRawData.Add("@min_rawdata", 0); - archiveDayRawData.Add("@max_rawdata", 0); - archiveDayRawData.Add("@avg_rawdata", 0); - archiveDayRawData.Add("@sum_rawdata", 0); - archiveDayRawData.Add("@updated_at", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")); - - electricArchiveDayRawDatas.Add(archiveDayRawData); - } - - if (archiveDayJsonResult.ContainsKey("obj")) //表示可以讀取到內容 - { - var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveDayJsonResult); - if (ArrangeRawDatas != null && ArrangeRawDatas.Count() > 0) - { - electricArchiveDayRawDatas.AddRange(ArrangeRawDatas); - } - } - } - - if (electricArchiveDayRawDatas.Count() > 0) - { - var Mysql_error_update = string.Format(MYsql_update_format, targetTable); - var sql_error_update = string.Format(sql_update_format, targetTable); - if (!string.IsNullOrEmpty(saveToMSDB) && saveToMSDB == "1") - { - await backgroundServiceMsSqlRepository.ExecuteSql(sql_error_update, electricArchiveDayRawDatas); - } - await backgroundServiceRepository.ExecuteSql(Mysql_error_update, electricArchiveDayRawDatas); - } - } - - targetTable = "archive_water_meter_day"; - sql_error_day = string.Format(sql_error_format, targetTable); - var water_error_days = await backgroundServiceRepository.GetAllAsync(sql_error_day, new { RepeatTimes = repeatTimes }); - List> waterArchiveDayRawDatas = new List>(); - if (water_error_days.Count() > 0) - { - foreach (var error_day in water_error_days) - { - DeviceNumberPoint deviceNumberPoint = new DeviceNumberPoint(); - deviceNumberPoint.DeviceNumber = error_day.Device_number; - deviceNumberPoint.Point = error_day.Point; - deviceNumberPoint.FullDeviceNumberPoint = string.Format("{0}_{1}", error_day.Device_number, error_day.Point); - - var startTimestamp = string.Format("{0}+08:00", error_day.Start_timestamp.Replace(" ", "T")); - var endTimestamp = string.Format("{0}+08:00", error_day.End_timestamp.Replace(" ", "T")); - - var historyQueryFilter = $@" - - - - "; - - HttpWebRequest archiveDayRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); - //HttpWebRequest archiveDayRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); - archiveDayRequest.Method = "POST"; - archiveDayRequest.Headers.Add("Authorization", "Basic " + encoded); - archiveDayRequest.PreAuthenticate = true; - - byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); - using (Stream reqStream = archiveDayRequest.GetRequestStream()) - { - reqStream.Write(byteArray, 0, byteArray.Length); - } - - HttpWebResponse archiveDayResponse = (HttpWebResponse)archiveDayRequest.GetResponse(); - var archiveDayResponseContent = new StreamReader(archiveDayResponse.GetResponseStream()).ReadToEnd(); - - xmlDocument.LoadXml(archiveDayResponseContent); - string archiveDayJson = JsonConvert.SerializeXmlNode(xmlDocument); - JObject archiveDayJsonResult = (JObject)JsonConvert.DeserializeObject(archiveDayJson); - - if (archiveDayJsonResult.ContainsKey("err")) //抓取錯誤 - { - Dictionary archiveDayRawData = new Dictionary(); - archiveDayRawData.Add("@device_number", error_day.Device_number); - archiveDayRawData.Add("@point", error_day.Point); - archiveDayRawData.Add("@start_timestamp", DateTime.Parse(error_day.Start_timestamp, System.Globalization.CultureInfo.CurrentCulture)); - archiveDayRawData.Add("@end_timestamp", DateTime.Parse(error_day.End_timestamp, System.Globalization.CultureInfo.CurrentCulture)); - archiveDayRawData.Add("@is_complete", 0); - archiveDayRawData.Add("@repeat_times", ++error_day.Repeat_times); - archiveDayRawData.Add("@fail_reason", archiveDayJson); - - archiveDayRawData.Add("@count_rawdata", 0); - archiveDayRawData.Add("@min_rawdata", 0); - archiveDayRawData.Add("@max_rawdata", 0); - archiveDayRawData.Add("@avg_rawdata", 0); - archiveDayRawData.Add("@sum_rawdata", 0); - archiveDayRawData.Add("@updated_at", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")); - - waterArchiveDayRawDatas.Add(archiveDayRawData); - } - - if (archiveDayJsonResult.ContainsKey("obj")) //表示可以讀取到內容 - { - var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveDayJsonResult); - if (ArrangeRawDatas != null && ArrangeRawDatas.Count() > 0) - { - waterArchiveDayRawDatas.AddRange(ArrangeRawDatas); - } - } - } - - if (waterArchiveDayRawDatas.Count() > 0) - { - var Mysql_error_update = string.Format(MYsql_update_format, targetTable); - var sql_error_update = string.Format(sql_update_format, targetTable); - if (!string.IsNullOrEmpty(saveToMSDB) && saveToMSDB == "1") - { - await backgroundServiceMsSqlRepository.ExecuteSql(sql_error_update, waterArchiveDayRawDatas); - } - await backgroundServiceRepository.ExecuteSql(Mysql_error_update, waterArchiveDayRawDatas); - } - } - #endregion 天歸檔補償 - - #region 週歸檔補償 - //取得所有須補償的設備資訊 - targetTable = "archive_electric_meter_week"; - var sql_error_week = string.Format(sql_error_format, targetTable); - var eletric_error_weeks = await backgroundServiceRepository.GetAllAsync(sql_error_week, new { RepeatTimes = repeatTimes }); - List> electricArchiveWeekRawDatas = new List>(); - if (eletric_error_weeks.Count() > 0) - { - foreach (var error_week in eletric_error_weeks) - { - DeviceNumberPoint deviceNumberPoint = new DeviceNumberPoint(); - deviceNumberPoint.DeviceNumber = error_week.Device_number; - deviceNumberPoint.Point = error_week.Point; - deviceNumberPoint.FullDeviceNumberPoint = string.Format("{0}_{1}", error_week.Device_number, error_week.Point); - - var startTimestamp = string.Format("{0}+08:00", error_week.Start_timestamp.Replace(" ", "T")); - var endTimestamp = string.Format("{0}+08:00", error_week.End_timestamp.Replace(" ", "T")); - - var historyQueryFilter = $@" - - - - "; - - HttpWebRequest archiveWeekRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); - //HttpWebRequest archiveWeekRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); - archiveWeekRequest.Method = "POST"; - archiveWeekRequest.Headers.Add("Authorization", "Basic " + encoded); - archiveWeekRequest.PreAuthenticate = true; - - byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); - using (Stream reqStream = archiveWeekRequest.GetRequestStream()) - { - reqStream.Write(byteArray, 0, byteArray.Length); - } - - HttpWebResponse archiveWeekResponse = (HttpWebResponse)archiveWeekRequest.GetResponse(); - var archiveWeekResponseContent = new StreamReader(archiveWeekResponse.GetResponseStream()).ReadToEnd(); - - xmlDocument.LoadXml(archiveWeekResponseContent); - string archiveWeekJson = JsonConvert.SerializeXmlNode(xmlDocument); - JObject archiveWeekJsonResult = (JObject)JsonConvert.DeserializeObject(archiveWeekJson); - - if (archiveWeekJsonResult.ContainsKey("err")) //抓取錯誤 - { - Dictionary archiveWeekRawData = new Dictionary(); - archiveWeekRawData.Add("@device_number", error_week.Device_number); - archiveWeekRawData.Add("@point", error_week.Point); - archiveWeekRawData.Add("@start_timestamp", DateTime.Parse(error_week.Start_timestamp, System.Globalization.CultureInfo.CurrentCulture)); - archiveWeekRawData.Add("@end_timestamp", DateTime.Parse(error_week.End_timestamp, System.Globalization.CultureInfo.CurrentCulture)); - archiveWeekRawData.Add("@is_complete", 0); - archiveWeekRawData.Add("@repeat_times", ++error_week.Repeat_times); - archiveWeekRawData.Add("@fail_reason", archiveWeekJson); - - archiveWeekRawData.Add("@count_rawdata", 0); - archiveWeekRawData.Add("@min_rawdata", 0); - archiveWeekRawData.Add("@max_rawdata", 0); - archiveWeekRawData.Add("@avg_rawdata", 0); - archiveWeekRawData.Add("@sum_rawdata", 0); - archiveWeekRawData.Add("@updated_at", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")); - - electricArchiveWeekRawDatas.Add(archiveWeekRawData); - } - - if (archiveWeekJsonResult.ContainsKey("obj")) //表示可以讀取到內容 - { - var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveWeekJsonResult); - if (ArrangeRawDatas != null && ArrangeRawDatas.Count() > 0) - { - electricArchiveWeekRawDatas.AddRange(ArrangeRawDatas); - } - } - } - - if (electricArchiveWeekRawDatas.Count() > 0) - { - var Mysql_error_update = string.Format(MYsql_update_format, targetTable); - var sql_error_update = string.Format(sql_update_format, targetTable); - if (!string.IsNullOrEmpty(saveToMSDB) && saveToMSDB == "1") - { - await backgroundServiceMsSqlRepository.ExecuteSql(sql_error_update, electricArchiveWeekRawDatas); - } - await backgroundServiceRepository.ExecuteSql(Mysql_error_update, electricArchiveWeekRawDatas); - } - } - - targetTable = "archive_water_meter_week"; - sql_error_week = string.Format(sql_error_format, targetTable); - var water_error_weeks = await backgroundServiceRepository.GetAllAsync(sql_error_week, new { RepeatTimes = repeatTimes }); - List> waterArchiveWeekRawDatas = new List>(); - if (water_error_weeks.Count() > 0) - { - foreach (var error_week in water_error_weeks) - { - DeviceNumberPoint deviceNumberPoint = new DeviceNumberPoint(); - deviceNumberPoint.DeviceNumber = error_week.Device_number; - deviceNumberPoint.Point = error_week.Point; - deviceNumberPoint.FullDeviceNumberPoint = string.Format("{0}_{1}", error_week.Device_number, error_week.Point); - - var startTimestamp = string.Format("{0}+08:00", error_week.Start_timestamp.Replace(" ", "T")); - var endTimestamp = string.Format("{0}+08:00", error_week.End_timestamp.Replace(" ", "T")); - - var historyQueryFilter = $@" - - - - "; - - HttpWebRequest archiveWeekRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); - //HttpWebRequest archiveWeekRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); - archiveWeekRequest.Method = "POST"; - archiveWeekRequest.Headers.Add("Authorization", "Basic " + encoded); - archiveWeekRequest.PreAuthenticate = true; - - byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); - using (Stream reqStream = archiveWeekRequest.GetRequestStream()) - { - reqStream.Write(byteArray, 0, byteArray.Length); - } - - HttpWebResponse archiveWeekResponse = (HttpWebResponse)archiveWeekRequest.GetResponse(); - var archiveWeekResponseContent = new StreamReader(archiveWeekResponse.GetResponseStream()).ReadToEnd(); - - xmlDocument.LoadXml(archiveWeekResponseContent); - string archiveWeekJson = JsonConvert.SerializeXmlNode(xmlDocument); - JObject archiveWeekJsonResult = (JObject)JsonConvert.DeserializeObject(archiveWeekJson); - - if (archiveWeekJsonResult.ContainsKey("err")) //抓取錯誤 - { - Dictionary archiveWeekRawData = new Dictionary(); - archiveWeekRawData.Add("@device_number", error_week.Device_number); - archiveWeekRawData.Add("@point", error_week.Point); - archiveWeekRawData.Add("@start_timestamp", DateTime.Parse(error_week.Start_timestamp, System.Globalization.CultureInfo.CurrentCulture)); - archiveWeekRawData.Add("@end_timestamp", DateTime.Parse(error_week.End_timestamp, System.Globalization.CultureInfo.CurrentCulture)); - archiveWeekRawData.Add("@is_complete", 0); - archiveWeekRawData.Add("@repeat_times", ++error_week.Repeat_times); - archiveWeekRawData.Add("@fail_reason", archiveWeekJson); - - archiveWeekRawData.Add("@count_rawdata", 0); - archiveWeekRawData.Add("@min_rawdata", 0); - archiveWeekRawData.Add("@max_rawdata", 0); - archiveWeekRawData.Add("@avg_rawdata", 0); - archiveWeekRawData.Add("@sum_rawdata", 0); - archiveWeekRawData.Add("@updated_at", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")); - - waterArchiveWeekRawDatas.Add(archiveWeekRawData); - } - - if (archiveWeekJsonResult.ContainsKey("obj")) //表示可以讀取到內容 - { - var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveWeekJsonResult); - if (ArrangeRawDatas != null && ArrangeRawDatas.Count() > 0) - { - waterArchiveWeekRawDatas.AddRange(ArrangeRawDatas); - } - } - } - - if (waterArchiveWeekRawDatas.Count() > 0) - { - var Mysql_error_update = string.Format(MYsql_update_format, targetTable); - var sql_error_update = string.Format(sql_update_format, targetTable); - if (!string.IsNullOrEmpty(saveToMSDB) && saveToMSDB == "1") - { - await backgroundServiceMsSqlRepository.ExecuteSql(sql_error_update, waterArchiveWeekRawDatas); - } - await backgroundServiceRepository.ExecuteSql(Mysql_error_update, waterArchiveWeekRawDatas); - } - } - #endregion 週歸檔補償 - - #region 月歸檔補償 - //取得所有須補償的設備資訊 - targetTable = "archive_electric_meter_month"; - var sql_error_month = string.Format(sql_error_format, targetTable); - var electric_error_months = await backgroundServiceRepository.GetAllAsync(sql_error_month, new { RepeatTimes = repeatTimes }); - List> electricArchiveMonthRawDatas = new List>(); - if (electric_error_months.Count() > 0) - { - foreach (var error_month in electric_error_months) - { - DeviceNumberPoint deviceNumberPoint = new DeviceNumberPoint(); - deviceNumberPoint.DeviceNumber = error_month.Device_number; - deviceNumberPoint.Point = error_month.Point; - deviceNumberPoint.FullDeviceNumberPoint = string.Format("{0}_{1}", error_month.Device_number, error_month.Point); - - var startTimestamp = string.Format("{0}+08:00", error_month.Start_timestamp.Replace(" ", "T")); - var endTimestamp = string.Format("{0}+08:00", error_month.End_timestamp.Replace(" ", "T")); - - var startDateTime = Convert.ToDateTime(error_month.Start_timestamp); - var dayInMonth = DateTime.DaysInMonth(startDateTime.Year, startDateTime.Month); - - var historyQueryFilter = $@" - - - - "; - - HttpWebRequest archiveMonthRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); - //HttpWebRequest archiveMonthRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); - archiveMonthRequest.Method = "POST"; - archiveMonthRequest.Headers.Add("Authorization", "Basic " + encoded); - archiveMonthRequest.PreAuthenticate = true; - - byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); - using (Stream reqStream = archiveMonthRequest.GetRequestStream()) - { - reqStream.Write(byteArray, 0, byteArray.Length); - } - - HttpWebResponse archiveMonthResponse = (HttpWebResponse)archiveMonthRequest.GetResponse(); - var archiveMonthResponseContent = new StreamReader(archiveMonthResponse.GetResponseStream()).ReadToEnd(); - - xmlDocument.LoadXml(archiveMonthResponseContent); - string archiveMonthJson = JsonConvert.SerializeXmlNode(xmlDocument); - JObject archiveMonthJsonResult = (JObject)JsonConvert.DeserializeObject(archiveMonthJson); - - if (archiveMonthJsonResult.ContainsKey("err")) //抓取錯誤 - { - Dictionary archiveMonthRawData = new Dictionary(); - archiveMonthRawData.Add("@device_number", error_month.Device_number); - archiveMonthRawData.Add("@point", error_month.Point); - archiveMonthRawData.Add("@start_timestamp", DateTime.Parse(error_month.Start_timestamp, System.Globalization.CultureInfo.CurrentCulture)); - archiveMonthRawData.Add("@end_timestamp", DateTime.Parse(error_month.End_timestamp, System.Globalization.CultureInfo.CurrentCulture)); - archiveMonthRawData.Add("@is_complete", 0); - archiveMonthRawData.Add("@repeat_times", ++error_month.Repeat_times); - archiveMonthRawData.Add("@fail_reason", archiveMonthJson); - - archiveMonthRawData.Add("@count_rawdata", 0); - archiveMonthRawData.Add("@min_rawdata", 0); - archiveMonthRawData.Add("@max_rawdata", 0); - archiveMonthRawData.Add("@avg_rawdata", 0); - archiveMonthRawData.Add("@sum_rawdata", 0); - archiveMonthRawData.Add("@updated_at", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")); - - electricArchiveMonthRawDatas.Add(archiveMonthRawData); - } - - if (archiveMonthJsonResult.ContainsKey("obj")) //表示可以讀取到內容 - { - var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveMonthJsonResult); - if (ArrangeRawDatas != null && ArrangeRawDatas.Count() > 0) - { - electricArchiveMonthRawDatas.AddRange(ArrangeRawDatas); - } - } - } - - if (electricArchiveMonthRawDatas.Count() > 0) - { - var Mysql_error_update = string.Format(MYsql_update_format, targetTable); - var sql_error_update = string.Format(sql_update_format, targetTable); - if (!string.IsNullOrEmpty(saveToMSDB) && saveToMSDB == "1") - { - await backgroundServiceMsSqlRepository.ExecuteSql(sql_error_update, electricArchiveMonthRawDatas); - } - await backgroundServiceRepository.ExecuteSql(MYsql_update_format, electricArchiveMonthRawDatas); - } - } - - targetTable = "archive_electric_meter_month"; - sql_error_month = string.Format(sql_error_format, targetTable); - var water_error_months = await backgroundServiceRepository.GetAllAsync(sql_error_month, new { RepeatTimes = repeatTimes }); - List> waterArchiveMonthRawDatas = new List>(); - if (water_error_months.Count() > 0) - { - foreach (var error_month in water_error_months) - { - DeviceNumberPoint deviceNumberPoint = new DeviceNumberPoint(); - deviceNumberPoint.DeviceNumber = error_month.Device_number; - deviceNumberPoint.Point = error_month.Point; - deviceNumberPoint.FullDeviceNumberPoint = string.Format("{0}_{1}", error_month.Device_number, error_month.Point); - - var startTimestamp = string.Format("{0}+08:00", error_month.Start_timestamp.Replace(" ", "T")); - var endTimestamp = string.Format("{0}+08:00", error_month.End_timestamp.Replace(" ", "T")); - - var startDateTime = Convert.ToDateTime(error_month.Start_timestamp); - var dayInMonth = DateTime.DaysInMonth(startDateTime.Year, startDateTime.Month); - - var historyQueryFilter = $@" - - - - "; - - HttpWebRequest archiveMonthRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); - //HttpWebRequest archiveMonthRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); - archiveMonthRequest.Method = "POST"; - archiveMonthRequest.Headers.Add("Authorization", "Basic " + encoded); - archiveMonthRequest.PreAuthenticate = true; - - byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); - using (Stream reqStream = archiveMonthRequest.GetRequestStream()) - { - reqStream.Write(byteArray, 0, byteArray.Length); - } - - HttpWebResponse archiveMonthResponse = (HttpWebResponse)archiveMonthRequest.GetResponse(); - var archiveMonthResponseContent = new StreamReader(archiveMonthResponse.GetResponseStream()).ReadToEnd(); - - xmlDocument.LoadXml(archiveMonthResponseContent); - string archiveMonthJson = JsonConvert.SerializeXmlNode(xmlDocument); - JObject archiveMonthJsonResult = (JObject)JsonConvert.DeserializeObject(archiveMonthJson); - - if (archiveMonthJsonResult.ContainsKey("err")) //抓取錯誤 - { - Dictionary archiveMonthRawData = new Dictionary(); - archiveMonthRawData.Add("@device_number", error_month.Device_number); - archiveMonthRawData.Add("@point", error_month.Point); - archiveMonthRawData.Add("@start_timestamp", DateTime.Parse(error_month.Start_timestamp, System.Globalization.CultureInfo.CurrentCulture)); - archiveMonthRawData.Add("@end_timestamp", DateTime.Parse(error_month.End_timestamp, System.Globalization.CultureInfo.CurrentCulture)); - archiveMonthRawData.Add("@is_complete", 0); - archiveMonthRawData.Add("@repeat_times", ++error_month.Repeat_times); - archiveMonthRawData.Add("@fail_reason", archiveMonthJson); - - archiveMonthRawData.Add("@count_rawdata", 0); - archiveMonthRawData.Add("@min_rawdata", 0); - archiveMonthRawData.Add("@max_rawdata", 0); - archiveMonthRawData.Add("@avg_rawdata", 0); - archiveMonthRawData.Add("@sum_rawdata", 0); - archiveMonthRawData.Add("@updated_at", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")); - - waterArchiveMonthRawDatas.Add(archiveMonthRawData); - } - - if (archiveMonthJsonResult.ContainsKey("obj")) //表示可以讀取到內容 - { - var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveMonthJsonResult); - if (ArrangeRawDatas != null && ArrangeRawDatas.Count() > 0) - { - waterArchiveMonthRawDatas.AddRange(ArrangeRawDatas); - } - } - } - - if (waterArchiveMonthRawDatas.Count() > 0) - { - var Mysql_error_update = string.Format(MYsql_update_format, targetTable); - var sql_error_update = string.Format(sql_update_format, targetTable); - if (!string.IsNullOrEmpty(saveToMSDB) && saveToMSDB == "1") - { - await backgroundServiceMsSqlRepository.ExecuteSql(sql_error_update, waterArchiveMonthRawDatas); - } - await backgroundServiceRepository.ExecuteSql(MYsql_update_format, waterArchiveMonthRawDatas); - } - } - #endregion 月歸檔補償 - - result = true; - } - catch (Exception exception) - { - throw exception; - } - - return result; - } - - private List> ArrangeRawData(DeviceNumberPoint deviceNumberPoint, JObject jsonResult) - { - List> arrangeRawDatas = new List>(); - var histories = jsonResult["obj"]["list"]; - var rawdateCount = Convert.ToInt32(jsonResult["obj"]["int"]["@val"].ToString()); - - if (rawdateCount == 0) - { - return null; - } - - if (histories != null && histories.HasValues) - { - if (rawdateCount > 1) - { //多筆資料 - foreach (var history in histories) - { - Dictionary arrangeRawData = new Dictionary(); - arrangeRawData.Add("@device_number", deviceNumberPoint.DeviceNumber); - arrangeRawData.Add("@point", deviceNumberPoint.Point); - - //時間 - if (history["abstime"] != null && history["abstime"].HasValues) - { - foreach (var abstime in history["abstime"]) - { - var name = abstime["@name"].ToString(); - switch (name) - { - case "start": - var startTimstamp = Convert.ToDateTime(abstime["@val"].ToString()).ToString("yyyy-MM-dd HH:mm:ss"); - arrangeRawData.Add("@start_timestamp", startTimstamp); - break; - case "end": - var endTimstamp = Convert.ToDateTime(abstime["@val"].ToString()).ToString("yyyy-MM-dd HH:mm:ss"); - arrangeRawData.Add("@end_timestamp", endTimstamp); - break; - } - } - } - - //區間內資料筆數 - if (history["int"] != null && history["int"].HasValues) - { - var count = Convert.ToInt32(histories["obj"]["int"]["@val"].ToString()); - arrangeRawData.Add("@count_rawdata", count); - } - - //整合數值(最大、最小、平均、總和) - if (history["real"] != null && history["real"].HasValues) - { - foreach (var real in history["real"]) - { - var name = real["@name"].ToString(); - switch (name) - { - case "min": - var min = Convert.ToDecimal(real["@val"].ToString()); - arrangeRawData.Add("@min_rawdata", min); - break; - case "max": - var max = Convert.ToDecimal(real["@val"].ToString()); - arrangeRawData.Add("@max_rawdata", max); - break; - case "avg": - var avg = Convert.ToDecimal(real["@val"].ToString()); - arrangeRawData.Add("@avg_rawdata", avg); - break; - case "sum": - var sum = Decimal.Parse(real["@val"].ToString(), System.Globalization.NumberStyles.Float); - arrangeRawData.Add("@sum_rawdata", sum); - break; - } - } - } - arrangeRawData.Add("@is_complete", 1); - arrangeRawData.Add("@repeat_times", 0); - arrangeRawData.Add("@fail_reason", null); - arrangeRawData.Add("@updated_at", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")); - - arrangeRawDatas.Add(arrangeRawData); - } - } - else - { //單筆資料 - Dictionary arrangeRawData = new Dictionary(); - arrangeRawData.Add("@device_number", deviceNumberPoint.DeviceNumber); - arrangeRawData.Add("@point", deviceNumberPoint.Point); - - //時間 - if (histories["obj"]["abstime"] != null && histories["obj"]["abstime"].HasValues) - { - foreach (var abstime in histories["obj"]["abstime"]) - { - var name = abstime["@name"].ToString(); - switch (name) - { - case "start": - var startTimstamp = Convert.ToDateTime(abstime["@val"].ToString()).ToString("yyyy-MM-dd HH:mm:ss"); - arrangeRawData.Add("@start_timestamp", startTimstamp); - break; - case "end": - var endTimstamp = Convert.ToDateTime(abstime["@val"].ToString()).ToString("yyyy-MM-dd HH:mm:ss"); - arrangeRawData.Add("@end_timestamp", endTimstamp); - break; - } - } - } - - //區間內資料筆數 - if (histories["obj"]["int"] != null && histories["obj"]["int"].HasValues) - { - var count = Convert.ToInt32(histories["obj"]["int"]["@val"].ToString()); - arrangeRawData.Add("@count_rawdata", count); - } - - //整合數值(最大、最小、平均、總和) - if (histories["obj"]["real"] != null && histories["obj"]["real"].HasValues) - { - foreach (var real in histories["obj"]["real"]) - { - var name = real["@name"].ToString(); - switch (name) - { - case "min": - var min = Convert.ToDecimal(real["@val"].ToString()); - arrangeRawData.Add("@min_rawdata", min); - break; - case "max": - var max = Convert.ToDecimal(real["@val"].ToString()); - arrangeRawData.Add("@max_rawdata", max); - break; - case "avg": - var avg = Convert.ToDecimal(real["@val"].ToString()); - arrangeRawData.Add("@avg_rawdata", avg); - break; - case "sum": - var sum = Decimal.Parse(real["@val"].ToString(), System.Globalization.NumberStyles.Float); - arrangeRawData.Add("@sum_rawdata", sum); - break; - } - } - } - - arrangeRawData.Add("@is_complete", 1); - arrangeRawData.Add("@repeat_times", 0); - arrangeRawData.Add("@fail_reason", null); - arrangeRawData.Add("@updated_at", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")); - - arrangeRawDatas.Add(arrangeRawData); - } - } - - return arrangeRawDatas; - } - } -} diff --git a/Backend/Services/Implement/Quicktype.cs b/Backend/Services/Implement/Quicktype.cs deleted file mode 100644 index 35dab94..0000000 --- a/Backend/Services/Implement/Quicktype.cs +++ /dev/null @@ -1,640 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -// -// -// To parse this JSON data, add NuGet 'Newtonsoft.Json' then do: -// -// using QuickType; -// -// var welcome = Welcome.FromJson(jsonString); - -namespace QuickType -{ - using System; - using System.Collections.Generic; - - using System.Globalization; - using Newtonsoft.Json; - using Newtonsoft.Json.Converters; - - public partial class Welcome - { - [JsonProperty("success")] - [JsonConverter(typeof(ParseStringConverter))] - public bool Success { get; set; } - - [JsonProperty("result")] - public Result Result { get; set; } - - [JsonProperty("records")] - public Records Records { get; set; } - } - - public partial class Records - { - [JsonProperty("datasetDescription")] - public DatasetDescription DatasetDescription { get; set; } - - [JsonProperty("Earthquake")] - public Earthquake[] Earthquake { get; set; } - } - - public partial class Earthquake - { - [JsonProperty("EarthquakeNo")] - public long EarthquakeNo { get; set; } - - [JsonProperty("ReportType")] - public DatasetDescription ReportType { get; set; } - - [JsonProperty("ReportColor")] - public ReportColor ReportColor { get; set; } - - [JsonProperty("ReportContent")] - public string ReportContent { get; set; } - - [JsonProperty("ReportImageURI")] - public Uri ReportImageUri { get; set; } - - [JsonProperty("ReportRemark")] - public ReportRemark ReportRemark { get; set; } - - [JsonProperty("Web")] - public Uri Web { get; set; } - - [JsonProperty("ShakemapImageURI")] - public Uri ShakemapImageUri { get; set; } - - [JsonProperty("EarthquakeInfo")] - public EarthquakeInfo EarthquakeInfo { get; set; } - - [JsonProperty("Intensity")] - public Intensity Intensity { get; set; } - } - - public partial class EarthquakeInfo - { - [JsonProperty("OriginTime")] - public DateTimeOffset OriginTime { get; set; } - - [JsonProperty("Source")] - public Source Source { get; set; } - - [JsonProperty("FocalDepth")] - public double FocalDepth { get; set; } - - [JsonProperty("Epicenter")] - public Epicenter Epicenter { get; set; } - - [JsonProperty("EarthquakeMagnitude")] - public EarthquakeMagnitude EarthquakeMagnitude { get; set; } - } - - public partial class EarthquakeMagnitude - { - [JsonProperty("MagnitudeType")] - public MagnitudeType MagnitudeType { get; set; } - - [JsonProperty("MagnitudeValue")] - public double MagnitudeValue { get; set; } - } - - public partial class Epicenter - { - [JsonProperty("Location")] - public string Location { get; set; } - - [JsonProperty("EpicenterLatitude")] - public double EpicenterLatitude { get; set; } - - [JsonProperty("EpicenterLongitude")] - public double EpicenterLongitude { get; set; } - } - - public partial class Intensity - { - [JsonProperty("ShakingArea")] - public ShakingArea[] ShakingArea { get; set; } - } - - public partial class ShakingArea - { - [JsonProperty("AreaDesc")] - public string AreaDesc { get; set; } - - [JsonProperty("CountyName")] - public string CountyName { get; set; } - - [JsonProperty("InfoStatus", NullValueHandling = NullValueHandling.Ignore)] - public InfoStatus? InfoStatus { get; set; } - - [JsonProperty("AreaIntensity")] - public AreaIntensityEnum AreaIntensity { get; set; } - - [JsonProperty("EqStation")] - public EqStation[] EqStation { get; set; } - } - - public partial class EqStation - { - [JsonProperty("pga", NullValueHandling = NullValueHandling.Ignore)] - public Pga Pga { get; set; } - - [JsonProperty("pgv", NullValueHandling = NullValueHandling.Ignore)] - public Pga Pgv { get; set; } - - [JsonProperty("StationName")] - public string StationName { get; set; } - - [JsonProperty("StationID")] - public string StationId { get; set; } - - [JsonProperty("InfoStatus", NullValueHandling = NullValueHandling.Ignore)] - public InfoStatus? InfoStatus { get; set; } - - [JsonProperty("BackAzimuth")] - public double BackAzimuth { get; set; } - - [JsonProperty("EpicenterDistance")] - public double EpicenterDistance { get; set; } - - [JsonProperty("SeismicIntensity")] - public AreaIntensityEnum SeismicIntensity { get; set; } - - [JsonProperty("StationLatitude")] - public double StationLatitude { get; set; } - - [JsonProperty("StationLongitude")] - public double StationLongitude { get; set; } - - [JsonProperty("WaveImageURI", NullValueHandling = NullValueHandling.Ignore)] - public Uri WaveImageUri { get; set; } - } - - public partial class Pga - { - [JsonProperty("unit")] - public Unit Unit { get; set; } - - [JsonProperty("EWComponent")] - public double EwComponent { get; set; } - - [JsonProperty("NSComponent")] - public double NsComponent { get; set; } - - [JsonProperty("VComponent")] - public double VComponent { get; set; } - - [JsonProperty("IntScaleValue")] - public double IntScaleValue { get; set; } - } - - public partial class Result - { - [JsonProperty("resource_id")] - public string ResourceId { get; set; } - - [JsonProperty("fields")] - public Field[] Fields { get; set; } - } - - public partial class Field - { - [JsonProperty("id")] - public string Id { get; set; } - - [JsonProperty("type")] - public TypeEnum Type { get; set; } - } - - public enum DatasetDescription { 地震報告 }; - - public enum MagnitudeType { 芮氏規模 }; - - public enum Source { 中央氣象局 }; - - public enum AreaIntensityEnum { The1級, The2級, The3級, The4級 }; - - public enum InfoStatus { Observe }; - - public enum Unit { Gal, Kine }; - - public enum ReportColor { 綠色 }; - - public enum ReportRemark { 本報告係中央氣象局地震觀測網即時地震資料地震速報之結果 }; - - public enum TypeEnum { Float, Integer, String, Timestamp }; - - public partial class Welcome - { - public static Welcome FromJson(string json) => JsonConvert.DeserializeObject(json, QuickType.Converter.Settings); - } - - public static class Serialize - { - public static string ToJson(this Welcome self) => JsonConvert.SerializeObject(self, QuickType.Converter.Settings); - } - - internal static class Converter - { - public static readonly JsonSerializerSettings Settings = new JsonSerializerSettings - { - MetadataPropertyHandling = MetadataPropertyHandling.Ignore, - DateParseHandling = DateParseHandling.None, - Converters = - { - MagnitudeTypeConverter.Singleton, - SourceConverter.Singleton, - AreaIntensityEnumConverter.Singleton, - InfoStatusConverter.Singleton, - UnitConverter.Singleton, - ReportColorConverter.Singleton, - ReportRemarkConverter.Singleton, - DatasetDescriptionConverter.Singleton, - TypeEnumConverter.Singleton, - new IsoDateTimeConverter { DateTimeStyles = DateTimeStyles.AssumeUniversal } - }, - }; - } - - internal class MagnitudeTypeConverter : JsonConverter - { - public override bool CanConvert(Type t) => t == typeof(MagnitudeType) || t == typeof(MagnitudeType?); - - public override object ReadJson(JsonReader reader, Type t, object existingValue, JsonSerializer serializer) - { - if (reader.TokenType == JsonToken.Null) return null; - var value = serializer.Deserialize(reader); - if (value == "芮氏規模") - { - return MagnitudeType.芮氏規模; - } - throw new Exception("Cannot unmarshal type MagnitudeType"); - } - - public override void WriteJson(JsonWriter writer, object untypedValue, JsonSerializer serializer) - { - if (untypedValue == null) - { - serializer.Serialize(writer, null); - return; - } - var value = (MagnitudeType)untypedValue; - if (value == MagnitudeType.芮氏規模) - { - serializer.Serialize(writer, "芮氏規模"); - return; - } - throw new Exception("Cannot marshal type MagnitudeType"); - } - - public static readonly MagnitudeTypeConverter Singleton = new MagnitudeTypeConverter(); - } - - internal class SourceConverter : JsonConverter - { - public override bool CanConvert(Type t) => t == typeof(Source) || t == typeof(Source?); - - public override object ReadJson(JsonReader reader, Type t, object existingValue, JsonSerializer serializer) - { - if (reader.TokenType == JsonToken.Null) return null; - var value = serializer.Deserialize(reader); - if (value == "中央氣象局") - { - return Source.中央氣象局; - } - throw new Exception("Cannot unmarshal type Source"); - } - - public override void WriteJson(JsonWriter writer, object untypedValue, JsonSerializer serializer) - { - if (untypedValue == null) - { - serializer.Serialize(writer, null); - return; - } - var value = (Source)untypedValue; - if (value == Source.中央氣象局) - { - serializer.Serialize(writer, "中央氣象局"); - return; - } - throw new Exception("Cannot marshal type Source"); - } - - public static readonly SourceConverter Singleton = new SourceConverter(); - } - - internal class AreaIntensityEnumConverter : JsonConverter - { - public override bool CanConvert(Type t) => t == typeof(AreaIntensityEnum) || t == typeof(AreaIntensityEnum?); - - public override object ReadJson(JsonReader reader, Type t, object existingValue, JsonSerializer serializer) - { - if (reader.TokenType == JsonToken.Null) return null; - var value = serializer.Deserialize(reader); - switch (value) - { - case "1級": - return AreaIntensityEnum.The1級; - case "2級": - return AreaIntensityEnum.The2級; - case "3級": - return AreaIntensityEnum.The3級; - case "4級": - return AreaIntensityEnum.The4級; - } - throw new Exception("Cannot unmarshal type AreaIntensityEnum"); - } - - public override void WriteJson(JsonWriter writer, object untypedValue, JsonSerializer serializer) - { - if (untypedValue == null) - { - serializer.Serialize(writer, null); - return; - } - var value = (AreaIntensityEnum)untypedValue; - switch (value) - { - case AreaIntensityEnum.The1級: - serializer.Serialize(writer, "1級"); - return; - case AreaIntensityEnum.The2級: - serializer.Serialize(writer, "2級"); - return; - case AreaIntensityEnum.The3級: - serializer.Serialize(writer, "3級"); - return; - case AreaIntensityEnum.The4級: - serializer.Serialize(writer, "4級"); - return; - } - throw new Exception("Cannot marshal type AreaIntensityEnum"); - } - - public static readonly AreaIntensityEnumConverter Singleton = new AreaIntensityEnumConverter(); - } - - internal class InfoStatusConverter : JsonConverter - { - public override bool CanConvert(Type t) => t == typeof(InfoStatus) || t == typeof(InfoStatus?); - - public override object ReadJson(JsonReader reader, Type t, object existingValue, JsonSerializer serializer) - { - if (reader.TokenType == JsonToken.Null) return null; - var value = serializer.Deserialize(reader); - if (value == "observe") - { - return InfoStatus.Observe; - } - throw new Exception("Cannot unmarshal type InfoStatus"); - } - - public override void WriteJson(JsonWriter writer, object untypedValue, JsonSerializer serializer) - { - if (untypedValue == null) - { - serializer.Serialize(writer, null); - return; - } - var value = (InfoStatus)untypedValue; - if (value == InfoStatus.Observe) - { - serializer.Serialize(writer, "observe"); - return; - } - throw new Exception("Cannot marshal type InfoStatus"); - } - - public static readonly InfoStatusConverter Singleton = new InfoStatusConverter(); - } - - internal class UnitConverter : JsonConverter - { - public override bool CanConvert(Type t) => t == typeof(Unit) || t == typeof(Unit?); - - public override object ReadJson(JsonReader reader, Type t, object existingValue, JsonSerializer serializer) - { - if (reader.TokenType == JsonToken.Null) return null; - var value = serializer.Deserialize(reader); - switch (value) - { - case "gal": - return Unit.Gal; - case "kine": - return Unit.Kine; - } - throw new Exception("Cannot unmarshal type Unit"); - } - - public override void WriteJson(JsonWriter writer, object untypedValue, JsonSerializer serializer) - { - if (untypedValue == null) - { - serializer.Serialize(writer, null); - return; - } - var value = (Unit)untypedValue; - switch (value) - { - case Unit.Gal: - serializer.Serialize(writer, "gal"); - return; - case Unit.Kine: - serializer.Serialize(writer, "kine"); - return; - } - throw new Exception("Cannot marshal type Unit"); - } - - public static readonly UnitConverter Singleton = new UnitConverter(); - } - - internal class ReportColorConverter : JsonConverter - { - public override bool CanConvert(Type t) => t == typeof(ReportColor) || t == typeof(ReportColor?); - - public override object ReadJson(JsonReader reader, Type t, object existingValue, JsonSerializer serializer) - { - if (reader.TokenType == JsonToken.Null) return null; - var value = serializer.Deserialize(reader); - if (value == "綠色") - { - return ReportColor.綠色; - } - throw new Exception("Cannot unmarshal type ReportColor"); - } - - public override void WriteJson(JsonWriter writer, object untypedValue, JsonSerializer serializer) - { - if (untypedValue == null) - { - serializer.Serialize(writer, null); - return; - } - var value = (ReportColor)untypedValue; - if (value == ReportColor.綠色) - { - serializer.Serialize(writer, "綠色"); - return; - } - throw new Exception("Cannot marshal type ReportColor"); - } - - public static readonly ReportColorConverter Singleton = new ReportColorConverter(); - } - - internal class ReportRemarkConverter : JsonConverter - { - public override bool CanConvert(Type t) => t == typeof(ReportRemark) || t == typeof(ReportRemark?); - - public override object ReadJson(JsonReader reader, Type t, object existingValue, JsonSerializer serializer) - { - if (reader.TokenType == JsonToken.Null) return null; - var value = serializer.Deserialize(reader); - if (value == "本報告係中央氣象局地震觀測網即時地震資料地震速報之結果。") - { - return ReportRemark.本報告係中央氣象局地震觀測網即時地震資料地震速報之結果; - } - throw new Exception("Cannot unmarshal type ReportRemark"); - } - - public override void WriteJson(JsonWriter writer, object untypedValue, JsonSerializer serializer) - { - if (untypedValue == null) - { - serializer.Serialize(writer, null); - return; - } - var value = (ReportRemark)untypedValue; - if (value == ReportRemark.本報告係中央氣象局地震觀測網即時地震資料地震速報之結果) - { - serializer.Serialize(writer, "本報告係中央氣象局地震觀測網即時地震資料地震速報之結果。"); - return; - } - throw new Exception("Cannot marshal type ReportRemark"); - } - - public static readonly ReportRemarkConverter Singleton = new ReportRemarkConverter(); - } - - internal class DatasetDescriptionConverter : JsonConverter - { - public override bool CanConvert(Type t) => t == typeof(DatasetDescription) || t == typeof(DatasetDescription?); - - public override object ReadJson(JsonReader reader, Type t, object existingValue, JsonSerializer serializer) - { - if (reader.TokenType == JsonToken.Null) return null; - var value = serializer.Deserialize(reader); - if (value == "地震報告") - { - return DatasetDescription.地震報告; - } - throw new Exception("Cannot unmarshal type DatasetDescription"); - } - - public override void WriteJson(JsonWriter writer, object untypedValue, JsonSerializer serializer) - { - if (untypedValue == null) - { - serializer.Serialize(writer, null); - return; - } - var value = (DatasetDescription)untypedValue; - if (value == DatasetDescription.地震報告) - { - serializer.Serialize(writer, "地震報告"); - return; - } - throw new Exception("Cannot marshal type DatasetDescription"); - } - - public static readonly DatasetDescriptionConverter Singleton = new DatasetDescriptionConverter(); - } - - internal class TypeEnumConverter : JsonConverter - { - public override bool CanConvert(Type t) => t == typeof(TypeEnum) || t == typeof(TypeEnum?); - - public override object ReadJson(JsonReader reader, Type t, object existingValue, JsonSerializer serializer) - { - if (reader.TokenType == JsonToken.Null) return null; - var value = serializer.Deserialize(reader); - switch (value) - { - case "Float": - return TypeEnum.Float; - case "Integer": - return TypeEnum.Integer; - case "String": - return TypeEnum.String; - case "Timestamp": - return TypeEnum.Timestamp; - } - throw new Exception("Cannot unmarshal type TypeEnum"); - } - - public override void WriteJson(JsonWriter writer, object untypedValue, JsonSerializer serializer) - { - if (untypedValue == null) - { - serializer.Serialize(writer, null); - return; - } - var value = (TypeEnum)untypedValue; - switch (value) - { - case TypeEnum.Float: - serializer.Serialize(writer, "Float"); - return; - case TypeEnum.Integer: - serializer.Serialize(writer, "Integer"); - return; - case TypeEnum.String: - serializer.Serialize(writer, "String"); - return; - case TypeEnum.Timestamp: - serializer.Serialize(writer, "Timestamp"); - return; - } - throw new Exception("Cannot marshal type TypeEnum"); - } - - public static readonly TypeEnumConverter Singleton = new TypeEnumConverter(); - } - - internal class ParseStringConverter : JsonConverter - { - public override bool CanConvert(Type t) => t == typeof(bool) || t == typeof(bool?); - - public override object ReadJson(JsonReader reader, Type t, object existingValue, JsonSerializer serializer) - { - if (reader.TokenType == JsonToken.Null) return null; - var value = serializer.Deserialize(reader); - bool b; - if (Boolean.TryParse(value, out b)) - { - return b; - } - throw new Exception("Cannot unmarshal type bool"); - } - - public override void WriteJson(JsonWriter writer, object untypedValue, JsonSerializer serializer) - { - if (untypedValue == null) - { - serializer.Serialize(writer, null); - return; - } - var value = (bool)untypedValue; - var boolString = value ? "true" : "false"; - serializer.Serialize(writer, boolString); - return; - } - - public static readonly ParseStringConverter Singleton = new ParseStringConverter(); - } -} diff --git a/Backend/Services/Implement/RainApi.cs b/Backend/Services/Implement/RainApi.cs deleted file mode 100644 index 2757671..0000000 --- a/Backend/Services/Implement/RainApi.cs +++ /dev/null @@ -1,213 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -// -// -// To parse this JSON data, add NuGet 'Newtonsoft.Json' then do: -// -// using QuickType; -// -// var welcome = Welcome.FromJson(jsonString); - -namespace RainApi -{ - using System; - using System.Collections.Generic; - - using System.Globalization; - using Newtonsoft.Json; - using Newtonsoft.Json.Converters; - - public partial class Welcome - { - [JsonProperty("?xml")] - public Xml Xml { get; set; } - - [JsonProperty("alert")] - public Alert Alert { get; set; } - } - - public partial class Alert - { - [JsonProperty("@xmlns")] - public string Xmlns { get; set; } - - [JsonProperty("identifier")] - public string Identifier { get; set; } - - [JsonProperty("sender")] - public string Sender { get; set; } - - [JsonProperty("sent")] - public DateTimeOffset Sent { get; set; } - - [JsonProperty("status")] - public string Status { get; set; } - - [JsonProperty("msgType")] - public string MsgType { get; set; } - - [JsonProperty("scope")] - public string Scope { get; set; } - - [JsonProperty("references")] - public string References { get; set; } - - [JsonProperty("info")] - public Info Info { get; set; } - } - - public partial class Info - { - [JsonProperty("language")] - public string Language { get; set; } - - [JsonProperty("category")] - public string Category { get; set; } - - [JsonProperty("event")] - public string Event { get; set; } - - [JsonProperty("urgency")] - public string Urgency { get; set; } - - [JsonProperty("severity")] - public string Severity { get; set; } - - [JsonProperty("certainty")] - public string Certainty { get; set; } - - [JsonProperty("eventCode")] - public EventCode EventCode { get; set; } - - [JsonProperty("effective")] - public DateTimeOffset Effective { get; set; } - - [JsonProperty("onset")] - public DateTimeOffset Onset { get; set; } - - [JsonProperty("expires")] - public DateTimeOffset Expires { get; set; } - - [JsonProperty("senderName")] - public string SenderName { get; set; } - - [JsonProperty("headline")] - public string Headline { get; set; } - - [JsonProperty("description")] - public string Description { get; set; } - - [JsonProperty("instruction")] - public string Instruction { get; set; } - - [JsonProperty("web")] - public Uri Web { get; set; } - - [JsonProperty("parameter")] - public EventCode Parameter { get; set; } - - [JsonProperty("area")] - public List Area { get; set; } - } - - public partial class Area - { - [JsonProperty("areaDesc")] - public string AreaDesc { get; set; } - - [JsonProperty("geocode")] - public EventCode Geocode { get; set; } - } - - public partial class EventCode - { - [JsonProperty("valueName")] - public string ValueName { get; set; } - - [JsonProperty("value")] - public string Value { get; set; } - } - - public partial class Xml - { - [JsonProperty("@version")] - public string Version { get; set; } - - [JsonProperty("@encoding")] - public string Encoding { get; set; } - } - - public enum ValueName { AlertTitle, ProfileCapTwpEvent10, TaiwanGeocode103 }; - - public partial class Welcome - { - public static Welcome FromJson(string json) => JsonConvert.DeserializeObject(json, QuickType.Converter.Settings); - } - - public static class Serialize - { - public static string ToJson(this Welcome self) => JsonConvert.SerializeObject(self, QuickType.Converter.Settings); - } - - internal static class Converter - { - public static readonly JsonSerializerSettings Settings = new JsonSerializerSettings - { - MetadataPropertyHandling = MetadataPropertyHandling.Ignore, - DateParseHandling = DateParseHandling.None, - Converters = - { - ValueNameConverter.Singleton, - new IsoDateTimeConverter { DateTimeStyles = DateTimeStyles.AssumeUniversal } - }, - }; - } - - internal class ValueNameConverter : JsonConverter - { - public override bool CanConvert(Type t) => t == typeof(ValueName) || t == typeof(ValueName?); - - public override object ReadJson(JsonReader reader, Type t, object existingValue, JsonSerializer serializer) - { - if (reader.TokenType == JsonToken.Null) return null; - var value = serializer.Deserialize(reader); - switch (value) - { - case "Taiwan_Geocode_103": - return ValueName.TaiwanGeocode103; - case "alert_title": - return ValueName.AlertTitle; - case "profile:CAP-TWP:Event:1.0": - return ValueName.ProfileCapTwpEvent10; - } - throw new Exception("Cannot unmarshal type ValueName"); - } - - public override void WriteJson(JsonWriter writer, object untypedValue, JsonSerializer serializer) - { - if (untypedValue == null) - { - serializer.Serialize(writer, null); - return; - } - var value = (ValueName)untypedValue; - switch (value) - { - case ValueName.TaiwanGeocode103: - serializer.Serialize(writer, "Taiwan_Geocode_103"); - return; - case ValueName.AlertTitle: - serializer.Serialize(writer, "alert_title"); - return; - case ValueName.ProfileCapTwpEvent10: - serializer.Serialize(writer, "profile:CAP-TWP:Event:1.0"); - return; - } - throw new Exception("Cannot marshal type ValueName"); - } - - public static readonly ValueNameConverter Singleton = new ValueNameConverter(); - } -} diff --git a/Backend/Services/Implement/SendEmailService.cs b/Backend/Services/Implement/SendEmailService.cs deleted file mode 100644 index b72b5ee..0000000 --- a/Backend/Services/Implement/SendEmailService.cs +++ /dev/null @@ -1,81 +0,0 @@ -using Microsoft.Extensions.Options; -using Backend.Models; - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Net.Mail; -using System.Threading.Tasks; -using BackendWorkerService.Services.Interface; -using Microsoft.Extensions.Logging; - -namespace BackendWorkerService.Services.Implement -{ - public class SendEmailService : ISendEmailService - { - private readonly ILogger logger; - private readonly IOptions _options; - - private SMTPConfig smtp; - - public SendEmailService(ILogger logger, IOptions options) - { - this.logger = logger; - smtp = options.Value; - } - - public bool Send(int id, List recipientEmails, string subject, string content) - { - try - { - logger.LogInformation("【SendEmailSMSService】【Email開始寄送】[任務編號]：{0}", id); - - MailMessage MyMail = new MailMessage(); - - MyMail.SubjectEncoding = System.Text.Encoding.UTF8;//郵件標題編碼 - MyMail.BodyEncoding = System.Text.Encoding.UTF8; //郵件內容編碼 - MyMail.IsBodyHtml = true; //是否使用html格式 - - var mailFrom = $"FIC IBMS管理系統通知 <{smtp.UserName}>"; - - MyMail.From = new System.Net.Mail.MailAddress(mailFrom); //寄件人 - foreach (var email in recipientEmails) - { - MyMail.To.Add(email); //設定收件者Email - } - - MyMail.Subject = subject; //主題 - MyMail.Body = content; //設定信件內容 - - //讀取 SMTP Config - SmtpClient MySMTP = new SmtpClient(smtp.Host, smtp.Port); - MySMTP.EnableSsl = smtp.EnableSsl; - MySMTP.Credentials = new System.Net.NetworkCredential(smtp.UserName, smtp.Password); - - try - { - MySMTP.Send(MyMail); - MySMTP.Dispose(); - MyMail.Dispose(); //釋放資源 - - logger.LogInformation("【SendEmailSMSService】【Email寄送成功】[任務編號]：{0}", id); - return true; - } - catch(Exception exception) - { - logger.LogError("【SendEmailSMSService】【Email寄送失敗】[任務編號]：{0}", id); - logger.LogError("【SendEmailSMSService】【Email寄送失敗】[Exception]：{0}", exception.ToString()); - return false; - } - } - catch (Exception exception) - { - logger.LogError("【SendEmailSMSService】【Email寄送失敗】[任務編號]：{0}", id); - logger.LogError("【SendEmailSMSService】【Email寄送失敗】[Exception]：{0}", exception.ToString()); - throw; - //return false; - } - - } - } -} diff --git a/Backend/Services/Implement/SendLineNotifyService.cs b/Backend/Services/Implement/SendLineNotifyService.cs deleted file mode 100644 index b291d6a..0000000 --- a/Backend/Services/Implement/SendLineNotifyService.cs +++ /dev/null @@ -1,54 +0,0 @@ -using BackendWorkerService.Services.Interface; -using Microsoft. Extensions.Logging; -using Newtonsoft.Json.Linq; -using System; -using System.Collections.Generic; -using System.IO; -using System.Net; -using System.Text; - -namespace BackendWorkerService.Services.Implement -{ - class SendLineNotifyService: ISendLineNotifyService - { - - private readonly ILogger logger; - - public SendLineNotifyService(ILogger logger) - { - this.logger = logger; - } - - public bool Send(int id, string lineToken, string message) - { - try - { - logger.LogInformation("【SendLineNotifyService】【Line Notify開始發送】[任務編號]：{0}", id); - HttpWebRequest Postrequest = (HttpWebRequest)WebRequest.Create("https://notify-api.line.me/api/notify?message=" + message); - Postrequest.Method = "POST"; - Postrequest.Headers.Add("Authorization", "Bearer " + lineToken); - Postrequest.PreAuthenticate = true; - HttpWebResponse response = (HttpWebResponse)Postrequest.GetResponse(); - var responseString = new StreamReader(response.GetResponseStream()).ReadToEnd(); - var final = JObject.Parse(responseString); - var get = final["status"].ToString(); - if (get != "200") - { - logger.LogError("【SendLineNotifyService】【Line Notify發送失敗】[任務編號]：{0}", id); - logger.LogError("【SendLineNotifyService】【Line Notify發送失敗】[失敗內容]：{0}", responseString); - return false; - } - - logger.LogInformation("【SendLineNotifyService】【Line Notify發送成功】[任務編號]：{0}", id); - return true; - } - catch (Exception exception) - { - logger.LogError("【SendLineNotifyService】【Line Notify發送失敗】[任務編號]：{0}", id); - logger.LogError("【SendLineNotifyService】【Line Notify發送失敗】[Exception]：{0}", exception.ToString()); - throw; - //return false; - } - } - } -} diff --git a/Backend/Services/Implement/SendSMSService.cs b/Backend/Services/Implement/SendSMSService.cs deleted file mode 100644 index 97e4259..0000000 --- a/Backend/Services/Implement/SendSMSService.cs +++ /dev/null @@ -1,84 +0,0 @@ -using Backend.Models; -using BackendWorkerService.Services.Interface; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Options; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; -using System; -using System.Collections.Generic; -using System.IO; -using System.Net; -using System.Text; -using System.Xml; - -namespace BackendWorkerService.Services.Implement -{ - class SendSMSService : ISendSMSService - { - private readonly ILogger logger; - private readonly IOptions _options; - - private SMSConfig sms; - - public SendSMSService(ILogger logger, IOptions options) - { - this.logger = logger; - sms = options.Value; - sms.Encoded = Convert.ToBase64String(Encoding.GetEncoding("ISO-8859-1").GetBytes(sms.UserName + ":" + sms.Password)); - } - - public bool Send(int id, string phone, string content) - { - try - { - logger.LogError("【SendSMSService】【SMS開始寄送】[任務編號]：{0}", id); - //設定傳送的Request - HttpWebRequest Postrequest = (HttpWebRequest)WebRequest.Create(sms.Api); - Postrequest.Method = "POST"; - Postrequest.Headers.Add("Authorization", "Basic " + sms.Encoded); - Postrequest.PreAuthenticate = true; - using (var streamWriter = new StreamWriter(Postrequest.GetRequestStream())) - { - string json = string.Format("", phone, content); - - streamWriter.Write(json); - } - - //設定回傳的Request - HttpWebResponse response = (HttpWebResponse)Postrequest.GetResponse(); - var responseString = new StreamReader(response.GetResponseStream()).ReadToEnd(); - XmlDocument xmlDoc = new XmlDocument(); - xmlDoc.LoadXml(responseString); - string jsonText = JsonConvert.SerializeXmlNode(xmlDoc); - JObject resultVal = (JObject)JsonConvert.DeserializeObject(jsonText); - - if (resultVal.ContainsKey("obj")) - { - var display_split = resultVal["obj"]["@display"].ToString().Split(' '); - var responseStatus = display_split[display_split.Length - 1]; - - if (responseStatus == "{ok}") - { - logger.LogInformation("【SendSMSService】【SMS寄送成功】[任務編號]：{0}", id); - return true; - } - } - else - { - logger.LogError("【SendSMSService】【SMS寄送失敗】[任務編號]：{0}", id); - logger.LogError("【SendSMSService】【SMS寄送失敗】[失敗內容]：{0}", resultVal); - return false; - } - - return false; - } - catch (Exception exception) - { - logger.LogError("【SendSMSService】【SMS寄送失敗】[任務編號]：{0}", id); - logger.LogError("【SendSMSService】【SMS寄送失敗】[Exception]：{0}", exception.ToString()); - throw; - //return false; - } - } - } -} diff --git a/Backend/Services/Implement/TyphoonApi.cs b/Backend/Services/Implement/TyphoonApi.cs deleted file mode 100644 index 87a2e6d..0000000 --- a/Backend/Services/Implement/TyphoonApi.cs +++ /dev/null @@ -1,213 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -// -// -// To parse this JSON data, add NuGet 'Newtonsoft.Json' then do: -// -// using QuickType; -// -// var welcome = Welcome.FromJson(jsonString); - -namespace TyphoonApi -{ - using System; - using System.Collections.Generic; - - using System.Globalization; - using Newtonsoft.Json; - using Newtonsoft.Json.Converters; - - public partial class Welcome - { - [JsonProperty("?xml")] - public Xml Xml { get; set; } - - [JsonProperty("alert")] - public Alert Alert { get; set; } - } - - public partial class Alert - { - [JsonProperty("@xmlns")] - public string Xmlns { get; set; } - - [JsonProperty("identifier")] - public string Identifier { get; set; } - - [JsonProperty("sender")] - public string Sender { get; set; } - - [JsonProperty("sent")] - public DateTimeOffset Sent { get; set; } - - [JsonProperty("status")] - public string Status { get; set; } - - [JsonProperty("msgType")] - public string MsgType { get; set; } - - [JsonProperty("scope")] - public string Scope { get; set; } - - [JsonProperty("references")] - public string References { get; set; } - - [JsonProperty("info")] - public Info Info { get; set; } - } - - public partial class Info - { - [JsonProperty("language")] - public string Language { get; set; } - - [JsonProperty("category")] - public string Category { get; set; } - - [JsonProperty("event")] - public string Event { get; set; } - - [JsonProperty("urgency")] - public string Urgency { get; set; } - - [JsonProperty("severity")] - public string Severity { get; set; } - - [JsonProperty("certainty")] - public string Certainty { get; set; } - - [JsonProperty("eventCode")] - public EventCode EventCode { get; set; } - - [JsonProperty("effective")] - public DateTimeOffset Effective { get; set; } - - [JsonProperty("onset")] - public DateTimeOffset Onset { get; set; } - - [JsonProperty("expires")] - public DateTimeOffset Expires { get; set; } - - [JsonProperty("senderName")] - public string SenderName { get; set; } - - [JsonProperty("headline")] - public string Headline { get; set; } - - [JsonProperty("description")] - public string Description { get; set; } - - [JsonProperty("instruction")] - public string Instruction { get; set; } - - [JsonProperty("web")] - public Uri Web { get; set; } - - [JsonProperty("parameter")] - public EventCode Parameter { get; set; } - - [JsonProperty("area")] - public List Area { get; set; } - } - - public partial class Area - { - [JsonProperty("areaDesc")] - public string AreaDesc { get; set; } - - [JsonProperty("geocode")] - public EventCode Geocode { get; set; } - } - - public partial class EventCode - { - [JsonProperty("valueName")] - public string ValueName { get; set; } - - [JsonProperty("value")] - public string Value { get; set; } - } - - public partial class Xml - { - [JsonProperty("@version")] - public string Version { get; set; } - - [JsonProperty("@encoding")] - public string Encoding { get; set; } - } - - public enum ValueName { AlertTitle, ProfileCapTwpEvent10, TaiwanGeocode103 }; - - public partial class Welcome - { - public static Welcome FromJson(string json) => JsonConvert.DeserializeObject(json, QuickType.Converter.Settings); - } - - public static class Serialize - { - public static string ToJson(this Welcome self) => JsonConvert.SerializeObject(self, QuickType.Converter.Settings); - } - - internal static class Converter - { - public static readonly JsonSerializerSettings Settings = new JsonSerializerSettings - { - MetadataPropertyHandling = MetadataPropertyHandling.Ignore, - DateParseHandling = DateParseHandling.None, - Converters = - { - ValueNameConverter.Singleton, - new IsoDateTimeConverter { DateTimeStyles = DateTimeStyles.AssumeUniversal } - }, - }; - } - - internal class ValueNameConverter : JsonConverter - { - public override bool CanConvert(Type t) => t == typeof(ValueName) || t == typeof(ValueName?); - - public override object ReadJson(JsonReader reader, Type t, object existingValue, JsonSerializer serializer) - { - if (reader.TokenType == JsonToken.Null) return null; - var value = serializer.Deserialize(reader); - switch (value) - { - case "Taiwan_Geocode_103": - return ValueName.TaiwanGeocode103; - case "alert_title": - return ValueName.AlertTitle; - case "profile:CAP-TWP:Event:1.0": - return ValueName.ProfileCapTwpEvent10; - } - throw new Exception("Cannot unmarshal type ValueName"); - } - - public override void WriteJson(JsonWriter writer, object untypedValue, JsonSerializer serializer) - { - if (untypedValue == null) - { - serializer.Serialize(writer, null); - return; - } - var value = (ValueName)untypedValue; - switch (value) - { - case ValueName.TaiwanGeocode103: - serializer.Serialize(writer, "Taiwan_Geocode_103"); - return; - case ValueName.AlertTitle: - serializer.Serialize(writer, "alert_title"); - return; - case ValueName.ProfileCapTwpEvent10: - serializer.Serialize(writer, "profile:CAP-TWP:Event:1.0"); - return; - } - throw new Exception("Cannot marshal type ValueName"); - } - - public static readonly ValueNameConverter Singleton = new ValueNameConverter(); - } -} diff --git a/Backend/Services/Interface/ISendEmailService.cs b/Backend/Services/Interface/ISendEmailService.cs deleted file mode 100644 index a349ed7..0000000 --- a/Backend/Services/Interface/ISendEmailService.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace BackendWorkerService.Services.Interface -{ - public interface ISendEmailService - { - bool Send(int id, List recipientEmails, string subject, string content); - } -} diff --git a/Backend/Services/Interface/ISendLineNotifyService.cs b/Backend/Services/Interface/ISendLineNotifyService.cs deleted file mode 100644 index 295dd8c..0000000 --- a/Backend/Services/Interface/ISendLineNotifyService.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace BackendWorkerService.Services.Interface -{ - public interface ISendLineNotifyService - { - bool Send(int id, string lineToken, string message); - } -} diff --git a/Backend/Services/Interface/ISendSMSService.cs b/Backend/Services/Interface/ISendSMSService.cs deleted file mode 100644 index c414a93..0000000 --- a/Backend/Services/Interface/ISendSMSService.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace BackendWorkerService.Services.Interface -{ - public interface ISendSMSService - { - bool Send(int id, string phone, string message); - } -} diff --git a/Backend/Startup.cs b/Backend/Startup.cs index b5b000e..73a96ec 100644 --- a/Backend/Startup.cs +++ b/Backend/Startup.cs @@ -107,8 +107,6 @@ namespace Backend services.AddTransient(); #endregion DBHelper `J - - #region Repository `J services.AddTransient(); services.AddTransient(); @@ -121,12 +119,6 @@ namespace Backend services.AddTransient(); #endregion Repository `J - #region K[QuartzA - services.AddTransient(); - services.AddTransient(); - services.AddHostedService(); - #endregion - #region JWT `J services.AddTransient(); services @@ -163,20 +155,6 @@ namespace Backend }); #endregion JWT `J - #region qk(]wC @) - services.AddSingleton(); - services.AddSingleton( - new JobSchedule(jobType: typeof(ArchiveElectricMeterDayJob), cronExpression: Configuration.GetValue("BackgroundServiceCron:ArchiveElectricMeterDayJob")) - ); - #endregion - - //#region wɨoHAPI - //services.AddSingleton(); - //services.AddSingleton( - //new JobSchedule(jobType: typeof(WeatherAPIJob), cronExpression: Configuration.GetValue("BackgroundServiceCron:WeatherAPIJob")) - //); - //#endregion - double loginExpireMinute = this.Configuration.GetValue("LoginExpireMinute"); services.AddSession(options => { diff --git a/Backend/appsettings.Development.json b/Backend/appsettings.Development.json index 6892d36..83cd09a 100644 --- a/Backend/appsettings.Development.json +++ b/Backend/appsettings.Development.json @@ -12,17 +12,6 @@ "SignKey": "TaipeiDome123456", //簽章//最少16字元 "JwtLifeSeconds": 3600 }, - "LoggerPath": "C:\\Project\\ASP.NET\\BIMS\\Backend", - "BackgroundServiceCron": { - "ExecutionBackgroundServicePlanJob": "0 0 2 * * ?", - "MessageNotificationJob": "0 0 2 * * ?", - "DataDeliveryJob": "0 0 2 * * ?", - "RegularUpdateDBTableJob": "0 0 2 * * ?", - "ParkingJob": "0 0 2 * * ?", - "ArchiveElectricMeterHourJob": "0 0 2 * * ?", - "ArchiveElectricMeterDayJob": "0 0 2 * * ?", - "WeatherAPIJob": "0/5 * * * * ?" - }, "DBConfig": { "MySqlDBConfig": { "Server": "FYlY+w0XDIz+jmF2rlZWJw==", //0.201 @@ -32,6 +21,7 @@ "Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome //"Database": "siTUcDaC/g2yGTMFWD72Kg==", //tpe_dome_hotel //"Database": "iuaY0h0+TWkir44/eZLDqw==", //tpe_dome_office + //"Database": "Rq7Gn4x6LwBvVtl7GY8LbA==", //mcut "Root": "SzdxEgaJJ7tcTCrUl2zKsA==", "Password": "FVAPxztxpY4gJJKQ/se4bQ==" }, @@ -39,7 +29,7 @@ "Server": "bJm+UAtbeaTjDmp/A5ep2w==", //0.130 "Port": "S5cUXKnKOacFtFy9+0dtpw==", "Database": "VvfWH/59gQguY2eA2xBCug==", //taipei_dome - "Root": "sD8GZ9UPiIQGU6dU011/4A==", + "Root": "4GCCJGAXzLa8ecdmPAkYKg==", "Password": "0O24es2ZRF5uoJ4aU+YCdg==" } //"MSSqlDBConfig": { diff --git a/Backend/appsettings.json b/Backend/appsettings.json index 3670e10..57a78d7 100644 --- a/Backend/appsettings.json +++ b/Backend/appsettings.json @@ -12,7 +12,6 @@ "SignKey": "TaipeiDome123456", //簽章//最少16字元 "JwtLifeSeconds": 3600 }, - "LoggerPath": "C:\\Project\\ASP.NET\\BIMS\\Backend", "DBConfig": { "MySqlDBConfig": { "Server": "FYlY+w0XDIz+jmF2rlZWJw==", //0.201 @@ -28,7 +27,7 @@ "Server": "bJm+UAtbeaTjDmp/A5ep2w==", //0.130 "Port": "S5cUXKnKOacFtFy9+0dtpw==", "Database": "VvfWH/59gQguY2eA2xBCug==", //taipei_dome - "Root": "sD8GZ9UPiIQGU6dU011/4A==", + "Root": "4GCCJGAXzLa8ecdmPAkYKg==", "Password": "0O24es2ZRF5uoJ4aU+YCdg==" } //"MSSqlDBConfig": { diff --git a/BackendWorkerService/Program.cs b/BackendWorkerService/Program.cs index 6177f06..7521b31 100644 --- a/BackendWorkerService/Program.cs +++ b/BackendWorkerService/Program.cs @@ -50,23 +50,23 @@ namespace BackendWorkerService //services.AddHostedService(); - #region Tq + //#region Tq - #region SMPTtm - services.AddTransient(); - services.Configure(configuration.GetSection("SMTPConfig")); - #endregion + //#region SMPTtm + //services.AddTransient(); + //services.Configure(configuration.GetSection("SMTPConfig")); + //#endregion - #region SMStm - services.AddTransient(); - services.Configure(configuration.GetSection("SMSConfig")); - #endregion + //#region SMStm + //services.AddTransient(); + //services.Configure(configuration.GetSection("SMSConfig")); + //#endregion - #region Line Notifytm - services.AddTransient(); - #endregion + //#region Line Notifytm + //services.AddTransient(); + //#endregion - #endregion Tq + //#endregion Tq #region DBHelper `J services.Configure(configuration.GetSection("DBConfig")); @@ -93,10 +93,6 @@ namespace BackendWorkerService services.AddTransient(); services.AddHostedService(); - - - - //#region Ipe(]w1min@) //services.AddSingleton(); //services.AddSingleton( @@ -138,6 +134,7 @@ namespace BackendWorkerService //new JobSchedule(jobType: typeof(ArchiveElectricMeterHourJob), cronExpression: configuration.GetValue("BackgroundServiceCron:ArchiveElectricMeterHourJob")) //); //#endregion + #region qk(]wC @) services.AddSingleton(); services.AddSingleton( @@ -145,12 +142,12 @@ namespace BackendWorkerService ); #endregion - #region wɨoHAPI - services.AddSingleton(); - services.AddSingleton( - new JobSchedule(jobType: typeof(Quartz.Jobs.WeatherAPIJob), cronExpression: configuration.GetValue("BackgroundServiceCron:WeatherAPIJob")) - ); - #endregion + //#region wɨoHAPI + //services.AddSingleton(); + //services.AddSingleton( + //new JobSchedule(jobType: typeof(Quartz.Jobs.WeatherAPIJob), cronExpression: configuration.GetValue("BackgroundServiceCron:WeatherAPIJob")) + //); + //#endregion }).ConfigureLogging((hostContext, logFactory) => { IConfiguration configuration = hostContext.Configuration; diff --git a/BackendWorkerService/Quartz/Jobs/ArchiveElectricMeterDayJob.cs b/BackendWorkerService/Quartz/Jobs/ArchiveElectricMeterDayJob.cs index e1f6670..8a3b8cc 100644 --- a/BackendWorkerService/Quartz/Jobs/ArchiveElectricMeterDayJob.cs +++ b/BackendWorkerService/Quartz/Jobs/ArchiveElectricMeterDayJob.cs @@ -125,7 +125,7 @@ namespace BackendWorkerService.Quartz.Jobs { try { - await task_Detail.InsertWorkTime("ArchiveElectricMeterDayJob", "Day", "任務開始"); + await task_Detail.InsertWorkTime("ArchiveElectricMeterDayJob", "Day", "水電表天任務開始"); var preDay = now.AddDays(-1); //取得前一天 var dbDateName = preDay.Year.ToString().PadLeft(4, '0') + preDay.Month.ToString().PadLeft(2, '0'); @@ -581,7 +581,7 @@ namespace BackendWorkerService.Quartz.Jobs { try { - await task_Detail.InsertWorkTime("ArchiveElectricMeterDayJob", "Week", "任務開始"); + await task_Detail.InsertWorkTime("ArchiveElectricMeterDayJob", "Week", "水電表周任務開始"); int week = Convert.ToInt32(now.DayOfWeek); week = week == 0 ? 7 : week; @@ -931,7 +931,7 @@ namespace BackendWorkerService.Quartz.Jobs { try { - await task_Detail.InsertWorkTime("ArchiveElectricMeterDayJob", "Month", "任務開始"); + await task_Detail.InsertWorkTime("ArchiveElectricMeterDayJob", "Month", "水電表月任務開始"); var FirstDay = now.AddDays(-now.Day + 1); var LastDay = now.AddMonths(1).AddDays(-now.AddMonths(1).Day); diff --git a/BackendWorkerService/Worker.cs b/BackendWorkerService/Worker.cs index a574e9a..b75af1c 100644 --- a/BackendWorkerService/Worker.cs +++ b/BackendWorkerService/Worker.cs @@ -1,7 +1,10 @@ using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; +using Serilog; using System; using System.Collections.Generic; +using System.Diagnostics; +using System.IO; using System.Linq; using System.Threading; using System.Threading.Tasks; diff --git a/BackendWorkerService/appsettings.Development.json b/BackendWorkerService/appsettings.Development.json index 7c9cf15..8620376 100644 --- a/BackendWorkerService/appsettings.Development.json +++ b/BackendWorkerService/appsettings.Development.json @@ -6,6 +6,7 @@ "Microsoft.Hosting.Lifetime": "Information" } }, + "LoggerPath": "C:\\inetpub\\Taipei_dome_background_service\\Logs", "BackgroundServiceCron": { "ExecutionBackgroundServicePlanJob": "0 0 2 * * ?", "MessageNotificationJob": "0 0 2 * * ?", @@ -13,17 +14,10 @@ "RegularUpdateDBTableJob": "0 0 2 * * ?", "ParkingJob": "0 0 2 * * ?", "ArchiveElectricMeterHourJob": "0 0 2 * * ?", - "ArchiveElectricMeterDayJob": "0 0 2 * * ?", - "WeatherAPIJob": "0/5 * * * * ?" + "ArchiveElectricMeterDayJob": "0/5 * * * * ?", + "WeatherAPIJob": "0 0 2 * * ?" }, "DBConfig": { - //"MySqlDBConfig": { - // "Server": "TNi6aupYHPZT8ZU177KTKw==", //172.16.220.251 - // "Port": "mkF51jVbg40V5K5eTh2Ckw==", - // "Database": "VvfWH/59gQguY2eA2xBCug==", - // "Root": "IV8Ec1Ng2AWAnkBafXy2kg==", - // "Password": "Jue6jMFRi11meN6xbdKwDA==" - //}, "MySqlDBConfig": { "Server": "FYlY+w0XDIz+jmF2rlZWJw==", //0.201 "Port": "js2LutKe+rdjzdxMPQUrvQ==", @@ -38,24 +32,9 @@ "Server": "bJm+UAtbeaTjDmp/A5ep2w==", //0.130 "Port": "S5cUXKnKOacFtFy9+0dtpw==", "Database": "VvfWH/59gQguY2eA2xBCug==", //taipei_dome - "Root": "sD8GZ9UPiIQGU6dU011/4A==", + "Root": "4GCCJGAXzLa8ecdmPAkYKg==", "Password": "0O24es2ZRF5uoJ4aU+YCdg==" } - //"MSSqlDBConfig": { //greencloud.fic.com.tw,1433 - // "Server": "ueFp+VFb200lhh1Uctc97WH0/tX6tfXYU2v1oxCWuuM=", - // "Port": "S5cUXKnKOacFtFy9+0dtpw==", - // "Database": "VvfWH/59gQguY2eA2xBCug==", - // "Root": "+plVKQ+enAqt7BYV2uMQng==", - // "Password": "0O24es2ZRF5uoJ4aU+YCdg==" - //} - //"MSSqlDBConfig": { - // "Server": "zp3Nilx0PISEEC4caZWqCg==", //172.16.220.250 - // "Port": "7puf4kd9qJ/q0fq2QASWeQ==", - // "Database": "VvfWH/59gQguY2eA2xBCug==", - // "Root": "sD8GZ9UPiIQGU6dU011/4A==", - // "Password": "Jue6jMFRi11meN6xbdKwDA==" - //} - }, "SMTPConfig": { "Host": "smtp.gmail.com", diff --git a/BackendWorkerService/appsettings.json b/BackendWorkerService/appsettings.json index 7271896..8620376 100644 --- a/BackendWorkerService/appsettings.json +++ b/BackendWorkerService/appsettings.json @@ -8,19 +8,16 @@ }, "LoggerPath": "C:\\inetpub\\Taipei_dome_background_service\\Logs", "BackgroundServiceCron": { - "ExecutionBackgroundServicePlanJob": "0/5 * * * * ?", - "MessageNotificationJob": "0 0/30 * * * ?", - "DataDeliveryJob": "0 0/5 * * * ?", - "RegularUpdateDBTableJob": "0 0 2 * * ?" + "ExecutionBackgroundServicePlanJob": "0 0 2 * * ?", + "MessageNotificationJob": "0 0 2 * * ?", + "DataDeliveryJob": "0 0 2 * * ?", + "RegularUpdateDBTableJob": "0 0 2 * * ?", + "ParkingJob": "0 0 2 * * ?", + "ArchiveElectricMeterHourJob": "0 0 2 * * ?", + "ArchiveElectricMeterDayJob": "0/5 * * * * ?", + "WeatherAPIJob": "0 0 2 * * ?" }, "DBConfig": { - //"MySqlDBConfig": { - // "Server": "FYlY+w0XDIz+jmF2rlZWJw==", //0.201 - // "Port": "js2LutKe+rdjzdxMPQUrvQ==", - // "Database": "VJB2XC+lAtzuHObDGMVOAA==", //30 - // "Root": "SzdxEgaJJ7tcTCrUl2zKsA==", - // "Password": "FVAPxztxpY4gJJKQ/se4bQ==" - //}, "MySqlDBConfig": { "Server": "FYlY+w0XDIz+jmF2rlZWJw==", //0.201 "Port": "js2LutKe+rdjzdxMPQUrvQ==", @@ -35,16 +32,9 @@ "Server": "bJm+UAtbeaTjDmp/A5ep2w==", //0.130 "Port": "S5cUXKnKOacFtFy9+0dtpw==", "Database": "VvfWH/59gQguY2eA2xBCug==", //taipei_dome - "Root": "sD8GZ9UPiIQGU6dU011/4A==", + "Root": "4GCCJGAXzLa8ecdmPAkYKg==", "Password": "0O24es2ZRF5uoJ4aU+YCdg==" } - //"MSSqlDBConfig": { - // "Server": "avZg8PA8C9GVgYZBgEKzCg==", - // "Port": "lJA0KPkG6RvFfTgWiXFyUw==", - // "Database": "VvfWH/59gQguY2eA2xBCug==", - // "Root": "sD8GZ9UPiIQGU6dU011/4A==", - // "Password": "2gi7rOmGha2VdXC5vtHxhg==" - //} }, "SMTPConfig": { "Host": "smtp.gmail.com", diff --git a/BackendWorkerService/root/PowerfulRain.xml b/BackendWorkerService/root/PowerfulRain.xml index df76532..fbb92b3 100644 --- a/BackendWorkerService/root/PowerfulRain.xml +++ b/BackendWorkerService/root/PowerfulRain.xml @@ -1,526 +1,192 @@ - CWB-Weather_extremely-rain_202306010655001 + CWB-Weather_extremely-rain_202306060340001 weather@cwb.gov.tw - 2023-06-01T07:02:17+08:00 + 2023-06-06T03:45:20+08:00 Actual - Update + Cancel Public - weather@cwb.gov.tw,CWB-Weather_extremely-rain_202306010345001,2023-06-01T03:56:19+08:00 + weather@cwb.gov.tw,CWB-Weather_extremely-rain_202306060045001,2023-06-06T00:50:36+08:00 weather@cwb.gov.tw,CWB-Weather_extremely-rain_202306052245001,2023-06-05T22:54:54+08:00 weather@cwb.gov.tw,CWB-Weather_extremely-rain_202306052220001,2023-06-05T22:25:45+08:00 zh-TW Met 降雨 - Monitor - Future - Moderate - Likely + Past + Minor + Observed profile:CAP-TWP:Event:1.0 rainfall - 2023-06-01T06:55:00+08:00 - 2023-06-01T06:59:00+08:00 - 2023-06-01T11:00:00+08:00 + 2023-06-06T03:40:00+08:00 + 2023-06-06T03:40:00+08:00 + 2023-06-06T03:55:20+08:00 中央氣象局 - 大雨特報 + 解除豪雨特報 -颱風外圍環流影響，今（１）日大臺北、桃園、新竹、宜蘭地區有局部大雨發生的機率，請注意瞬間大雨、強陣風及溪水暴漲，山區請注意落石及坍方。 +由於降雨趨於緩和，發生大雨或豪雨的機率降低，故解除豪雨特報。 + https://www.cwb.gov.tw/V8/C/P/Warning/FIFOWS.html alert_title - 大雨特報 - - - severity_level - 大雨 - - - alert_color - 黃色 - - - website_color - 255,255,0 + 豪雨特報 - - 新竹縣橫山鄉 + + 基隆市 Taiwan_Geocode_103 - 1000408 + 10017 - - 新竹縣北埔鄉 + + + 臺北市 Taiwan_Geocode_103 - 1000409 + 63 - - 桃園市觀音區 + + + 新北市 Taiwan_Geocode_103 - 6801200 + 65 - - 桃園市復興區 + + + 桃園市 Taiwan_Geocode_103 - 6801300 + 68 - - 臺北市信義區 + + + 新竹市 Taiwan_Geocode_103 - 6300200 + 10018 - - 桃園市新屋區 + + + 新竹縣 Taiwan_Geocode_103 - 6801100 + 10004 - - 新竹縣竹東鎮 + + + 苗栗縣 Taiwan_Geocode_103 - 1000402 + 10005 - - 臺北市文山區 + + + 臺中市 Taiwan_Geocode_103 - 6300800 + 66 - - 新竹縣竹北市 + + + 彰化縣 Taiwan_Geocode_103 - 1000401 + 10007 - - 新竹縣新豐鄉 + + + 雲林縣 Taiwan_Geocode_103 - 1000406 + 10009 - - 臺北市松山區 + + + 南投縣 Taiwan_Geocode_103 - 6300100 + 10008 - - 新竹縣關西鎮 + + + 嘉義縣 Taiwan_Geocode_103 - 1000404 + 10010 - - 新竹縣湖口鄉 + + + 嘉義市 Taiwan_Geocode_103 - 1000405 + 10020 - - 宜蘭縣冬山鄉 + + + 臺南市 Taiwan_Geocode_103 - 1000208 + 67 - - 宜蘭縣五結鄉 + + + 高雄市 Taiwan_Geocode_103 - 1000209 + 64 - - 宜蘭縣頭城鎮 + + + 屏東縣 Taiwan_Geocode_103 - 1000204 + 10013 - - 宜蘭縣礁溪鄉 + + + 宜蘭縣 Taiwan_Geocode_103 - 1000205 + 10002 - - 宜蘭縣壯圍鄉 + + + 花蓮縣 Taiwan_Geocode_103 - 1000206 + 10015 - - 宜蘭縣員山鄉 + + + 臺東縣 Taiwan_Geocode_103 - 1000207 + 10014 - - 宜蘭縣宜蘭市 + + + 澎湖縣 Taiwan_Geocode_103 - 1000201 + 10016 - - 宜蘭縣羅東鎮 + + + 金門縣 Taiwan_Geocode_103 - 1000202 + 09020 - - 臺北市大安區 + + + 連江縣 Taiwan_Geocode_103 - 6300300 - - - 新北市三重區 - - Taiwan_Geocode_103 - 6500200 - - - 新北市中和區 - - Taiwan_Geocode_103 - 6500300 - - - 新竹縣尖石鄉 - - Taiwan_Geocode_103 - 1000412 - - - 新北市板橋區 - - Taiwan_Geocode_103 - 6500100 - - - 新北市新店區 - - Taiwan_Geocode_103 - 6500600 - - - 新北市樹林區 - - Taiwan_Geocode_103 - 6500700 - - - 新北市永和區 - - Taiwan_Geocode_103 - 6500400 - - - 新北市新莊區 - - Taiwan_Geocode_103 - 6500500 - - - 新北市鶯歌區 - - Taiwan_Geocode_103 - 6500800 - - - 新北市三峽區 - - Taiwan_Geocode_103 - 6500900 - - - 新北市萬里區 - - Taiwan_Geocode_103 - 6502800 - - - 臺北市中山區 - - Taiwan_Geocode_103 - 6300400 - - - 新北市烏來區 - - Taiwan_Geocode_103 - 6502900 - - - 宜蘭縣大同鄉 - - Taiwan_Geocode_103 - 1000211 - - - 新竹縣新埔鎮 - - Taiwan_Geocode_103 - 1000403 - - - 新北市坪林區 - - Taiwan_Geocode_103 - 6502000 - - - 新北市三芝區 - - Taiwan_Geocode_103 - 6502100 - - - 新北市石門區 - - Taiwan_Geocode_103 - 6502200 - - - 桃園市大園區 - - Taiwan_Geocode_103 - 6800600 - - - 新北市平溪區 - - Taiwan_Geocode_103 - 6502400 - - - 新北市雙溪區 - - Taiwan_Geocode_103 - 6502500 - - - 新北市貢寮區 - - Taiwan_Geocode_103 - 6502600 - - - 新北市金山區 - - Taiwan_Geocode_103 - 6502700 - - - 臺北市大同區 - - Taiwan_Geocode_103 - 6300600 - - - 臺北市士林區 - - Taiwan_Geocode_103 - 6301100 - - - 臺北市中正區 - - Taiwan_Geocode_103 - 6300500 - - - 宜蘭縣三星鄉 - - Taiwan_Geocode_103 - 1000210 - - - 新竹縣峨眉鄉 - - Taiwan_Geocode_103 - 1000411 - - - 臺北市北投區 - - Taiwan_Geocode_103 - 6301200 - - - 新竹縣五峰鄉 - - Taiwan_Geocode_103 - 1000413 - - - 新竹縣芎林鄉 - - Taiwan_Geocode_103 - 1000407 - - - 桃園市龍潭區 - - Taiwan_Geocode_103 - 6800900 - - - 桃園市八德區 - - Taiwan_Geocode_103 - 6800800 - - - 宜蘭縣蘇澳鎮 - - Taiwan_Geocode_103 - 1000203 - - - 桃園市桃園區 - - Taiwan_Geocode_103 - 6800100 - - - 桃園市大溪區 - - Taiwan_Geocode_103 - 6800300 - - - 臺北市萬華區 - - Taiwan_Geocode_103 - 6300700 - - - 桃園市蘆竹區 - - Taiwan_Geocode_103 - 6800500 - - - 桃園市楊梅區 - - Taiwan_Geocode_103 - 6800400 - - - 桃園市龜山區 - - Taiwan_Geocode_103 - 6800700 - - - 臺北市內湖區 - - Taiwan_Geocode_103 - 6301000 - - - 新北市五股區 - - Taiwan_Geocode_103 - 6501500 - - - 新北市蘆洲區 - - Taiwan_Geocode_103 - 6501400 - - - 新北市林口區 - - Taiwan_Geocode_103 - 6501700 - - - 新北市泰山區 - - Taiwan_Geocode_103 - 6501600 - - - 新北市汐止區 - - Taiwan_Geocode_103 - 6501100 - - - 臺北市南港區 - - Taiwan_Geocode_103 - 6300900 - - - 新北市土城區 - - Taiwan_Geocode_103 - 6501300 - - - 新北市瑞芳區 - - Taiwan_Geocode_103 - 6501200 - - - 宜蘭縣南澳鄉 - - Taiwan_Geocode_103 - 1000212 - - - 桃園市中壢區 - - Taiwan_Geocode_103 - 6800200 - - - 新北市石碇區 - - Taiwan_Geocode_103 - 6501900 - - - 新北市深坑區 - - Taiwan_Geocode_103 - 6501800 - - - 桃園市平鎮區 - - Taiwan_Geocode_103 - 6801000 - - - 新竹縣寶山鄉 - - Taiwan_Geocode_103 - 1000410 - - - 新北市淡水區 - - Taiwan_Geocode_103 - 6501000 - - - 新北市八里區 - - Taiwan_Geocode_103 - 6502300 + 09007 - \ No newline at end of file diff --git a/Frontend/_alert.html b/Frontend/_alert.html index 1938618..52227b9 100644 --- a/Frontend/_alert.html +++ b/Frontend/_alert.html @@ -217,6 +217,8 @@ pageAct.alrSelSysMain = [] pageAct.alrSelSysSub = []; pageAct.selAllSysSub = false; + pageAct.addSelMain = null; + pageAct.addSelSub = null; first = true; // let dataAlarm = []; var historyTable = null; @@ -368,7 +370,10 @@ let alr_tableData = alr_table.row(alr_elem).data(); $('#inpErrCode').html(``); $('#inpStaTime').val(displayDate(new Date(Date.now()), "date").replaceAll('/', '-')); - let deviceNumber = null + let deviceNumber = null; + let system = $(this).data("system"); + pageAct.addSelMain = system.split("-")[0]; + pageAct.addSelSub = system.split("-")[1]; deviceNumber = pageAct.AreaTag + "_" + alr_tableData.buildingFloorName_zh.toString().split('-')[0] + "_" + alr_tableData.alarmClass.toString().split('_')[0] + "_" + alr_tableData.alarmClass.toString().split('_')[1] + "_" + alr_tableData.buildingFloorName_zh.toString().split('-')[1] + "_" + alr_tableData.sourceName_zh.toString().split('-')[0] + "_" @@ -387,6 +392,7 @@ }); onEvent('click', '#alr_OpeRecSendBtn', function () { + let form = $("#alr_opeRecForm"); $(form).validate({ rules: { @@ -413,8 +419,8 @@ fd.append("error_code", $('#inpErrCode').val()); fd.append("location", "台北" + $('#buiActDrop').text() + pageAct.floor); fd.append("location_code", pageAct.AreaTag + pageAct.buiTag + pageAct.floor); - fd.append("device_system_category_layer2", pageAct.selSysMain); - fd.append("device_system_category_layer3", pageAct.selSysSub); + fd.append("device_system_category_layer2", pageAct.addSelMain); + fd.append("device_system_category_layer3", pageAct.addSelSub); fd.append("work_type", parseInt($('#inpWorTyp').val())); fd.append("fix_do", $('#inpFixDo').val()); fd.append("fix_do_code", $('#inpFixDoCode').val()); @@ -771,8 +777,8 @@ { "title": "派工/維運單號", "data": "formId", - "render": function (data) { - return data ?? `+ 維修單`; + "render": function (data, type, row, meta) { + return data ?? `+ 維修單`; } } ]; @@ -781,6 +787,7 @@ $(loadEle).Loading("close"); } + function AlertList(data) { objSendData.Data = []; $.each(data, function (i, v) { From 85747ad5cb65b21ee2dbbd44d9ddb202bcb9805e Mon Sep 17 00:00:00 2001 From: dev02 Date: Tue, 6 Jun 2023 16:48:05 +0800 Subject: [PATCH 02/21] =?UTF-8?q?[=E5=BE=8C=E7=AB=AF]=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?using=20quarzt=20=E9=8C=AF=E8=AA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Backend/Startup.cs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Backend/Startup.cs b/Backend/Startup.cs index 73a96ec..6726bbc 100644 --- a/Backend/Startup.cs +++ b/Backend/Startup.cs @@ -22,11 +22,6 @@ using Microsoft.IdentityModel.Tokens; using System.Text; using System.IdentityModel.Tokens.Jwt; using Microsoft.AspNetCore.Http; -using Backend.Quartz.Jobs; -using Backend.Quartz; -using Quartz.Impl; -using Quartz.Spi; -using Quartz; namespace Backend { From e9649bd7f122694ba5d76aaf3f17668c352bcc0d Mon Sep 17 00:00:00 2001 From: dev02 Date: Tue, 6 Jun 2023 16:50:18 +0800 Subject: [PATCH 03/21] =?UTF-8?q?[=E5=BE=8C=E5=8F=B0]=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8E=92=E7=A8=8B=E9=96=8B=E5=95=93weather=20api=20=E6=8E=92?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BackendWorkerService/Program.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/BackendWorkerService/Program.cs b/BackendWorkerService/Program.cs index 7521b31..e293df7 100644 --- a/BackendWorkerService/Program.cs +++ b/BackendWorkerService/Program.cs @@ -142,12 +142,12 @@ namespace BackendWorkerService ); #endregion - //#region wɨoHAPI - //services.AddSingleton(); - //services.AddSingleton( - //new JobSchedule(jobType: typeof(Quartz.Jobs.WeatherAPIJob), cronExpression: configuration.GetValue("BackgroundServiceCron:WeatherAPIJob")) - //); - //#endregion + #region wɨoHAPI + services.AddSingleton(); + services.AddSingleton( + new JobSchedule(jobType: typeof(Quartz.Jobs.WeatherAPIJob), cronExpression: configuration.GetValue("BackgroundServiceCron:WeatherAPIJob")) + ); + #endregion }).ConfigureLogging((hostContext, logFactory) => { IConfiguration configuration = hostContext.Configuration; From 8605cf4a014b8c7a9dde35db30bc713ad5fcbbd3 Mon Sep 17 00:00:00 2001 From: dev02 Date: Wed, 7 Jun 2023 09:41:23 +0800 Subject: [PATCH 04/21] =?UTF-8?q?[=E5=89=8D=E5=8F=B0]=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?alert=20=E6=96=B0=E5=A2=9E=E7=B6=AD=E4=BF=AE=E6=94=B9api,=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9alert=20=E8=AE=80=E5=8F=96=E7=B6=AD=E4=BF=AE?= =?UTF-8?q?=E5=96=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Frontend/_alert.html | 258 +++++++++++++++++- .../ApiControllers/OperationController.cs | 6 +- FrontendWebApi/Models/Operation.cs | 1 + FrontendWebApi/appsettings.Development.json | 4 +- FrontendWebApi/appsettings.json | 4 +- 5 files changed, 263 insertions(+), 10 deletions(-) diff --git a/Frontend/_alert.html b/Frontend/_alert.html index 52227b9..120c1bc 100644 --- a/Frontend/_alert.html +++ b/Frontend/_alert.html @@ -208,6 +208,140 @@ + + + \ No newline at end of file diff --git a/FrontendWebApi/ApiControllers/OperationController.cs b/FrontendWebApi/ApiControllers/OperationController.cs index de27670..70679ec 100644 --- a/FrontendWebApi/ApiControllers/OperationController.cs +++ b/FrontendWebApi/ApiControllers/OperationController.cs @@ -1156,7 +1156,7 @@ namespace FrontendWebApi.ApiControllers from operation_record opr left join device d on opr.fix_do_code = d.device_number left join userinfo ui on opr.work_person_id = ui.userinfo_guid - where opr.deleted = 0 and opr.id = @id"; + where opr.deleted = 0 and (opr.id = @id or opr.formId = '{ofl.formId}')"; var param = new { @id = ofl.id }; @@ -1226,8 +1226,8 @@ namespace FrontendWebApi.ApiControllers { "@end_time", or.end_time}, { "@work_time", or.work_time}, { "@finish_time", or.finish_time}, - { "@notice", or.notice}, - { "@description", or.description}, + { "@notice", or.notice == "null" ? null : or.notice}, + { "@description", or.description == "null" ? null : or.description}, { "@created_by", myUser.userinfo_guid}, { "@created_at", DateTime.Now} }; diff --git a/FrontendWebApi/Models/Operation.cs b/FrontendWebApi/Models/Operation.cs index fc706df..3c6e301 100644 --- a/FrontendWebApi/Models/Operation.cs +++ b/FrontendWebApi/Models/Operation.cs @@ -47,6 +47,7 @@ namespace FrontendWebApi.Models public List main_system_tag { get; set; }//大类tag public List sub_system_tag { get; set; }//小类tag public byte? work_type { get; set; } // 1:保養, 2:維修 + public string formId { get; set; } //異常代碼 } public class BuildingList diff --git a/FrontendWebApi/appsettings.Development.json b/FrontendWebApi/appsettings.Development.json index b530df5..3cb7892 100644 --- a/FrontendWebApi/appsettings.Development.json +++ b/FrontendWebApi/appsettings.Development.json @@ -17,8 +17,8 @@ "Server": "FYlY+w0XDIz+jmF2rlZWJw==", //0.201 "Port": "js2LutKe+rdjzdxMPQUrvQ==", //"Database": "VJB2XC+lAtzuHObDGMVOAA==", //30 - //"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp - "Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome + "Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp + //"Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome //"Database": "siTUcDaC/g2yGTMFWD72Kg==", //tpe_dome_hotel //"Database": "iuaY0h0+TWkir44/eZLDqw==", //tpe_dome_office "Root": "SzdxEgaJJ7tcTCrUl2zKsA==", diff --git a/FrontendWebApi/appsettings.json b/FrontendWebApi/appsettings.json index 1052fc0..6fae936 100644 --- a/FrontendWebApi/appsettings.json +++ b/FrontendWebApi/appsettings.json @@ -23,8 +23,8 @@ "Server": "FYlY+w0XDIz+jmF2rlZWJw==", //0.201 "Port": "js2LutKe+rdjzdxMPQUrvQ==", //"Database": "VJB2XC+lAtzuHObDGMVOAA==", //三菱 - //"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp - "Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome + "Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp + //"Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome //"Database": "siTUcDaC/g2yGTMFWD72Kg==", //tpe_dome_hotel //"Database": "iuaY0h0+TWkir44/eZLDqw==", //tpe_dome_office "Root": "SzdxEgaJJ7tcTCrUl2zKsA==", From 2599432c33ad8466091ef1524531ec6c86d3c3d9 Mon Sep 17 00:00:00 2001 From: dev02 Date: Wed, 7 Jun 2023 11:38:43 +0800 Subject: [PATCH 05/21] =?UTF-8?q?[=E5=89=8D=E5=8F=B0]=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=B6=AD=E4=BF=AE=E5=96=AE=E8=AE=80=E5=8F=96,=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9api.json?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Frontend/_alert.html | 6 ++++-- FrontendWebApi/appsettings.Development.json | 3 ++- FrontendWebApi/appsettings.json | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Frontend/_alert.html b/Frontend/_alert.html index 120c1bc..496f2d5 100644 --- a/Frontend/_alert.html +++ b/Frontend/_alert.html @@ -1081,8 +1081,7 @@ } onEvent('click', '#readOpeRecBtn', function () { - selUser(); - selDevice(); + $('#alr_ope_forImage').html(''); $('#alr_ope_forFile').html(''); @@ -1100,6 +1099,9 @@ } else { pageAct.sysSub = res.data.device_system_category_layer3; pageAct.number = res.data.fix_do_code; + pageAct.addSelSub = res.data.device_system_category_layer3; + selUser(); + selDevice(); selOpeFir(); errCodeList(); $('#alr_inpNumber_2').val(res.data.formId); diff --git a/FrontendWebApi/appsettings.Development.json b/FrontendWebApi/appsettings.Development.json index 3cb7892..b87a385 100644 --- a/FrontendWebApi/appsettings.Development.json +++ b/FrontendWebApi/appsettings.Development.json @@ -17,10 +17,11 @@ "Server": "FYlY+w0XDIz+jmF2rlZWJw==", //0.201 "Port": "js2LutKe+rdjzdxMPQUrvQ==", //"Database": "VJB2XC+lAtzuHObDGMVOAA==", //30 - "Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp + //"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp //"Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome //"Database": "siTUcDaC/g2yGTMFWD72Kg==", //tpe_dome_hotel //"Database": "iuaY0h0+TWkir44/eZLDqw==", //tpe_dome_office + "Database": "Rq7Gn4x6LwBvVtl7GY8LbA==", //MCUT "Root": "SzdxEgaJJ7tcTCrUl2zKsA==", "Password": "FVAPxztxpY4gJJKQ/se4bQ==" } diff --git a/FrontendWebApi/appsettings.json b/FrontendWebApi/appsettings.json index 6fae936..7e6da69 100644 --- a/FrontendWebApi/appsettings.json +++ b/FrontendWebApi/appsettings.json @@ -34,7 +34,7 @@ "Server": "bJm+UAtbeaTjDmp/A5ep2w==", //0.130 "Port": "S5cUXKnKOacFtFy9+0dtpw==", "Database": "VvfWH/59gQguY2eA2xBCug==", //taipei_dome - "Root": "sD8GZ9UPiIQGU6dU011/4A==", + "Root": "4GCCJGAXzLa8ecdmPAkYKg==", "Password": "0O24es2ZRF5uoJ4aU+YCdg==" } //"MSSqlDBConfig": { From 40ba482d701b013f28ac82d3a75d1b364477bdb2 Mon Sep 17 00:00:00 2001 From: dev02 Date: Wed, 7 Jun 2023 12:16:44 +0800 Subject: [PATCH 06/21] =?UTF-8?q?[=E5=89=8D=E5=8F=B0]=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=8D=B3=E6=99=82=E5=91=8A=E8=AD=A6table=20render=20=E5=95=8F?= =?UTF-8?q?=E9=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Backend/appsettings.Development.json | 4 +- .../Quartz/Jobs/ArchiveElectricMeterDayJob.cs | 221 +++++++++++------- Frontend/_alert.html | 2 +- 3 files changed, 138 insertions(+), 89 deletions(-) diff --git a/Backend/appsettings.Development.json b/Backend/appsettings.Development.json index 83cd09a..b5af96e 100644 --- a/Backend/appsettings.Development.json +++ b/Backend/appsettings.Development.json @@ -18,10 +18,10 @@ "Port": "js2LutKe+rdjzdxMPQUrvQ==", //"Database": "VJB2XC+lAtzuHObDGMVOAA==", //30 //"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp - "Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome + //"Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome //"Database": "siTUcDaC/g2yGTMFWD72Kg==", //tpe_dome_hotel //"Database": "iuaY0h0+TWkir44/eZLDqw==", //tpe_dome_office - //"Database": "Rq7Gn4x6LwBvVtl7GY8LbA==", //mcut + "Database": "Rq7Gn4x6LwBvVtl7GY8LbA==", //mcut "Root": "SzdxEgaJJ7tcTCrUl2zKsA==", "Password": "FVAPxztxpY4gJJKQ/se4bQ==" }, diff --git a/BackendWorkerService/Quartz/Jobs/ArchiveElectricMeterDayJob.cs b/BackendWorkerService/Quartz/Jobs/ArchiveElectricMeterDayJob.cs index 8a3b8cc..cdfeb09 100644 --- a/BackendWorkerService/Quartz/Jobs/ArchiveElectricMeterDayJob.cs +++ b/BackendWorkerService/Quartz/Jobs/ArchiveElectricMeterDayJob.cs @@ -55,13 +55,20 @@ namespace BackendWorkerService.Quartz.Jobs EDFunction ed = new EDFunction(); XmlDocument xmlDocument = new XmlDocument(); + ServicePointManager.DefaultConnectionLimit = 10; var sqlArchive = $@"SELECT system_value as Value, system_key as Name FROM variable WHERE deleted = 0 AND system_type = 'archiveConfig'"; var saveToMSDB = await backgroundServiceRepository.GetOneAsync("select system_value from variable where system_type = 'save_to_ms_db' and deleted = 0"); - var variableArchive = await backgroundServiceRepository.GetAllAsync(sqlArchive); var electricMeterGuid = variableArchive.Where(x => x.Name == "ElectricMeterGuid").Select(x => x.Value).FirstOrDefault(); var waterMeterGuid = variableArchive.Where(x => x.Name == "WaterMeterGuid").Select(x => x.Value).FirstOrDefault(); + #region http variable + HttpWebRequest archiveRequest = null; + HttpWebResponse archiveResponse = null; + string archiveResponseContent = null; + string archiveJson = null; + JObject archiveJsonResult = new JObject(); + #endregion #region 找出所有電錶設備 var sWhere = "deleted = 0 AND device_name_tag = @sub_system_guid"; var electricMeters = await backgroundServiceRepository.GetAllAsync("device", sWhere, new { sub_system_guid = electricMeterGuid }); @@ -147,26 +154,29 @@ namespace BackendWorkerService.Quartz.Jobs foreach (var deviceNumberPoint in electricDeviceNumberPoints) { - HttpWebRequest archiveDayRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); + archiveRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); //HttpWebRequest archiveDayRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); - archiveDayRequest.Method = "POST"; - archiveDayRequest.Headers.Add("Authorization", "Basic " + encoded); - archiveDayRequest.PreAuthenticate = true; + archiveRequest.Method = "POST"; + archiveRequest.Headers.Add("Authorization", "Basic " + encoded); + archiveRequest.PreAuthenticate = true; + archiveRequest.Timeout = 3000; byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); - using (Stream reqStream = archiveDayRequest.GetRequestStream()) + using (Stream reqStream = archiveRequest.GetRequestStream()) { reqStream.Write(byteArray, 0, byteArray.Length); } - HttpWebResponse archiveDayResponse = (HttpWebResponse)archiveDayRequest.GetResponse(); - var archiveDayResponseContent = new StreamReader(archiveDayResponse.GetResponseStream()).ReadToEnd(); + archiveResponse = (HttpWebResponse)archiveRequest.GetResponse(); + archiveResponseContent = new StreamReader(archiveResponse.GetResponseStream()).ReadToEnd(); + archiveResponse.Dispose(); + archiveResponse.Close(); - xmlDocument.LoadXml(archiveDayResponseContent); - string archiveDayJson = JsonConvert.SerializeXmlNode(xmlDocument); - JObject archiveDayJsonResult = (JObject)JsonConvert.DeserializeObject(archiveDayJson); + xmlDocument.LoadXml(archiveResponseContent); + archiveJson = JsonConvert.SerializeXmlNode(xmlDocument); + archiveJsonResult = (JObject)JsonConvert.DeserializeObject(archiveJson); - if (archiveDayJsonResult.ContainsKey("err")) //抓取錯誤 + if (archiveJsonResult.ContainsKey("err")) //抓取錯誤 { //logger.LogError("【ArchiveElectricMeterDayJob】【天歸檔】【取得資料失敗】"); //logger.LogError("【ArchiveElectricMeterDayJob】【天歸檔】【取得資料失敗】[錯誤內容]：{0}", archiveDayJsonResult); @@ -178,7 +188,7 @@ namespace BackendWorkerService.Quartz.Jobs archiveDayRawData.Add("@end_timestamp", endTimestamp.Replace("T", " ").Substring(0, 19)); archiveDayRawData.Add("@is_complete", 0); archiveDayRawData.Add("@repeat_times", 0); - archiveDayRawData.Add("@fail_reason", archiveDayJson); + archiveDayRawData.Add("@fail_reason", archiveJson); archiveDayRawData.Add("@count_rawdata", 0); archiveDayRawData.Add("@min_rawdata", 0); @@ -190,9 +200,9 @@ namespace BackendWorkerService.Quartz.Jobs electericArchiveDayRawDatas.Add(archiveDayRawData); } - if (archiveDayJsonResult.ContainsKey("obj")) //表示可以讀取到內容 + if (archiveJsonResult.ContainsKey("obj")) //表示可以讀取到內容 { - var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveDayJsonResult); + var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveJsonResult); if (ArrangeRawDatas != null && ArrangeRawDatas.Count() > 0) { electericArchiveDayRawDatas.AddRange(ArrangeRawDatas); @@ -202,26 +212,29 @@ namespace BackendWorkerService.Quartz.Jobs foreach (var deviceNumberPoint in waterDeviceNumberPoints) { - HttpWebRequest archiveDayRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); + archiveRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); //HttpWebRequest archiveDayRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); - archiveDayRequest.Method = "POST"; - archiveDayRequest.Headers.Add("Authorization", "Basic " + encoded); - archiveDayRequest.PreAuthenticate = true; + archiveRequest.Method = "POST"; + archiveRequest.Headers.Add("Authorization", "Basic " + encoded); + archiveRequest.PreAuthenticate = true; + archiveRequest.Timeout = 3000; byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); - using (Stream reqStream = archiveDayRequest.GetRequestStream()) + using (Stream reqStream = archiveRequest.GetRequestStream()) { reqStream.Write(byteArray, 0, byteArray.Length); } - HttpWebResponse archiveDayResponse = (HttpWebResponse)archiveDayRequest.GetResponse(); - var archiveDayResponseContent = new StreamReader(archiveDayResponse.GetResponseStream()).ReadToEnd(); + archiveResponse = (HttpWebResponse)archiveRequest.GetResponse(); + archiveResponseContent = new StreamReader(archiveResponse.GetResponseStream()).ReadToEnd(); + archiveResponse.Dispose(); + archiveResponse.Close(); - xmlDocument.LoadXml(archiveDayResponseContent); - string archiveDayJson = JsonConvert.SerializeXmlNode(xmlDocument); - JObject archiveDayJsonResult = (JObject)JsonConvert.DeserializeObject(archiveDayJson); + xmlDocument.LoadXml(archiveResponseContent); + archiveJson = JsonConvert.SerializeXmlNode(xmlDocument); + archiveJsonResult = (JObject)JsonConvert.DeserializeObject(archiveJson); - if (archiveDayJsonResult.ContainsKey("err")) //抓取錯誤 + if (archiveJsonResult.ContainsKey("err")) //抓取錯誤 { //logger.LogError("【ArchiveElectricMeterDayJob】【天歸檔】【取得資料失敗】"); //logger.LogError("【ArchiveElectricMeterDayJob】【天歸檔】【取得資料失敗】[錯誤內容]：{0}", archiveDayJsonResult); @@ -233,7 +246,7 @@ namespace BackendWorkerService.Quartz.Jobs archiveDayRawData.Add("@end_timestamp", endTimestamp.Replace("T", " ").Substring(0, 19)); archiveDayRawData.Add("@is_complete", 0); archiveDayRawData.Add("@repeat_times", 0); - archiveDayRawData.Add("@fail_reason", archiveDayJson); + archiveDayRawData.Add("@fail_reason", archiveJson); archiveDayRawData.Add("@count_rawdata", 0); archiveDayRawData.Add("@min_rawdata", 0); @@ -245,9 +258,9 @@ namespace BackendWorkerService.Quartz.Jobs waterArchiveDayRawDatas.Add(archiveDayRawData); } - if (archiveDayJsonResult.ContainsKey("obj")) //表示可以讀取到內容 + if (archiveJsonResult.ContainsKey("obj")) //表示可以讀取到內容 { - var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveDayJsonResult); + var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveJsonResult); if (ArrangeRawDatas != null && ArrangeRawDatas.Count() > 0) { waterArchiveDayRawDatas.AddRange(ArrangeRawDatas); @@ -573,6 +586,14 @@ namespace BackendWorkerService.Quartz.Jobs logger.LogError("【ArchiveElectricMeterDayJob】【天歸檔】【任務失敗】"); logger.LogError("【ArchiveElectricMeterDayJob】【天歸檔】【任務失敗】[Exception]：{0}", exception.ToString()); } + finally + { + if (archiveResponse != null) + { + archiveResponse.Dispose(); + archiveResponse.Close(); + } + } } #endregion 天歸檔 @@ -602,26 +623,29 @@ namespace BackendWorkerService.Quartz.Jobs List> waterArchiveWeekRawDatas = new List>(); foreach (var deviceNumberPoint in electricDeviceNumberPoints) { - HttpWebRequest archiveWeekRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); + archiveRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); //HttpWebRequest archiveWeekRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); - archiveWeekRequest.Method = "POST"; - archiveWeekRequest.Headers.Add("Authorization", "Basic " + encoded); - archiveWeekRequest.PreAuthenticate = true; + archiveRequest.Method = "POST"; + archiveRequest.Headers.Add("Authorization", "Basic " + encoded); + archiveRequest.PreAuthenticate = true; + archiveRequest.Timeout = 3000; byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); - using (Stream reqStream = archiveWeekRequest.GetRequestStream()) + using (Stream reqStream = archiveRequest.GetRequestStream()) { reqStream.Write(byteArray, 0, byteArray.Length); } - HttpWebResponse archiveWeekResponse = (HttpWebResponse)archiveWeekRequest.GetResponse(); - var archiveWeekResponseContent = new StreamReader(archiveWeekResponse.GetResponseStream()).ReadToEnd(); + archiveResponse = (HttpWebResponse)archiveRequest.GetResponse(); + archiveResponseContent = new StreamReader(archiveResponse.GetResponseStream()).ReadToEnd(); + archiveResponse.Dispose(); + archiveResponse.Close(); - xmlDocument.LoadXml(archiveWeekResponseContent); - string archiveWeekJson = JsonConvert.SerializeXmlNode(xmlDocument); - JObject archiveWeekJsonResult = (JObject)JsonConvert.DeserializeObject(archiveWeekJson); + xmlDocument.LoadXml(archiveResponseContent); + archiveJson = JsonConvert.SerializeXmlNode(xmlDocument); + archiveJsonResult = (JObject)JsonConvert.DeserializeObject(archiveJson); - if (archiveWeekJsonResult.ContainsKey("err")) //抓取錯誤 + if (archiveJsonResult.ContainsKey("err")) //抓取錯誤 { //logger.LogError("【ArchiveElectricMeterDayJob】【週歸檔】【取得資料失敗】"); //logger.LogError("【ArchiveElectricMeterDayJob】【週歸檔】【取得資料失敗】[錯誤內容]：{0}", archiveWeekJsonResult); @@ -633,7 +657,7 @@ namespace BackendWorkerService.Quartz.Jobs archiveWeekRawData.Add("@end_timestamp", endTimestamp.Replace("T", " ").Substring(0, 19)); archiveWeekRawData.Add("@is_complete", 0); archiveWeekRawData.Add("@repeat_times", 0); - archiveWeekRawData.Add("@fail_reason", archiveWeekJson); + archiveWeekRawData.Add("@fail_reason", archiveJson); archiveWeekRawData.Add("@count_rawdata", 0); archiveWeekRawData.Add("@min_rawdata", 0); @@ -645,9 +669,9 @@ namespace BackendWorkerService.Quartz.Jobs electricArchiveWeekRawDatas.Add(archiveWeekRawData); } - if (archiveWeekJsonResult.ContainsKey("obj")) //表示可以讀取到內容 + if (archiveJsonResult.ContainsKey("obj")) //表示可以讀取到內容 { - var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveWeekJsonResult); + var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveJsonResult); if (ArrangeRawDatas != null && ArrangeRawDatas.Count() > 0) { electricArchiveWeekRawDatas.AddRange(ArrangeRawDatas); @@ -656,26 +680,29 @@ namespace BackendWorkerService.Quartz.Jobs } foreach (var deviceNumberPoint in waterDeviceNumberPoints) { - HttpWebRequest archiveWeekRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); + archiveRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); //HttpWebRequest archiveWeekRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); - archiveWeekRequest.Method = "POST"; - archiveWeekRequest.Headers.Add("Authorization", "Basic " + encoded); - archiveWeekRequest.PreAuthenticate = true; + archiveRequest.Method = "POST"; + archiveRequest.Headers.Add("Authorization", "Basic " + encoded); + archiveRequest.PreAuthenticate = true; + archiveRequest.Timeout = 3000; byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); - using (Stream reqStream = archiveWeekRequest.GetRequestStream()) + using (Stream reqStream = archiveRequest.GetRequestStream()) { reqStream.Write(byteArray, 0, byteArray.Length); } - HttpWebResponse archiveWeekResponse = (HttpWebResponse)archiveWeekRequest.GetResponse(); - var archiveWeekResponseContent = new StreamReader(archiveWeekResponse.GetResponseStream()).ReadToEnd(); + archiveResponse = (HttpWebResponse)archiveRequest.GetResponse(); + archiveResponseContent = new StreamReader(archiveResponse.GetResponseStream()).ReadToEnd(); + archiveResponse.Dispose(); + archiveResponse.Close(); - xmlDocument.LoadXml(archiveWeekResponseContent); - string archiveWeekJson = JsonConvert.SerializeXmlNode(xmlDocument); - JObject archiveWeekJsonResult = (JObject)JsonConvert.DeserializeObject(archiveWeekJson); + xmlDocument.LoadXml(archiveResponseContent); + archiveJson = JsonConvert.SerializeXmlNode(xmlDocument); + archiveJsonResult = (JObject)JsonConvert.DeserializeObject(archiveJson); - if (archiveWeekJsonResult.ContainsKey("err")) //抓取錯誤 + if (archiveJsonResult.ContainsKey("err")) //抓取錯誤 { //logger.LogError("【ArchiveElectricMeterDayJob】【週歸檔】【取得資料失敗】"); //logger.LogError("【ArchiveElectricMeterDayJob】【週歸檔】【取得資料失敗】[錯誤內容]：{0}", archiveWeekJsonResult); @@ -687,7 +714,7 @@ namespace BackendWorkerService.Quartz.Jobs archiveWeekRawData.Add("@end_timestamp", endTimestamp.Replace("T", " ").Substring(0, 19)); archiveWeekRawData.Add("@is_complete", 0); archiveWeekRawData.Add("@repeat_times", 0); - archiveWeekRawData.Add("@fail_reason", archiveWeekJson); + archiveWeekRawData.Add("@fail_reason", archiveJson); archiveWeekRawData.Add("@count_rawdata", 0); archiveWeekRawData.Add("@min_rawdata", 0); @@ -699,9 +726,9 @@ namespace BackendWorkerService.Quartz.Jobs waterArchiveWeekRawDatas.Add(archiveWeekRawData); } - if (archiveWeekJsonResult.ContainsKey("obj")) //表示可以讀取到內容 + if (archiveJsonResult.ContainsKey("obj")) //表示可以讀取到內容 { - var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveWeekJsonResult); + var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveJsonResult); if (ArrangeRawDatas != null && ArrangeRawDatas.Count() > 0) { waterArchiveWeekRawDatas.AddRange(ArrangeRawDatas); @@ -923,6 +950,14 @@ namespace BackendWorkerService.Quartz.Jobs logger.LogError("【ArchiveElectricMeterDayJob】【週歸檔】【任務失敗】"); logger.LogError("【ArchiveElectricMeterDayJob】【週歸檔】【任務失敗】[Exception]：{0}", exception.ToString()); } + finally + { + if (archiveResponse != null) + { + archiveResponse.Dispose(); + archiveResponse.Close(); + } + } } #endregion 週歸檔 @@ -954,26 +989,29 @@ namespace BackendWorkerService.Quartz.Jobs List> waterArchiveMonthRawDatas = new List>(); foreach (var deviceNumberPoint in electricDeviceNumberPoints) { - HttpWebRequest archiveMonthRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); + archiveRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); //HttpWebRequest archiveMonthRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); - archiveMonthRequest.Method = "POST"; - archiveMonthRequest.Headers.Add("Authorization", "Basic " + encoded); - archiveMonthRequest.PreAuthenticate = true; + archiveRequest.Method = "POST"; + archiveRequest.Headers.Add("Authorization", "Basic " + encoded); + archiveRequest.PreAuthenticate = true; + archiveRequest.Timeout = 3000; byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); - using (Stream reqStream = archiveMonthRequest.GetRequestStream()) + using (Stream reqStream = archiveRequest.GetRequestStream()) { reqStream.Write(byteArray, 0, byteArray.Length); } - HttpWebResponse archiveMonthResponse = (HttpWebResponse)archiveMonthRequest.GetResponse(); - var archiveMonthResponseContent = new StreamReader(archiveMonthResponse.GetResponseStream()).ReadToEnd(); + archiveResponse = (HttpWebResponse)archiveRequest.GetResponse(); + archiveResponseContent = new StreamReader(archiveResponse.GetResponseStream()).ReadToEnd(); + archiveResponse.Dispose(); + archiveResponse.Close(); - xmlDocument.LoadXml(archiveMonthResponseContent); - string archiveMonthJson = JsonConvert.SerializeXmlNode(xmlDocument); - JObject archiveMonthJsonResult = (JObject)JsonConvert.DeserializeObject(archiveMonthJson); + xmlDocument.LoadXml(archiveResponseContent); + archiveJson = JsonConvert.SerializeXmlNode(xmlDocument); + archiveJsonResult = (JObject)JsonConvert.DeserializeObject(archiveJson); - if (archiveMonthJsonResult.ContainsKey("err")) //抓取錯誤 + if (archiveJsonResult.ContainsKey("err")) //抓取錯誤 { //logger.LogError("【ArchiveElectricMeterDayJob】【月歸檔】【取得資料失敗】"); //logger.LogError("【ArchiveElectricMeterDayJob】【月歸檔】【取得資料失敗】[錯誤內容]：{0}", archiveMonthJsonResult); @@ -985,7 +1023,7 @@ namespace BackendWorkerService.Quartz.Jobs archiveMonthRawData.Add("@end_timestamp", endTimestamp.Replace("T", " ").Substring(0, 19)); archiveMonthRawData.Add("@is_complete", 0); archiveMonthRawData.Add("@repeat_times", 0); - archiveMonthRawData.Add("@fail_reason", archiveMonthJson); + archiveMonthRawData.Add("@fail_reason", archiveJson); archiveMonthRawData.Add("@count_rawdata", 0); archiveMonthRawData.Add("@min_rawdata", 0); @@ -997,9 +1035,9 @@ namespace BackendWorkerService.Quartz.Jobs electricArchiveMonthRawDatas.Add(archiveMonthRawData); } - if (archiveMonthJsonResult.ContainsKey("obj")) //表示可以讀取到內容 + if (archiveJsonResult.ContainsKey("obj")) //表示可以讀取到內容 { - var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveMonthJsonResult); + var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveJsonResult); if (ArrangeRawDatas != null && ArrangeRawDatas.Count() > 0) { electricArchiveMonthRawDatas.AddRange(ArrangeRawDatas); @@ -1008,26 +1046,29 @@ namespace BackendWorkerService.Quartz.Jobs } foreach (var deviceNumberPoint in waterDeviceNumberPoints) { - HttpWebRequest archiveMonthRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); + archiveRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); //HttpWebRequest archiveMonthRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); - archiveMonthRequest.Method = "POST"; - archiveMonthRequest.Headers.Add("Authorization", "Basic " + encoded); - archiveMonthRequest.PreAuthenticate = true; + archiveRequest.Method = "POST"; + archiveRequest.Headers.Add("Authorization", "Basic " + encoded); + archiveRequest.PreAuthenticate = true; + archiveRequest.Timeout = 3000; byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); - using (Stream reqStream = archiveMonthRequest.GetRequestStream()) + using (Stream reqStream = archiveRequest.GetRequestStream()) { reqStream.Write(byteArray, 0, byteArray.Length); } - HttpWebResponse archiveMonthResponse = (HttpWebResponse)archiveMonthRequest.GetResponse(); - var archiveMonthResponseContent = new StreamReader(archiveMonthResponse.GetResponseStream()).ReadToEnd(); + archiveResponse = (HttpWebResponse)archiveRequest.GetResponse(); + archiveResponseContent = new StreamReader(archiveResponse.GetResponseStream()).ReadToEnd(); + archiveResponse.Dispose(); + archiveResponse.Close(); - xmlDocument.LoadXml(archiveMonthResponseContent); - string archiveMonthJson = JsonConvert.SerializeXmlNode(xmlDocument); - JObject archiveMonthJsonResult = (JObject)JsonConvert.DeserializeObject(archiveMonthJson); + xmlDocument.LoadXml(archiveResponseContent); + archiveJson = JsonConvert.SerializeXmlNode(xmlDocument); + archiveJsonResult = (JObject)JsonConvert.DeserializeObject(archiveJson); - if (archiveMonthJsonResult.ContainsKey("err")) //抓取錯誤 + if (archiveJsonResult.ContainsKey("err")) //抓取錯誤 { //logger.LogError("【ArchiveElectricMeterDayJob】【月歸檔】【取得資料失敗】"); //logger.LogError("【ArchiveElectricMeterDayJob】【月歸檔】【取得資料失敗】[錯誤內容]：{0}", archiveMonthJsonResult); @@ -1039,7 +1080,7 @@ namespace BackendWorkerService.Quartz.Jobs archiveMonthRawData.Add("@end_timestamp", endTimestamp.Replace("T", " ").Substring(0, 19)); archiveMonthRawData.Add("@is_complete", 0); archiveMonthRawData.Add("@repeat_times", 0); - archiveMonthRawData.Add("@fail_reason", archiveMonthJson); + archiveMonthRawData.Add("@fail_reason", archiveJson); archiveMonthRawData.Add("@count_rawdata", 0); archiveMonthRawData.Add("@min_rawdata", 0); @@ -1051,9 +1092,9 @@ namespace BackendWorkerService.Quartz.Jobs waterArchiveMonthRawDatas.Add(archiveMonthRawData); } - if (archiveMonthJsonResult.ContainsKey("obj")) //表示可以讀取到內容 + if (archiveJsonResult.ContainsKey("obj")) //表示可以讀取到內容 { - var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveMonthJsonResult); + var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveJsonResult); if (ArrangeRawDatas != null && ArrangeRawDatas.Count() > 0) { waterArchiveMonthRawDatas.AddRange(ArrangeRawDatas); @@ -1268,6 +1309,14 @@ namespace BackendWorkerService.Quartz.Jobs logger.LogError("【ArchiveElectricMeterDayJob】【月歸檔】【任務失敗】"); logger.LogError("【ArchiveElectricMeterDayJob】【月歸檔】【任務失敗】[Exception]：{0}", exception.ToString()); } + finally + { + if (archiveResponse != null) + { + archiveResponse.Dispose(); + archiveResponse.Close(); + } + } } #endregion 月歸檔 @@ -1277,7 +1326,7 @@ namespace BackendWorkerService.Quartz.Jobs { try { - await task_Detail.InsertWorkTime("ArchiveElectricMeterDayJob", "Compensate", "任務開始"); + await task_Detail.InsertWorkTime("ArchiveElectricMeterDayJob", "Compensate", "補償機制任務開始"); ProcEletricMeterService procEletricMeterService = new ProcEletricMeterService(backgroundServiceRepository, backgroundServiceMsSqlRepository); await procEletricMeterService.ArchiveData(); await task_Detail.InsertWorkTime_End("ArchiveElectricMeterDayJob", "Compensate", "任務完成"); diff --git a/Frontend/_alert.html b/Frontend/_alert.html index 496f2d5..e66ffa3 100644 --- a/Frontend/_alert.html +++ b/Frontend/_alert.html @@ -875,7 +875,7 @@ { "title": "設備名稱", "data": "sourceName_zh", - render: (data) => { + "render" : function (data) { return allDevices.find(d => d.device_number === data)?.full_name || "" } }, From 7f010ddb97b8fcd7a156ccc3dff311fb19c00b86 Mon Sep 17 00:00:00 2001 From: dev02 Date: Wed, 7 Jun 2023 12:17:09 +0800 Subject: [PATCH 07/21] =?UTF-8?q?Revert=20"[=E5=89=8D=E5=8F=B0]=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=B3=E6=99=82=E5=91=8A=E8=AD=A6table=20r?= =?UTF-8?q?ender=20=E5=95=8F=E9=A1=8C"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 40ba482d701b013f28ac82d3a75d1b364477bdb2. --- Backend/appsettings.Development.json | 4 +- .../Quartz/Jobs/ArchiveElectricMeterDayJob.cs | 221 +++++++----------- Frontend/_alert.html | 2 +- 3 files changed, 89 insertions(+), 138 deletions(-) diff --git a/Backend/appsettings.Development.json b/Backend/appsettings.Development.json index b5af96e..83cd09a 100644 --- a/Backend/appsettings.Development.json +++ b/Backend/appsettings.Development.json @@ -18,10 +18,10 @@ "Port": "js2LutKe+rdjzdxMPQUrvQ==", //"Database": "VJB2XC+lAtzuHObDGMVOAA==", //30 //"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp - //"Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome + "Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome //"Database": "siTUcDaC/g2yGTMFWD72Kg==", //tpe_dome_hotel //"Database": "iuaY0h0+TWkir44/eZLDqw==", //tpe_dome_office - "Database": "Rq7Gn4x6LwBvVtl7GY8LbA==", //mcut + //"Database": "Rq7Gn4x6LwBvVtl7GY8LbA==", //mcut "Root": "SzdxEgaJJ7tcTCrUl2zKsA==", "Password": "FVAPxztxpY4gJJKQ/se4bQ==" }, diff --git a/BackendWorkerService/Quartz/Jobs/ArchiveElectricMeterDayJob.cs b/BackendWorkerService/Quartz/Jobs/ArchiveElectricMeterDayJob.cs index cdfeb09..8a3b8cc 100644 --- a/BackendWorkerService/Quartz/Jobs/ArchiveElectricMeterDayJob.cs +++ b/BackendWorkerService/Quartz/Jobs/ArchiveElectricMeterDayJob.cs @@ -55,20 +55,13 @@ namespace BackendWorkerService.Quartz.Jobs EDFunction ed = new EDFunction(); XmlDocument xmlDocument = new XmlDocument(); - ServicePointManager.DefaultConnectionLimit = 10; var sqlArchive = $@"SELECT system_value as Value, system_key as Name FROM variable WHERE deleted = 0 AND system_type = 'archiveConfig'"; var saveToMSDB = await backgroundServiceRepository.GetOneAsync("select system_value from variable where system_type = 'save_to_ms_db' and deleted = 0"); + var variableArchive = await backgroundServiceRepository.GetAllAsync(sqlArchive); var electricMeterGuid = variableArchive.Where(x => x.Name == "ElectricMeterGuid").Select(x => x.Value).FirstOrDefault(); var waterMeterGuid = variableArchive.Where(x => x.Name == "WaterMeterGuid").Select(x => x.Value).FirstOrDefault(); - #region http variable - HttpWebRequest archiveRequest = null; - HttpWebResponse archiveResponse = null; - string archiveResponseContent = null; - string archiveJson = null; - JObject archiveJsonResult = new JObject(); - #endregion #region 找出所有電錶設備 var sWhere = "deleted = 0 AND device_name_tag = @sub_system_guid"; var electricMeters = await backgroundServiceRepository.GetAllAsync("device", sWhere, new { sub_system_guid = electricMeterGuid }); @@ -154,29 +147,26 @@ namespace BackendWorkerService.Quartz.Jobs foreach (var deviceNumberPoint in electricDeviceNumberPoints) { - archiveRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); + HttpWebRequest archiveDayRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); //HttpWebRequest archiveDayRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); - archiveRequest.Method = "POST"; - archiveRequest.Headers.Add("Authorization", "Basic " + encoded); - archiveRequest.PreAuthenticate = true; - archiveRequest.Timeout = 3000; + archiveDayRequest.Method = "POST"; + archiveDayRequest.Headers.Add("Authorization", "Basic " + encoded); + archiveDayRequest.PreAuthenticate = true; byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); - using (Stream reqStream = archiveRequest.GetRequestStream()) + using (Stream reqStream = archiveDayRequest.GetRequestStream()) { reqStream.Write(byteArray, 0, byteArray.Length); } - archiveResponse = (HttpWebResponse)archiveRequest.GetResponse(); - archiveResponseContent = new StreamReader(archiveResponse.GetResponseStream()).ReadToEnd(); - archiveResponse.Dispose(); - archiveResponse.Close(); + HttpWebResponse archiveDayResponse = (HttpWebResponse)archiveDayRequest.GetResponse(); + var archiveDayResponseContent = new StreamReader(archiveDayResponse.GetResponseStream()).ReadToEnd(); - xmlDocument.LoadXml(archiveResponseContent); - archiveJson = JsonConvert.SerializeXmlNode(xmlDocument); - archiveJsonResult = (JObject)JsonConvert.DeserializeObject(archiveJson); + xmlDocument.LoadXml(archiveDayResponseContent); + string archiveDayJson = JsonConvert.SerializeXmlNode(xmlDocument); + JObject archiveDayJsonResult = (JObject)JsonConvert.DeserializeObject(archiveDayJson); - if (archiveJsonResult.ContainsKey("err")) //抓取錯誤 + if (archiveDayJsonResult.ContainsKey("err")) //抓取錯誤 { //logger.LogError("【ArchiveElectricMeterDayJob】【天歸檔】【取得資料失敗】"); //logger.LogError("【ArchiveElectricMeterDayJob】【天歸檔】【取得資料失敗】[錯誤內容]：{0}", archiveDayJsonResult); @@ -188,7 +178,7 @@ namespace BackendWorkerService.Quartz.Jobs archiveDayRawData.Add("@end_timestamp", endTimestamp.Replace("T", " ").Substring(0, 19)); archiveDayRawData.Add("@is_complete", 0); archiveDayRawData.Add("@repeat_times", 0); - archiveDayRawData.Add("@fail_reason", archiveJson); + archiveDayRawData.Add("@fail_reason", archiveDayJson); archiveDayRawData.Add("@count_rawdata", 0); archiveDayRawData.Add("@min_rawdata", 0); @@ -200,9 +190,9 @@ namespace BackendWorkerService.Quartz.Jobs electericArchiveDayRawDatas.Add(archiveDayRawData); } - if (archiveJsonResult.ContainsKey("obj")) //表示可以讀取到內容 + if (archiveDayJsonResult.ContainsKey("obj")) //表示可以讀取到內容 { - var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveJsonResult); + var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveDayJsonResult); if (ArrangeRawDatas != null && ArrangeRawDatas.Count() > 0) { electericArchiveDayRawDatas.AddRange(ArrangeRawDatas); @@ -212,29 +202,26 @@ namespace BackendWorkerService.Quartz.Jobs foreach (var deviceNumberPoint in waterDeviceNumberPoints) { - archiveRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); + HttpWebRequest archiveDayRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); //HttpWebRequest archiveDayRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); - archiveRequest.Method = "POST"; - archiveRequest.Headers.Add("Authorization", "Basic " + encoded); - archiveRequest.PreAuthenticate = true; - archiveRequest.Timeout = 3000; + archiveDayRequest.Method = "POST"; + archiveDayRequest.Headers.Add("Authorization", "Basic " + encoded); + archiveDayRequest.PreAuthenticate = true; byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); - using (Stream reqStream = archiveRequest.GetRequestStream()) + using (Stream reqStream = archiveDayRequest.GetRequestStream()) { reqStream.Write(byteArray, 0, byteArray.Length); } - archiveResponse = (HttpWebResponse)archiveRequest.GetResponse(); - archiveResponseContent = new StreamReader(archiveResponse.GetResponseStream()).ReadToEnd(); - archiveResponse.Dispose(); - archiveResponse.Close(); + HttpWebResponse archiveDayResponse = (HttpWebResponse)archiveDayRequest.GetResponse(); + var archiveDayResponseContent = new StreamReader(archiveDayResponse.GetResponseStream()).ReadToEnd(); - xmlDocument.LoadXml(archiveResponseContent); - archiveJson = JsonConvert.SerializeXmlNode(xmlDocument); - archiveJsonResult = (JObject)JsonConvert.DeserializeObject(archiveJson); + xmlDocument.LoadXml(archiveDayResponseContent); + string archiveDayJson = JsonConvert.SerializeXmlNode(xmlDocument); + JObject archiveDayJsonResult = (JObject)JsonConvert.DeserializeObject(archiveDayJson); - if (archiveJsonResult.ContainsKey("err")) //抓取錯誤 + if (archiveDayJsonResult.ContainsKey("err")) //抓取錯誤 { //logger.LogError("【ArchiveElectricMeterDayJob】【天歸檔】【取得資料失敗】"); //logger.LogError("【ArchiveElectricMeterDayJob】【天歸檔】【取得資料失敗】[錯誤內容]：{0}", archiveDayJsonResult); @@ -246,7 +233,7 @@ namespace BackendWorkerService.Quartz.Jobs archiveDayRawData.Add("@end_timestamp", endTimestamp.Replace("T", " ").Substring(0, 19)); archiveDayRawData.Add("@is_complete", 0); archiveDayRawData.Add("@repeat_times", 0); - archiveDayRawData.Add("@fail_reason", archiveJson); + archiveDayRawData.Add("@fail_reason", archiveDayJson); archiveDayRawData.Add("@count_rawdata", 0); archiveDayRawData.Add("@min_rawdata", 0); @@ -258,9 +245,9 @@ namespace BackendWorkerService.Quartz.Jobs waterArchiveDayRawDatas.Add(archiveDayRawData); } - if (archiveJsonResult.ContainsKey("obj")) //表示可以讀取到內容 + if (archiveDayJsonResult.ContainsKey("obj")) //表示可以讀取到內容 { - var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveJsonResult); + var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveDayJsonResult); if (ArrangeRawDatas != null && ArrangeRawDatas.Count() > 0) { waterArchiveDayRawDatas.AddRange(ArrangeRawDatas); @@ -586,14 +573,6 @@ namespace BackendWorkerService.Quartz.Jobs logger.LogError("【ArchiveElectricMeterDayJob】【天歸檔】【任務失敗】"); logger.LogError("【ArchiveElectricMeterDayJob】【天歸檔】【任務失敗】[Exception]：{0}", exception.ToString()); } - finally - { - if (archiveResponse != null) - { - archiveResponse.Dispose(); - archiveResponse.Close(); - } - } } #endregion 天歸檔 @@ -623,29 +602,26 @@ namespace BackendWorkerService.Quartz.Jobs List> waterArchiveWeekRawDatas = new List>(); foreach (var deviceNumberPoint in electricDeviceNumberPoints) { - archiveRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); + HttpWebRequest archiveWeekRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); //HttpWebRequest archiveWeekRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); - archiveRequest.Method = "POST"; - archiveRequest.Headers.Add("Authorization", "Basic " + encoded); - archiveRequest.PreAuthenticate = true; - archiveRequest.Timeout = 3000; + archiveWeekRequest.Method = "POST"; + archiveWeekRequest.Headers.Add("Authorization", "Basic " + encoded); + archiveWeekRequest.PreAuthenticate = true; byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); - using (Stream reqStream = archiveRequest.GetRequestStream()) + using (Stream reqStream = archiveWeekRequest.GetRequestStream()) { reqStream.Write(byteArray, 0, byteArray.Length); } - archiveResponse = (HttpWebResponse)archiveRequest.GetResponse(); - archiveResponseContent = new StreamReader(archiveResponse.GetResponseStream()).ReadToEnd(); - archiveResponse.Dispose(); - archiveResponse.Close(); + HttpWebResponse archiveWeekResponse = (HttpWebResponse)archiveWeekRequest.GetResponse(); + var archiveWeekResponseContent = new StreamReader(archiveWeekResponse.GetResponseStream()).ReadToEnd(); - xmlDocument.LoadXml(archiveResponseContent); - archiveJson = JsonConvert.SerializeXmlNode(xmlDocument); - archiveJsonResult = (JObject)JsonConvert.DeserializeObject(archiveJson); + xmlDocument.LoadXml(archiveWeekResponseContent); + string archiveWeekJson = JsonConvert.SerializeXmlNode(xmlDocument); + JObject archiveWeekJsonResult = (JObject)JsonConvert.DeserializeObject(archiveWeekJson); - if (archiveJsonResult.ContainsKey("err")) //抓取錯誤 + if (archiveWeekJsonResult.ContainsKey("err")) //抓取錯誤 { //logger.LogError("【ArchiveElectricMeterDayJob】【週歸檔】【取得資料失敗】"); //logger.LogError("【ArchiveElectricMeterDayJob】【週歸檔】【取得資料失敗】[錯誤內容]：{0}", archiveWeekJsonResult); @@ -657,7 +633,7 @@ namespace BackendWorkerService.Quartz.Jobs archiveWeekRawData.Add("@end_timestamp", endTimestamp.Replace("T", " ").Substring(0, 19)); archiveWeekRawData.Add("@is_complete", 0); archiveWeekRawData.Add("@repeat_times", 0); - archiveWeekRawData.Add("@fail_reason", archiveJson); + archiveWeekRawData.Add("@fail_reason", archiveWeekJson); archiveWeekRawData.Add("@count_rawdata", 0); archiveWeekRawData.Add("@min_rawdata", 0); @@ -669,9 +645,9 @@ namespace BackendWorkerService.Quartz.Jobs electricArchiveWeekRawDatas.Add(archiveWeekRawData); } - if (archiveJsonResult.ContainsKey("obj")) //表示可以讀取到內容 + if (archiveWeekJsonResult.ContainsKey("obj")) //表示可以讀取到內容 { - var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveJsonResult); + var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveWeekJsonResult); if (ArrangeRawDatas != null && ArrangeRawDatas.Count() > 0) { electricArchiveWeekRawDatas.AddRange(ArrangeRawDatas); @@ -680,29 +656,26 @@ namespace BackendWorkerService.Quartz.Jobs } foreach (var deviceNumberPoint in waterDeviceNumberPoints) { - archiveRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); + HttpWebRequest archiveWeekRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); //HttpWebRequest archiveWeekRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); - archiveRequest.Method = "POST"; - archiveRequest.Headers.Add("Authorization", "Basic " + encoded); - archiveRequest.PreAuthenticate = true; - archiveRequest.Timeout = 3000; + archiveWeekRequest.Method = "POST"; + archiveWeekRequest.Headers.Add("Authorization", "Basic " + encoded); + archiveWeekRequest.PreAuthenticate = true; byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); - using (Stream reqStream = archiveRequest.GetRequestStream()) + using (Stream reqStream = archiveWeekRequest.GetRequestStream()) { reqStream.Write(byteArray, 0, byteArray.Length); } - archiveResponse = (HttpWebResponse)archiveRequest.GetResponse(); - archiveResponseContent = new StreamReader(archiveResponse.GetResponseStream()).ReadToEnd(); - archiveResponse.Dispose(); - archiveResponse.Close(); + HttpWebResponse archiveWeekResponse = (HttpWebResponse)archiveWeekRequest.GetResponse(); + var archiveWeekResponseContent = new StreamReader(archiveWeekResponse.GetResponseStream()).ReadToEnd(); - xmlDocument.LoadXml(archiveResponseContent); - archiveJson = JsonConvert.SerializeXmlNode(xmlDocument); - archiveJsonResult = (JObject)JsonConvert.DeserializeObject(archiveJson); + xmlDocument.LoadXml(archiveWeekResponseContent); + string archiveWeekJson = JsonConvert.SerializeXmlNode(xmlDocument); + JObject archiveWeekJsonResult = (JObject)JsonConvert.DeserializeObject(archiveWeekJson); - if (archiveJsonResult.ContainsKey("err")) //抓取錯誤 + if (archiveWeekJsonResult.ContainsKey("err")) //抓取錯誤 { //logger.LogError("【ArchiveElectricMeterDayJob】【週歸檔】【取得資料失敗】"); //logger.LogError("【ArchiveElectricMeterDayJob】【週歸檔】【取得資料失敗】[錯誤內容]：{0}", archiveWeekJsonResult); @@ -714,7 +687,7 @@ namespace BackendWorkerService.Quartz.Jobs archiveWeekRawData.Add("@end_timestamp", endTimestamp.Replace("T", " ").Substring(0, 19)); archiveWeekRawData.Add("@is_complete", 0); archiveWeekRawData.Add("@repeat_times", 0); - archiveWeekRawData.Add("@fail_reason", archiveJson); + archiveWeekRawData.Add("@fail_reason", archiveWeekJson); archiveWeekRawData.Add("@count_rawdata", 0); archiveWeekRawData.Add("@min_rawdata", 0); @@ -726,9 +699,9 @@ namespace BackendWorkerService.Quartz.Jobs waterArchiveWeekRawDatas.Add(archiveWeekRawData); } - if (archiveJsonResult.ContainsKey("obj")) //表示可以讀取到內容 + if (archiveWeekJsonResult.ContainsKey("obj")) //表示可以讀取到內容 { - var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveJsonResult); + var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveWeekJsonResult); if (ArrangeRawDatas != null && ArrangeRawDatas.Count() > 0) { waterArchiveWeekRawDatas.AddRange(ArrangeRawDatas); @@ -950,14 +923,6 @@ namespace BackendWorkerService.Quartz.Jobs logger.LogError("【ArchiveElectricMeterDayJob】【週歸檔】【任務失敗】"); logger.LogError("【ArchiveElectricMeterDayJob】【週歸檔】【任務失敗】[Exception]：{0}", exception.ToString()); } - finally - { - if (archiveResponse != null) - { - archiveResponse.Dispose(); - archiveResponse.Close(); - } - } } #endregion 週歸檔 @@ -989,29 +954,26 @@ namespace BackendWorkerService.Quartz.Jobs List> waterArchiveMonthRawDatas = new List>(); foreach (var deviceNumberPoint in electricDeviceNumberPoints) { - archiveRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); + HttpWebRequest archiveMonthRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); //HttpWebRequest archiveMonthRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); - archiveRequest.Method = "POST"; - archiveRequest.Headers.Add("Authorization", "Basic " + encoded); - archiveRequest.PreAuthenticate = true; - archiveRequest.Timeout = 3000; + archiveMonthRequest.Method = "POST"; + archiveMonthRequest.Headers.Add("Authorization", "Basic " + encoded); + archiveMonthRequest.PreAuthenticate = true; byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); - using (Stream reqStream = archiveRequest.GetRequestStream()) + using (Stream reqStream = archiveMonthRequest.GetRequestStream()) { reqStream.Write(byteArray, 0, byteArray.Length); } - archiveResponse = (HttpWebResponse)archiveRequest.GetResponse(); - archiveResponseContent = new StreamReader(archiveResponse.GetResponseStream()).ReadToEnd(); - archiveResponse.Dispose(); - archiveResponse.Close(); + HttpWebResponse archiveMonthResponse = (HttpWebResponse)archiveMonthRequest.GetResponse(); + var archiveMonthResponseContent = new StreamReader(archiveMonthResponse.GetResponseStream()).ReadToEnd(); - xmlDocument.LoadXml(archiveResponseContent); - archiveJson = JsonConvert.SerializeXmlNode(xmlDocument); - archiveJsonResult = (JObject)JsonConvert.DeserializeObject(archiveJson); + xmlDocument.LoadXml(archiveMonthResponseContent); + string archiveMonthJson = JsonConvert.SerializeXmlNode(xmlDocument); + JObject archiveMonthJsonResult = (JObject)JsonConvert.DeserializeObject(archiveMonthJson); - if (archiveJsonResult.ContainsKey("err")) //抓取錯誤 + if (archiveMonthJsonResult.ContainsKey("err")) //抓取錯誤 { //logger.LogError("【ArchiveElectricMeterDayJob】【月歸檔】【取得資料失敗】"); //logger.LogError("【ArchiveElectricMeterDayJob】【月歸檔】【取得資料失敗】[錯誤內容]：{0}", archiveMonthJsonResult); @@ -1023,7 +985,7 @@ namespace BackendWorkerService.Quartz.Jobs archiveMonthRawData.Add("@end_timestamp", endTimestamp.Replace("T", " ").Substring(0, 19)); archiveMonthRawData.Add("@is_complete", 0); archiveMonthRawData.Add("@repeat_times", 0); - archiveMonthRawData.Add("@fail_reason", archiveJson); + archiveMonthRawData.Add("@fail_reason", archiveMonthJson); archiveMonthRawData.Add("@count_rawdata", 0); archiveMonthRawData.Add("@min_rawdata", 0); @@ -1035,9 +997,9 @@ namespace BackendWorkerService.Quartz.Jobs electricArchiveMonthRawDatas.Add(archiveMonthRawData); } - if (archiveJsonResult.ContainsKey("obj")) //表示可以讀取到內容 + if (archiveMonthJsonResult.ContainsKey("obj")) //表示可以讀取到內容 { - var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveJsonResult); + var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveMonthJsonResult); if (ArrangeRawDatas != null && ArrangeRawDatas.Count() > 0) { electricArchiveMonthRawDatas.AddRange(ArrangeRawDatas); @@ -1046,29 +1008,26 @@ namespace BackendWorkerService.Quartz.Jobs } foreach (var deviceNumberPoint in waterDeviceNumberPoints) { - archiveRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); + HttpWebRequest archiveMonthRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); //HttpWebRequest archiveMonthRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); - archiveRequest.Method = "POST"; - archiveRequest.Headers.Add("Authorization", "Basic " + encoded); - archiveRequest.PreAuthenticate = true; - archiveRequest.Timeout = 3000; + archiveMonthRequest.Method = "POST"; + archiveMonthRequest.Headers.Add("Authorization", "Basic " + encoded); + archiveMonthRequest.PreAuthenticate = true; byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); - using (Stream reqStream = archiveRequest.GetRequestStream()) + using (Stream reqStream = archiveMonthRequest.GetRequestStream()) { reqStream.Write(byteArray, 0, byteArray.Length); } - archiveResponse = (HttpWebResponse)archiveRequest.GetResponse(); - archiveResponseContent = new StreamReader(archiveResponse.GetResponseStream()).ReadToEnd(); - archiveResponse.Dispose(); - archiveResponse.Close(); + HttpWebResponse archiveMonthResponse = (HttpWebResponse)archiveMonthRequest.GetResponse(); + var archiveMonthResponseContent = new StreamReader(archiveMonthResponse.GetResponseStream()).ReadToEnd(); - xmlDocument.LoadXml(archiveResponseContent); - archiveJson = JsonConvert.SerializeXmlNode(xmlDocument); - archiveJsonResult = (JObject)JsonConvert.DeserializeObject(archiveJson); + xmlDocument.LoadXml(archiveMonthResponseContent); + string archiveMonthJson = JsonConvert.SerializeXmlNode(xmlDocument); + JObject archiveMonthJsonResult = (JObject)JsonConvert.DeserializeObject(archiveMonthJson); - if (archiveJsonResult.ContainsKey("err")) //抓取錯誤 + if (archiveMonthJsonResult.ContainsKey("err")) //抓取錯誤 { //logger.LogError("【ArchiveElectricMeterDayJob】【月歸檔】【取得資料失敗】"); //logger.LogError("【ArchiveElectricMeterDayJob】【月歸檔】【取得資料失敗】[錯誤內容]：{0}", archiveMonthJsonResult); @@ -1080,7 +1039,7 @@ namespace BackendWorkerService.Quartz.Jobs archiveMonthRawData.Add("@end_timestamp", endTimestamp.Replace("T", " ").Substring(0, 19)); archiveMonthRawData.Add("@is_complete", 0); archiveMonthRawData.Add("@repeat_times", 0); - archiveMonthRawData.Add("@fail_reason", archiveJson); + archiveMonthRawData.Add("@fail_reason", archiveMonthJson); archiveMonthRawData.Add("@count_rawdata", 0); archiveMonthRawData.Add("@min_rawdata", 0); @@ -1092,9 +1051,9 @@ namespace BackendWorkerService.Quartz.Jobs waterArchiveMonthRawDatas.Add(archiveMonthRawData); } - if (archiveJsonResult.ContainsKey("obj")) //表示可以讀取到內容 + if (archiveMonthJsonResult.ContainsKey("obj")) //表示可以讀取到內容 { - var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveJsonResult); + var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveMonthJsonResult); if (ArrangeRawDatas != null && ArrangeRawDatas.Count() > 0) { waterArchiveMonthRawDatas.AddRange(ArrangeRawDatas); @@ -1309,14 +1268,6 @@ namespace BackendWorkerService.Quartz.Jobs logger.LogError("【ArchiveElectricMeterDayJob】【月歸檔】【任務失敗】"); logger.LogError("【ArchiveElectricMeterDayJob】【月歸檔】【任務失敗】[Exception]：{0}", exception.ToString()); } - finally - { - if (archiveResponse != null) - { - archiveResponse.Dispose(); - archiveResponse.Close(); - } - } } #endregion 月歸檔 @@ -1326,7 +1277,7 @@ namespace BackendWorkerService.Quartz.Jobs { try { - await task_Detail.InsertWorkTime("ArchiveElectricMeterDayJob", "Compensate", "補償機制任務開始"); + await task_Detail.InsertWorkTime("ArchiveElectricMeterDayJob", "Compensate", "任務開始"); ProcEletricMeterService procEletricMeterService = new ProcEletricMeterService(backgroundServiceRepository, backgroundServiceMsSqlRepository); await procEletricMeterService.ArchiveData(); await task_Detail.InsertWorkTime_End("ArchiveElectricMeterDayJob", "Compensate", "任務完成"); diff --git a/Frontend/_alert.html b/Frontend/_alert.html index e66ffa3..496f2d5 100644 --- a/Frontend/_alert.html +++ b/Frontend/_alert.html @@ -875,7 +875,7 @@ { "title": "設備名稱", "data": "sourceName_zh", - "render" : function (data) { + render: (data) => { return allDevices.find(d => d.device_number === data)?.full_name || "" } }, From 447f1c6d6959a0ecec765a5a75b9c512e258d11d Mon Sep 17 00:00:00 2001 From: dev02 Date: Wed, 7 Jun 2023 12:18:46 +0800 Subject: [PATCH 08/21] =?UTF-8?q?Revert=20"Revert=20"[=E5=89=8D=E5=8F=B0]?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E5=8D=B3=E6=99=82=E5=91=8A=E8=AD=A6table?= =?UTF-8?q?=20render=20=E5=95=8F=E9=A1=8C""?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 7f010ddb97b8fcd7a156ccc3dff311fb19c00b86. --- Backend/appsettings.Development.json | 4 +- .../Quartz/Jobs/ArchiveElectricMeterDayJob.cs | 221 +++++++++++------- Frontend/_alert.html | 2 +- 3 files changed, 138 insertions(+), 89 deletions(-) diff --git a/Backend/appsettings.Development.json b/Backend/appsettings.Development.json index 83cd09a..b5af96e 100644 --- a/Backend/appsettings.Development.json +++ b/Backend/appsettings.Development.json @@ -18,10 +18,10 @@ "Port": "js2LutKe+rdjzdxMPQUrvQ==", //"Database": "VJB2XC+lAtzuHObDGMVOAA==", //30 //"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp - "Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome + //"Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome //"Database": "siTUcDaC/g2yGTMFWD72Kg==", //tpe_dome_hotel //"Database": "iuaY0h0+TWkir44/eZLDqw==", //tpe_dome_office - //"Database": "Rq7Gn4x6LwBvVtl7GY8LbA==", //mcut + "Database": "Rq7Gn4x6LwBvVtl7GY8LbA==", //mcut "Root": "SzdxEgaJJ7tcTCrUl2zKsA==", "Password": "FVAPxztxpY4gJJKQ/se4bQ==" }, diff --git a/BackendWorkerService/Quartz/Jobs/ArchiveElectricMeterDayJob.cs b/BackendWorkerService/Quartz/Jobs/ArchiveElectricMeterDayJob.cs index 8a3b8cc..cdfeb09 100644 --- a/BackendWorkerService/Quartz/Jobs/ArchiveElectricMeterDayJob.cs +++ b/BackendWorkerService/Quartz/Jobs/ArchiveElectricMeterDayJob.cs @@ -55,13 +55,20 @@ namespace BackendWorkerService.Quartz.Jobs EDFunction ed = new EDFunction(); XmlDocument xmlDocument = new XmlDocument(); + ServicePointManager.DefaultConnectionLimit = 10; var sqlArchive = $@"SELECT system_value as Value, system_key as Name FROM variable WHERE deleted = 0 AND system_type = 'archiveConfig'"; var saveToMSDB = await backgroundServiceRepository.GetOneAsync("select system_value from variable where system_type = 'save_to_ms_db' and deleted = 0"); - var variableArchive = await backgroundServiceRepository.GetAllAsync(sqlArchive); var electricMeterGuid = variableArchive.Where(x => x.Name == "ElectricMeterGuid").Select(x => x.Value).FirstOrDefault(); var waterMeterGuid = variableArchive.Where(x => x.Name == "WaterMeterGuid").Select(x => x.Value).FirstOrDefault(); + #region http variable + HttpWebRequest archiveRequest = null; + HttpWebResponse archiveResponse = null; + string archiveResponseContent = null; + string archiveJson = null; + JObject archiveJsonResult = new JObject(); + #endregion #region 找出所有電錶設備 var sWhere = "deleted = 0 AND device_name_tag = @sub_system_guid"; var electricMeters = await backgroundServiceRepository.GetAllAsync("device", sWhere, new { sub_system_guid = electricMeterGuid }); @@ -147,26 +154,29 @@ namespace BackendWorkerService.Quartz.Jobs foreach (var deviceNumberPoint in electricDeviceNumberPoints) { - HttpWebRequest archiveDayRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); + archiveRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); //HttpWebRequest archiveDayRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); - archiveDayRequest.Method = "POST"; - archiveDayRequest.Headers.Add("Authorization", "Basic " + encoded); - archiveDayRequest.PreAuthenticate = true; + archiveRequest.Method = "POST"; + archiveRequest.Headers.Add("Authorization", "Basic " + encoded); + archiveRequest.PreAuthenticate = true; + archiveRequest.Timeout = 3000; byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); - using (Stream reqStream = archiveDayRequest.GetRequestStream()) + using (Stream reqStream = archiveRequest.GetRequestStream()) { reqStream.Write(byteArray, 0, byteArray.Length); } - HttpWebResponse archiveDayResponse = (HttpWebResponse)archiveDayRequest.GetResponse(); - var archiveDayResponseContent = new StreamReader(archiveDayResponse.GetResponseStream()).ReadToEnd(); + archiveResponse = (HttpWebResponse)archiveRequest.GetResponse(); + archiveResponseContent = new StreamReader(archiveResponse.GetResponseStream()).ReadToEnd(); + archiveResponse.Dispose(); + archiveResponse.Close(); - xmlDocument.LoadXml(archiveDayResponseContent); - string archiveDayJson = JsonConvert.SerializeXmlNode(xmlDocument); - JObject archiveDayJsonResult = (JObject)JsonConvert.DeserializeObject(archiveDayJson); + xmlDocument.LoadXml(archiveResponseContent); + archiveJson = JsonConvert.SerializeXmlNode(xmlDocument); + archiveJsonResult = (JObject)JsonConvert.DeserializeObject(archiveJson); - if (archiveDayJsonResult.ContainsKey("err")) //抓取錯誤 + if (archiveJsonResult.ContainsKey("err")) //抓取錯誤 { //logger.LogError("【ArchiveElectricMeterDayJob】【天歸檔】【取得資料失敗】"); //logger.LogError("【ArchiveElectricMeterDayJob】【天歸檔】【取得資料失敗】[錯誤內容]：{0}", archiveDayJsonResult); @@ -178,7 +188,7 @@ namespace BackendWorkerService.Quartz.Jobs archiveDayRawData.Add("@end_timestamp", endTimestamp.Replace("T", " ").Substring(0, 19)); archiveDayRawData.Add("@is_complete", 0); archiveDayRawData.Add("@repeat_times", 0); - archiveDayRawData.Add("@fail_reason", archiveDayJson); + archiveDayRawData.Add("@fail_reason", archiveJson); archiveDayRawData.Add("@count_rawdata", 0); archiveDayRawData.Add("@min_rawdata", 0); @@ -190,9 +200,9 @@ namespace BackendWorkerService.Quartz.Jobs electericArchiveDayRawDatas.Add(archiveDayRawData); } - if (archiveDayJsonResult.ContainsKey("obj")) //表示可以讀取到內容 + if (archiveJsonResult.ContainsKey("obj")) //表示可以讀取到內容 { - var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveDayJsonResult); + var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveJsonResult); if (ArrangeRawDatas != null && ArrangeRawDatas.Count() > 0) { electericArchiveDayRawDatas.AddRange(ArrangeRawDatas); @@ -202,26 +212,29 @@ namespace BackendWorkerService.Quartz.Jobs foreach (var deviceNumberPoint in waterDeviceNumberPoints) { - HttpWebRequest archiveDayRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); + archiveRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); //HttpWebRequest archiveDayRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); - archiveDayRequest.Method = "POST"; - archiveDayRequest.Headers.Add("Authorization", "Basic " + encoded); - archiveDayRequest.PreAuthenticate = true; + archiveRequest.Method = "POST"; + archiveRequest.Headers.Add("Authorization", "Basic " + encoded); + archiveRequest.PreAuthenticate = true; + archiveRequest.Timeout = 3000; byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); - using (Stream reqStream = archiveDayRequest.GetRequestStream()) + using (Stream reqStream = archiveRequest.GetRequestStream()) { reqStream.Write(byteArray, 0, byteArray.Length); } - HttpWebResponse archiveDayResponse = (HttpWebResponse)archiveDayRequest.GetResponse(); - var archiveDayResponseContent = new StreamReader(archiveDayResponse.GetResponseStream()).ReadToEnd(); + archiveResponse = (HttpWebResponse)archiveRequest.GetResponse(); + archiveResponseContent = new StreamReader(archiveResponse.GetResponseStream()).ReadToEnd(); + archiveResponse.Dispose(); + archiveResponse.Close(); - xmlDocument.LoadXml(archiveDayResponseContent); - string archiveDayJson = JsonConvert.SerializeXmlNode(xmlDocument); - JObject archiveDayJsonResult = (JObject)JsonConvert.DeserializeObject(archiveDayJson); + xmlDocument.LoadXml(archiveResponseContent); + archiveJson = JsonConvert.SerializeXmlNode(xmlDocument); + archiveJsonResult = (JObject)JsonConvert.DeserializeObject(archiveJson); - if (archiveDayJsonResult.ContainsKey("err")) //抓取錯誤 + if (archiveJsonResult.ContainsKey("err")) //抓取錯誤 { //logger.LogError("【ArchiveElectricMeterDayJob】【天歸檔】【取得資料失敗】"); //logger.LogError("【ArchiveElectricMeterDayJob】【天歸檔】【取得資料失敗】[錯誤內容]：{0}", archiveDayJsonResult); @@ -233,7 +246,7 @@ namespace BackendWorkerService.Quartz.Jobs archiveDayRawData.Add("@end_timestamp", endTimestamp.Replace("T", " ").Substring(0, 19)); archiveDayRawData.Add("@is_complete", 0); archiveDayRawData.Add("@repeat_times", 0); - archiveDayRawData.Add("@fail_reason", archiveDayJson); + archiveDayRawData.Add("@fail_reason", archiveJson); archiveDayRawData.Add("@count_rawdata", 0); archiveDayRawData.Add("@min_rawdata", 0); @@ -245,9 +258,9 @@ namespace BackendWorkerService.Quartz.Jobs waterArchiveDayRawDatas.Add(archiveDayRawData); } - if (archiveDayJsonResult.ContainsKey("obj")) //表示可以讀取到內容 + if (archiveJsonResult.ContainsKey("obj")) //表示可以讀取到內容 { - var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveDayJsonResult); + var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveJsonResult); if (ArrangeRawDatas != null && ArrangeRawDatas.Count() > 0) { waterArchiveDayRawDatas.AddRange(ArrangeRawDatas); @@ -573,6 +586,14 @@ namespace BackendWorkerService.Quartz.Jobs logger.LogError("【ArchiveElectricMeterDayJob】【天歸檔】【任務失敗】"); logger.LogError("【ArchiveElectricMeterDayJob】【天歸檔】【任務失敗】[Exception]：{0}", exception.ToString()); } + finally + { + if (archiveResponse != null) + { + archiveResponse.Dispose(); + archiveResponse.Close(); + } + } } #endregion 天歸檔 @@ -602,26 +623,29 @@ namespace BackendWorkerService.Quartz.Jobs List> waterArchiveWeekRawDatas = new List>(); foreach (var deviceNumberPoint in electricDeviceNumberPoints) { - HttpWebRequest archiveWeekRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); + archiveRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); //HttpWebRequest archiveWeekRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); - archiveWeekRequest.Method = "POST"; - archiveWeekRequest.Headers.Add("Authorization", "Basic " + encoded); - archiveWeekRequest.PreAuthenticate = true; + archiveRequest.Method = "POST"; + archiveRequest.Headers.Add("Authorization", "Basic " + encoded); + archiveRequest.PreAuthenticate = true; + archiveRequest.Timeout = 3000; byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); - using (Stream reqStream = archiveWeekRequest.GetRequestStream()) + using (Stream reqStream = archiveRequest.GetRequestStream()) { reqStream.Write(byteArray, 0, byteArray.Length); } - HttpWebResponse archiveWeekResponse = (HttpWebResponse)archiveWeekRequest.GetResponse(); - var archiveWeekResponseContent = new StreamReader(archiveWeekResponse.GetResponseStream()).ReadToEnd(); + archiveResponse = (HttpWebResponse)archiveRequest.GetResponse(); + archiveResponseContent = new StreamReader(archiveResponse.GetResponseStream()).ReadToEnd(); + archiveResponse.Dispose(); + archiveResponse.Close(); - xmlDocument.LoadXml(archiveWeekResponseContent); - string archiveWeekJson = JsonConvert.SerializeXmlNode(xmlDocument); - JObject archiveWeekJsonResult = (JObject)JsonConvert.DeserializeObject(archiveWeekJson); + xmlDocument.LoadXml(archiveResponseContent); + archiveJson = JsonConvert.SerializeXmlNode(xmlDocument); + archiveJsonResult = (JObject)JsonConvert.DeserializeObject(archiveJson); - if (archiveWeekJsonResult.ContainsKey("err")) //抓取錯誤 + if (archiveJsonResult.ContainsKey("err")) //抓取錯誤 { //logger.LogError("【ArchiveElectricMeterDayJob】【週歸檔】【取得資料失敗】"); //logger.LogError("【ArchiveElectricMeterDayJob】【週歸檔】【取得資料失敗】[錯誤內容]：{0}", archiveWeekJsonResult); @@ -633,7 +657,7 @@ namespace BackendWorkerService.Quartz.Jobs archiveWeekRawData.Add("@end_timestamp", endTimestamp.Replace("T", " ").Substring(0, 19)); archiveWeekRawData.Add("@is_complete", 0); archiveWeekRawData.Add("@repeat_times", 0); - archiveWeekRawData.Add("@fail_reason", archiveWeekJson); + archiveWeekRawData.Add("@fail_reason", archiveJson); archiveWeekRawData.Add("@count_rawdata", 0); archiveWeekRawData.Add("@min_rawdata", 0); @@ -645,9 +669,9 @@ namespace BackendWorkerService.Quartz.Jobs electricArchiveWeekRawDatas.Add(archiveWeekRawData); } - if (archiveWeekJsonResult.ContainsKey("obj")) //表示可以讀取到內容 + if (archiveJsonResult.ContainsKey("obj")) //表示可以讀取到內容 { - var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveWeekJsonResult); + var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveJsonResult); if (ArrangeRawDatas != null && ArrangeRawDatas.Count() > 0) { electricArchiveWeekRawDatas.AddRange(ArrangeRawDatas); @@ -656,26 +680,29 @@ namespace BackendWorkerService.Quartz.Jobs } foreach (var deviceNumberPoint in waterDeviceNumberPoints) { - HttpWebRequest archiveWeekRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); + archiveRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); //HttpWebRequest archiveWeekRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); - archiveWeekRequest.Method = "POST"; - archiveWeekRequest.Headers.Add("Authorization", "Basic " + encoded); - archiveWeekRequest.PreAuthenticate = true; + archiveRequest.Method = "POST"; + archiveRequest.Headers.Add("Authorization", "Basic " + encoded); + archiveRequest.PreAuthenticate = true; + archiveRequest.Timeout = 3000; byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); - using (Stream reqStream = archiveWeekRequest.GetRequestStream()) + using (Stream reqStream = archiveRequest.GetRequestStream()) { reqStream.Write(byteArray, 0, byteArray.Length); } - HttpWebResponse archiveWeekResponse = (HttpWebResponse)archiveWeekRequest.GetResponse(); - var archiveWeekResponseContent = new StreamReader(archiveWeekResponse.GetResponseStream()).ReadToEnd(); + archiveResponse = (HttpWebResponse)archiveRequest.GetResponse(); + archiveResponseContent = new StreamReader(archiveResponse.GetResponseStream()).ReadToEnd(); + archiveResponse.Dispose(); + archiveResponse.Close(); - xmlDocument.LoadXml(archiveWeekResponseContent); - string archiveWeekJson = JsonConvert.SerializeXmlNode(xmlDocument); - JObject archiveWeekJsonResult = (JObject)JsonConvert.DeserializeObject(archiveWeekJson); + xmlDocument.LoadXml(archiveResponseContent); + archiveJson = JsonConvert.SerializeXmlNode(xmlDocument); + archiveJsonResult = (JObject)JsonConvert.DeserializeObject(archiveJson); - if (archiveWeekJsonResult.ContainsKey("err")) //抓取錯誤 + if (archiveJsonResult.ContainsKey("err")) //抓取錯誤 { //logger.LogError("【ArchiveElectricMeterDayJob】【週歸檔】【取得資料失敗】"); //logger.LogError("【ArchiveElectricMeterDayJob】【週歸檔】【取得資料失敗】[錯誤內容]：{0}", archiveWeekJsonResult); @@ -687,7 +714,7 @@ namespace BackendWorkerService.Quartz.Jobs archiveWeekRawData.Add("@end_timestamp", endTimestamp.Replace("T", " ").Substring(0, 19)); archiveWeekRawData.Add("@is_complete", 0); archiveWeekRawData.Add("@repeat_times", 0); - archiveWeekRawData.Add("@fail_reason", archiveWeekJson); + archiveWeekRawData.Add("@fail_reason", archiveJson); archiveWeekRawData.Add("@count_rawdata", 0); archiveWeekRawData.Add("@min_rawdata", 0); @@ -699,9 +726,9 @@ namespace BackendWorkerService.Quartz.Jobs waterArchiveWeekRawDatas.Add(archiveWeekRawData); } - if (archiveWeekJsonResult.ContainsKey("obj")) //表示可以讀取到內容 + if (archiveJsonResult.ContainsKey("obj")) //表示可以讀取到內容 { - var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveWeekJsonResult); + var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveJsonResult); if (ArrangeRawDatas != null && ArrangeRawDatas.Count() > 0) { waterArchiveWeekRawDatas.AddRange(ArrangeRawDatas); @@ -923,6 +950,14 @@ namespace BackendWorkerService.Quartz.Jobs logger.LogError("【ArchiveElectricMeterDayJob】【週歸檔】【任務失敗】"); logger.LogError("【ArchiveElectricMeterDayJob】【週歸檔】【任務失敗】[Exception]：{0}", exception.ToString()); } + finally + { + if (archiveResponse != null) + { + archiveResponse.Dispose(); + archiveResponse.Close(); + } + } } #endregion 週歸檔 @@ -954,26 +989,29 @@ namespace BackendWorkerService.Quartz.Jobs List> waterArchiveMonthRawDatas = new List>(); foreach (var deviceNumberPoint in electricDeviceNumberPoints) { - HttpWebRequest archiveMonthRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); + archiveRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); //HttpWebRequest archiveMonthRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); - archiveMonthRequest.Method = "POST"; - archiveMonthRequest.Headers.Add("Authorization", "Basic " + encoded); - archiveMonthRequest.PreAuthenticate = true; + archiveRequest.Method = "POST"; + archiveRequest.Headers.Add("Authorization", "Basic " + encoded); + archiveRequest.PreAuthenticate = true; + archiveRequest.Timeout = 3000; byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); - using (Stream reqStream = archiveMonthRequest.GetRequestStream()) + using (Stream reqStream = archiveRequest.GetRequestStream()) { reqStream.Write(byteArray, 0, byteArray.Length); } - HttpWebResponse archiveMonthResponse = (HttpWebResponse)archiveMonthRequest.GetResponse(); - var archiveMonthResponseContent = new StreamReader(archiveMonthResponse.GetResponseStream()).ReadToEnd(); + archiveResponse = (HttpWebResponse)archiveRequest.GetResponse(); + archiveResponseContent = new StreamReader(archiveResponse.GetResponseStream()).ReadToEnd(); + archiveResponse.Dispose(); + archiveResponse.Close(); - xmlDocument.LoadXml(archiveMonthResponseContent); - string archiveMonthJson = JsonConvert.SerializeXmlNode(xmlDocument); - JObject archiveMonthJsonResult = (JObject)JsonConvert.DeserializeObject(archiveMonthJson); + xmlDocument.LoadXml(archiveResponseContent); + archiveJson = JsonConvert.SerializeXmlNode(xmlDocument); + archiveJsonResult = (JObject)JsonConvert.DeserializeObject(archiveJson); - if (archiveMonthJsonResult.ContainsKey("err")) //抓取錯誤 + if (archiveJsonResult.ContainsKey("err")) //抓取錯誤 { //logger.LogError("【ArchiveElectricMeterDayJob】【月歸檔】【取得資料失敗】"); //logger.LogError("【ArchiveElectricMeterDayJob】【月歸檔】【取得資料失敗】[錯誤內容]：{0}", archiveMonthJsonResult); @@ -985,7 +1023,7 @@ namespace BackendWorkerService.Quartz.Jobs archiveMonthRawData.Add("@end_timestamp", endTimestamp.Replace("T", " ").Substring(0, 19)); archiveMonthRawData.Add("@is_complete", 0); archiveMonthRawData.Add("@repeat_times", 0); - archiveMonthRawData.Add("@fail_reason", archiveMonthJson); + archiveMonthRawData.Add("@fail_reason", archiveJson); archiveMonthRawData.Add("@count_rawdata", 0); archiveMonthRawData.Add("@min_rawdata", 0); @@ -997,9 +1035,9 @@ namespace BackendWorkerService.Quartz.Jobs electricArchiveMonthRawDatas.Add(archiveMonthRawData); } - if (archiveMonthJsonResult.ContainsKey("obj")) //表示可以讀取到內容 + if (archiveJsonResult.ContainsKey("obj")) //表示可以讀取到內容 { - var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveMonthJsonResult); + var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveJsonResult); if (ArrangeRawDatas != null && ArrangeRawDatas.Count() > 0) { electricArchiveMonthRawDatas.AddRange(ArrangeRawDatas); @@ -1008,26 +1046,29 @@ namespace BackendWorkerService.Quartz.Jobs } foreach (var deviceNumberPoint in waterDeviceNumberPoints) { - HttpWebRequest archiveMonthRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); + archiveRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); //HttpWebRequest archiveMonthRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); - archiveMonthRequest.Method = "POST"; - archiveMonthRequest.Headers.Add("Authorization", "Basic " + encoded); - archiveMonthRequest.PreAuthenticate = true; + archiveRequest.Method = "POST"; + archiveRequest.Headers.Add("Authorization", "Basic " + encoded); + archiveRequest.PreAuthenticate = true; + archiveRequest.Timeout = 3000; byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); - using (Stream reqStream = archiveMonthRequest.GetRequestStream()) + using (Stream reqStream = archiveRequest.GetRequestStream()) { reqStream.Write(byteArray, 0, byteArray.Length); } - HttpWebResponse archiveMonthResponse = (HttpWebResponse)archiveMonthRequest.GetResponse(); - var archiveMonthResponseContent = new StreamReader(archiveMonthResponse.GetResponseStream()).ReadToEnd(); + archiveResponse = (HttpWebResponse)archiveRequest.GetResponse(); + archiveResponseContent = new StreamReader(archiveResponse.GetResponseStream()).ReadToEnd(); + archiveResponse.Dispose(); + archiveResponse.Close(); - xmlDocument.LoadXml(archiveMonthResponseContent); - string archiveMonthJson = JsonConvert.SerializeXmlNode(xmlDocument); - JObject archiveMonthJsonResult = (JObject)JsonConvert.DeserializeObject(archiveMonthJson); + xmlDocument.LoadXml(archiveResponseContent); + archiveJson = JsonConvert.SerializeXmlNode(xmlDocument); + archiveJsonResult = (JObject)JsonConvert.DeserializeObject(archiveJson); - if (archiveMonthJsonResult.ContainsKey("err")) //抓取錯誤 + if (archiveJsonResult.ContainsKey("err")) //抓取錯誤 { //logger.LogError("【ArchiveElectricMeterDayJob】【月歸檔】【取得資料失敗】"); //logger.LogError("【ArchiveElectricMeterDayJob】【月歸檔】【取得資料失敗】[錯誤內容]：{0}", archiveMonthJsonResult); @@ -1039,7 +1080,7 @@ namespace BackendWorkerService.Quartz.Jobs archiveMonthRawData.Add("@end_timestamp", endTimestamp.Replace("T", " ").Substring(0, 19)); archiveMonthRawData.Add("@is_complete", 0); archiveMonthRawData.Add("@repeat_times", 0); - archiveMonthRawData.Add("@fail_reason", archiveMonthJson); + archiveMonthRawData.Add("@fail_reason", archiveJson); archiveMonthRawData.Add("@count_rawdata", 0); archiveMonthRawData.Add("@min_rawdata", 0); @@ -1051,9 +1092,9 @@ namespace BackendWorkerService.Quartz.Jobs waterArchiveMonthRawDatas.Add(archiveMonthRawData); } - if (archiveMonthJsonResult.ContainsKey("obj")) //表示可以讀取到內容 + if (archiveJsonResult.ContainsKey("obj")) //表示可以讀取到內容 { - var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveMonthJsonResult); + var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveJsonResult); if (ArrangeRawDatas != null && ArrangeRawDatas.Count() > 0) { waterArchiveMonthRawDatas.AddRange(ArrangeRawDatas); @@ -1268,6 +1309,14 @@ namespace BackendWorkerService.Quartz.Jobs logger.LogError("【ArchiveElectricMeterDayJob】【月歸檔】【任務失敗】"); logger.LogError("【ArchiveElectricMeterDayJob】【月歸檔】【任務失敗】[Exception]：{0}", exception.ToString()); } + finally + { + if (archiveResponse != null) + { + archiveResponse.Dispose(); + archiveResponse.Close(); + } + } } #endregion 月歸檔 @@ -1277,7 +1326,7 @@ namespace BackendWorkerService.Quartz.Jobs { try { - await task_Detail.InsertWorkTime("ArchiveElectricMeterDayJob", "Compensate", "任務開始"); + await task_Detail.InsertWorkTime("ArchiveElectricMeterDayJob", "Compensate", "補償機制任務開始"); ProcEletricMeterService procEletricMeterService = new ProcEletricMeterService(backgroundServiceRepository, backgroundServiceMsSqlRepository); await procEletricMeterService.ArchiveData(); await task_Detail.InsertWorkTime_End("ArchiveElectricMeterDayJob", "Compensate", "任務完成"); diff --git a/Frontend/_alert.html b/Frontend/_alert.html index 496f2d5..e66ffa3 100644 --- a/Frontend/_alert.html +++ b/Frontend/_alert.html @@ -875,7 +875,7 @@ { "title": "設備名稱", "data": "sourceName_zh", - render: (data) => { + "render" : function (data) { return allDevices.find(d => d.device_number === data)?.full_name || "" } }, From 56e18cc5a1a0e70f3ccd83ebf5a1cc8952223a82 Mon Sep 17 00:00:00 2001 From: dev01 Date: Wed, 7 Jun 2023 14:02:38 +0800 Subject: [PATCH 09/21] =?UTF-8?q?[=E5=89=8D=E5=8F=B0]=20notice=20=E5=91=8A?= =?UTF-8?q?=E8=AD=A6=E5=8D=A1=E7=89=87=E7=A8=8B=E5=BA=8F=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Frontend/js/yourteam/plugins/yt-notice/yt-notice.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Frontend/js/yourteam/plugins/yt-notice/yt-notice.js b/Frontend/js/yourteam/plugins/yt-notice/yt-notice.js index 216c6b9..8114493 100644 --- a/Frontend/js/yourteam/plugins/yt-notice/yt-notice.js +++ b/Frontend/js/yourteam/plugins/yt-notice/yt-notice.js @@ -190,7 +190,7 @@ class YTNoticeBlock { checkCanShow = function (notice = null) { let lastNoticeOffset = $(this.noticeContainer).find(".toast").last().offset(); if ($(this.noticeContainer).find(".toast").last().length == 0) { - return true; + return notice.canShow; } if ($(notice.obj.container).is(":visible")) { From c969c24469689a763f36f7bcabbc4fcb891a5411 Mon Sep 17 00:00:00 2001 From: dev02 Date: Wed, 7 Jun 2023 16:45:00 +0800 Subject: [PATCH 10/21] =?UTF-8?q?[=E5=90=8E=E5=8F=B0]=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8E=92=E7=A8=8B,=20=E8=B3=87=E6=96=99=E5=B0=8D=E6=AF=94?= =?UTF-8?q?=E9=8C=AF=E8=AA=A4,=20json=E5=A2=9E=E5=8A=A0mcut=E8=B3=87?= =?UTF-8?q?=E6=96=99=E5=BA=AB=E9=80=A3=E7=B6=AB=20[=E5=89=8D=E5=8F=B0]=20?= =?UTF-8?q?=E5=BE=8C=E7=AB=AF=E4=BF=AE=E6=94=B9emergencydevice=20api,=20em?= =?UTF-8?q?ergencydevice=20model,=20json=E5=A2=9E=E5=8A=A0mcut=E8=B3=87?= =?UTF-8?q?=E6=96=99=E5=BA=AB=E9=80=A3=E7=B6=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Quartz/Jobs/ArchiveElectricMeterDayJob.cs | 43 ++++++++++--------- .../appsettings.Development.json | 3 +- BackendWorkerService/appsettings.json | 3 +- .../EmergencyDeviceController.cs | 22 +++++++--- FrontendWebApi/Models/EmergencyDevice.cs | 2 +- FrontendWebApi/appsettings.Development.json | 4 +- 6 files changed, 46 insertions(+), 31 deletions(-) diff --git a/BackendWorkerService/Quartz/Jobs/ArchiveElectricMeterDayJob.cs b/BackendWorkerService/Quartz/Jobs/ArchiveElectricMeterDayJob.cs index cdfeb09..7874268 100644 --- a/BackendWorkerService/Quartz/Jobs/ArchiveElectricMeterDayJob.cs +++ b/BackendWorkerService/Quartz/Jobs/ArchiveElectricMeterDayJob.cs @@ -87,12 +87,15 @@ namespace BackendWorkerService.Quartz.Jobs { foreach (var point in electricPoints) { - DeviceNumberPoint deviceNumberPoint = new DeviceNumberPoint(); - deviceNumberPoint.DeviceNumber = electricMeter.Device_number; - deviceNumberPoint.Point = point.points; - deviceNumberPoint.FullDeviceNumberPoint = string.Format("{0}_{1}", electricMeter.Device_number, point.points); + if (electricMeter.device_building_tag == point.device_building_tag) + { + DeviceNumberPoint deviceNumberPoint = new DeviceNumberPoint(); + deviceNumberPoint.DeviceNumber = electricMeter.Device_number; + deviceNumberPoint.Point = point.points; + deviceNumberPoint.FullDeviceNumberPoint = string.Format("{0}_{1}", electricMeter.Device_number, point.points); - electricDeviceNumberPoints.Add(deviceNumberPoint); + electricDeviceNumberPoints.Add(deviceNumberPoint); + } } } #endregion 組合出所有電錶設備點位 @@ -102,12 +105,15 @@ namespace BackendWorkerService.Quartz.Jobs { foreach (var point in waterPoints) { - DeviceNumberPoint deviceNumberPoint = new DeviceNumberPoint(); - deviceNumberPoint.DeviceNumber = waterMeter.Device_number; - deviceNumberPoint.Point = point.points; - deviceNumberPoint.FullDeviceNumberPoint = string.Format("{0}_{1}", waterMeter.Device_number, point.points); + if (waterMeter.device_building_tag == point.device_building_tag) + { + DeviceNumberPoint deviceNumberPoint = new DeviceNumberPoint(); + deviceNumberPoint.DeviceNumber = waterMeter.Device_number; + deviceNumberPoint.Point = point.points; + deviceNumberPoint.FullDeviceNumberPoint = string.Format("{0}_{1}", waterMeter.Device_number, point.points); - waterDeviceNumberPoints.Add(deviceNumberPoint); + waterDeviceNumberPoints.Add(deviceNumberPoint); + } } } #endregion 組合出所有電錶設備點位 @@ -159,7 +165,6 @@ namespace BackendWorkerService.Quartz.Jobs archiveRequest.Method = "POST"; archiveRequest.Headers.Add("Authorization", "Basic " + encoded); archiveRequest.PreAuthenticate = true; - archiveRequest.Timeout = 3000; byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); using (Stream reqStream = archiveRequest.GetRequestStream()) @@ -171,7 +176,7 @@ namespace BackendWorkerService.Quartz.Jobs archiveResponseContent = new StreamReader(archiveResponse.GetResponseStream()).ReadToEnd(); archiveResponse.Dispose(); archiveResponse.Close(); - + xmlDocument.LoadXml(archiveResponseContent); archiveJson = JsonConvert.SerializeXmlNode(xmlDocument); archiveJsonResult = (JObject)JsonConvert.DeserializeObject(archiveJson); @@ -217,7 +222,7 @@ namespace BackendWorkerService.Quartz.Jobs archiveRequest.Method = "POST"; archiveRequest.Headers.Add("Authorization", "Basic " + encoded); archiveRequest.PreAuthenticate = true; - archiveRequest.Timeout = 3000; + byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); using (Stream reqStream = archiveRequest.GetRequestStream()) @@ -628,7 +633,7 @@ namespace BackendWorkerService.Quartz.Jobs archiveRequest.Method = "POST"; archiveRequest.Headers.Add("Authorization", "Basic " + encoded); archiveRequest.PreAuthenticate = true; - archiveRequest.Timeout = 3000; + byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); using (Stream reqStream = archiveRequest.GetRequestStream()) @@ -685,8 +690,7 @@ namespace BackendWorkerService.Quartz.Jobs archiveRequest.Method = "POST"; archiveRequest.Headers.Add("Authorization", "Basic " + encoded); archiveRequest.PreAuthenticate = true; - archiveRequest.Timeout = 3000; - + byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); using (Stream reqStream = archiveRequest.GetRequestStream()) { @@ -994,14 +998,13 @@ namespace BackendWorkerService.Quartz.Jobs archiveRequest.Method = "POST"; archiveRequest.Headers.Add("Authorization", "Basic " + encoded); archiveRequest.PreAuthenticate = true; - archiveRequest.Timeout = 3000; - + byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); using (Stream reqStream = archiveRequest.GetRequestStream()) { reqStream.Write(byteArray, 0, byteArray.Length); } - + archiveResponse = (HttpWebResponse)archiveRequest.GetResponse(); archiveResponseContent = new StreamReader(archiveResponse.GetResponseStream()).ReadToEnd(); archiveResponse.Dispose(); @@ -1051,7 +1054,7 @@ namespace BackendWorkerService.Quartz.Jobs archiveRequest.Method = "POST"; archiveRequest.Headers.Add("Authorization", "Basic " + encoded); archiveRequest.PreAuthenticate = true; - archiveRequest.Timeout = 3000; + byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); using (Stream reqStream = archiveRequest.GetRequestStream()) diff --git a/BackendWorkerService/appsettings.Development.json b/BackendWorkerService/appsettings.Development.json index 8620376..b4569f6 100644 --- a/BackendWorkerService/appsettings.Development.json +++ b/BackendWorkerService/appsettings.Development.json @@ -23,8 +23,9 @@ "Port": "js2LutKe+rdjzdxMPQUrvQ==", //"Database": "VJB2XC+lAtzuHObDGMVOAA==", //30 //"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp - "Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome + //"Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome //"Database": "siTUcDaC/g2yGTMFWD72Kg==", //tpe_dome_hotel + "Database": "Rq7Gn4x6LwBvVtl7GY8LbA==", //mcut "Root": "SzdxEgaJJ7tcTCrUl2zKsA==", "Password": "FVAPxztxpY4gJJKQ/se4bQ==" }, diff --git a/BackendWorkerService/appsettings.json b/BackendWorkerService/appsettings.json index 8620376..b4569f6 100644 --- a/BackendWorkerService/appsettings.json +++ b/BackendWorkerService/appsettings.json @@ -23,8 +23,9 @@ "Port": "js2LutKe+rdjzdxMPQUrvQ==", //"Database": "VJB2XC+lAtzuHObDGMVOAA==", //30 //"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp - "Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome + //"Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome //"Database": "siTUcDaC/g2yGTMFWD72Kg==", //tpe_dome_hotel + "Database": "Rq7Gn4x6LwBvVtl7GY8LbA==", //mcut "Root": "SzdxEgaJJ7tcTCrUl2zKsA==", "Password": "FVAPxztxpY4gJJKQ/se4bQ==" }, diff --git a/FrontendWebApi/ApiControllers/EmergencyDeviceController.cs b/FrontendWebApi/ApiControllers/EmergencyDeviceController.cs index c294721..0ba06f1 100644 --- a/FrontendWebApi/ApiControllers/EmergencyDeviceController.cs +++ b/FrontendWebApi/ApiControllers/EmergencyDeviceController.cs @@ -108,7 +108,7 @@ namespace FrontendWebApi.ApiControllers [HttpPost] [Route("api/EmergencyDevice")] - public async Task>>> EmergencyDevice(selectdevice selectdevice) + public async Task>>> EmergencyDevice([FromBody] selectdevice selectdevice) { ApiResult> apiResult = new ApiResult>(); if (!jwtlife) @@ -120,6 +120,16 @@ namespace FrontendWebApi.ApiControllers try { + string deviceQue = ""; + string disasQue = ""; + if (selectdevice.selectbuilding != null && selectdevice.selectbuilding.Count > 0) + deviceQue += $" AND d.device_building_tag in @building_tag "; + if (selectdevice.select_Floors != null && selectdevice.select_Floors.Count > 0) + deviceQue += $" AND d.device_floor_tag in @floor "; + if (selectdevice.select_Layer3 != null && selectdevice.select_Layer3.Count > 0) + deviceQue += $" AND d.device_name_tag IN @layer3 "; + if (selectdevice.select_disasters != null && selectdevice.select_disasters.Count > 0) + disasQue = " where dd.device_system_value IN @disasters "; var sqlString = @$"select d.device_guid, @@ -140,9 +150,8 @@ namespace FrontendWebApi.ApiControllers (SELECT * FROM device d WHERE d.deleted = 0 - AND d.device_building_tag = '{selectdevice.selectbuilding}' - AND d.device_floor_tag in @floor - AND d.device_name_tag IN @layer3) d + {deviceQue} + ) d left join floor on floor.full_name = d.device_floor_tag and floor.building_tag = d.device_building_tag left join ( SELECT @@ -158,10 +167,11 @@ namespace FrontendWebApi.ApiControllers left join device_disaster dd on dd.device_guid = d.device_guid left join (select * from variable v where v.system_type = 'disaster') ddd on ddd.system_value = dd.device_system_value LEFT JOIN building b ON b.deleted = 0 AND d.device_building_tag = b.building_tag - where dd.device_system_value IN @disasters + {disasQue} ORDER BY d.device_number "; - Variable = await backendRepository.GetAllAsync(sqlString, new { disasters= selectdevice.select_disasters, floor = selectdevice.select_Floors, layer3 = selectdevice.select_Layer3 }); + Variable = await backendRepository.GetAllAsync(sqlString, new { disasters= selectdevice.select_disasters, building_tag = selectdevice.selectbuilding, + floor = selectdevice.select_Floors, layer3 = selectdevice.select_Layer3 }); apiResult.Code = "0000"; apiResult.Data = Variable; diff --git a/FrontendWebApi/Models/EmergencyDevice.cs b/FrontendWebApi/Models/EmergencyDevice.cs index 9d72d50..fe5c076 100644 --- a/FrontendWebApi/Models/EmergencyDevice.cs +++ b/FrontendWebApi/Models/EmergencyDevice.cs @@ -106,7 +106,7 @@ namespace FrontendWebApi.Models public class selectdevice { public List select_disasters { get; set; } - public string selectbuilding { get; set; } + public List selectbuilding { get; set; } public List select_Floors { get; set; } public List select_Layer3 { get; set; } } diff --git a/FrontendWebApi/appsettings.Development.json b/FrontendWebApi/appsettings.Development.json index b87a385..f976969 100644 --- a/FrontendWebApi/appsettings.Development.json +++ b/FrontendWebApi/appsettings.Development.json @@ -18,10 +18,10 @@ "Port": "js2LutKe+rdjzdxMPQUrvQ==", //"Database": "VJB2XC+lAtzuHObDGMVOAA==", //30 //"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp - //"Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome + "Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome //"Database": "siTUcDaC/g2yGTMFWD72Kg==", //tpe_dome_hotel //"Database": "iuaY0h0+TWkir44/eZLDqw==", //tpe_dome_office - "Database": "Rq7Gn4x6LwBvVtl7GY8LbA==", //MCUT + //"Database": "Rq7Gn4x6LwBvVtl7GY8LbA==", //MCUT "Root": "SzdxEgaJJ7tcTCrUl2zKsA==", "Password": "FVAPxztxpY4gJJKQ/se4bQ==" } From b110151c8e6a2311ccb083a260898daa65f72628 Mon Sep 17 00:00:00 2001 From: dev02 Date: Wed, 7 Jun 2023 16:54:16 +0800 Subject: [PATCH 11/21] =?UTF-8?q?[=E5=BE=8C=E5=8F=B0]=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?buildinfo=20api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Backend/Controllers/BuildInfoController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Backend/Controllers/BuildInfoController.cs b/Backend/Controllers/BuildInfoController.cs index 24faf5b..c03565a 100644 --- a/Backend/Controllers/BuildInfoController.cs +++ b/Backend/Controllers/BuildInfoController.cs @@ -429,7 +429,7 @@ namespace Backend.Controllers try { - var sqlString = @$"SELECT A.floor_guid, A.full_name, InitMapName + '.svg' AS 'initMapName', A.priority, A.created_at + var sqlString = @$"SELECT A.floor_guid, A.full_name, CONCAT(InitMapName, '.svg') AS 'initMapName', A.priority, A.created_at FROM floor A WHERE deleted = @deleted AND A.building_tag = @building_tag From f1f366aae8980943756a4eabcbba31ea756e4a83 Mon Sep 17 00:00:00 2001 From: dev01 Date: Wed, 7 Jun 2023 17:12:22 +0800 Subject: [PATCH 12/21] =?UTF-8?q?[=E5=BE=8C=E5=8F=B0][=E7=B7=8A=E6=80=A5?= =?UTF-8?q?=E6=87=89=E8=AE=8A]=20=E7=A1=AC=E9=AB=94=E6=B8=85=E5=96=AE?= =?UTF-8?q?=E9=81=B8=E5=96=AE=E5=A2=9E=E5=8A=A0=20|=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=A1=AC=E9=AB=94=E6=B8=85=E5=96=AE=E6=AC=8A=E9=99=90=20|=20?= =?UTF-8?q?=E7=A1=AC=E9=AB=94=E6=B8=85=E5=96=AE=E5=89=8D=E7=AB=AF=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E5=8F=8A=E4=BB=8B=E9=9D=A2=E8=AA=BF=E6=95=B4=20|=20?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=B8=85=E5=96=AE=E5=89=8D=E7=AB=AF=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E5=8F=8A=E4=BB=8B=E9=9D=A2=E8=AA=BF=E6=95=B4=20|=20?= =?UTF-8?q?=E5=B7=A6=E9=82=8A=E9=81=B8=E5=96=AE=E9=A0=86=E5=BA=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../18991846-0586-4710-9178-593c7ba336d3.svg | 1393 ++++++++++++ .../EmergencyHardwareMenuController.cs | 24 + .../Views/EmergencyContact/Index.cshtml | 2 +- .../Views/EmergencyDeviceMenu/Index.cshtml | 307 +-- .../Views/EmergencyHardwareMenu/Index.cshtml | 1950 +++++++++++++++++ .../Views/EmergencyRecord/Index.cshtml | 2 +- FrontendWebApi/Views/RescueDevice/AED.cshtml | 2 +- .../RescueDevice/FireExtinguisher.cshtml | 2 +- FrontendWebApi/Views/Shared/_Layout.cshtml | 20 +- FrontendWebApi/appsettings.Development.json | 4 +- FrontendWebApi/appsettings.json | 5 +- 11 files changed, 3564 insertions(+), 147 deletions(-) create mode 100644 Backend/wwwroot/upload/floor_map/18991846-0586-4710-9178-593c7ba336d3.svg create mode 100644 FrontendWebApi/Controllers/EmergencyHardwareMenuController.cs create mode 100644 FrontendWebApi/Views/EmergencyHardwareMenu/Index.cshtml diff --git a/Backend/wwwroot/upload/floor_map/18991846-0586-4710-9178-593c7ba336d3.svg b/Backend/wwwroot/upload/floor_map/18991846-0586-4710-9178-593c7ba336d3.svg new file mode 100644 index 0000000..34d11ed --- /dev/null +++ b/Backend/wwwroot/upload/floor_map/18991846-0586-4710-9178-593c7ba336d3.svg @@ -0,0 +1,1393 @@ + + + + diff --git a/FrontendWebApi/Controllers/EmergencyHardwareMenuController.cs b/FrontendWebApi/Controllers/EmergencyHardwareMenuController.cs new file mode 100644 index 0000000..6136b1c --- /dev/null +++ b/FrontendWebApi/Controllers/EmergencyHardwareMenuController.cs @@ -0,0 +1,24 @@ +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace FrontendWebApi.Controllers +{ + public class EmergencyHardwareMenuController : MyBaseController + { + private readonly ILogger _logger; + + public EmergencyHardwareMenuController(ILogger logger) + { + _logger = logger; + } + + public IActionResult Index() + { + return View(); + } + } +} diff --git a/FrontendWebApi/Views/EmergencyContact/Index.cshtml b/FrontendWebApi/Views/EmergencyContact/Index.cshtml index c7e06aa..0a05b26 100644 --- a/FrontendWebApi/Views/EmergencyContact/Index.cshtml +++ b/FrontendWebApi/Views/EmergencyContact/Index.cshtml @@ -1,6 +1,6 @@ @{ ViewData["MainNum"] = "4"; - ViewData["SubNum"] = "2"; + ViewData["SubNum"] = "3"; ViewData["Title"] = "聯絡清單"; } diff --git a/FrontendWebApi/Views/EmergencyDeviceMenu/Index.cshtml b/FrontendWebApi/Views/EmergencyDeviceMenu/Index.cshtml index 9aa1481..2f8519a 100644 --- a/FrontendWebApi/Views/EmergencyDeviceMenu/Index.cshtml +++ b/FrontendWebApi/Views/EmergencyDeviceMenu/Index.cshtml @@ -15,23 +15,28 @@
-
+ @*
顯示類型
-
+
*@
防災類別
-
防災類別
+
防災類別 + +
+
+ +
-
棟別
+
棟別
棟別
-
+ @*
樓層
棟別
@@ -42,7 +47,7 @@
設備小類
設備大類
-
+
*@
@@ -322,7 +327,7 @@ temp_alarm_device = []; //暫存所有的報警設備 var backfill_building_device_amount = [], backfill_layer2_device_amount = [], backfill_layer3_device_amount = []; var backfill_building_alarm_device_amount = [], backfill_layer2_alarm_device_amount = [], backfill_layer3_alarm_device_amount = []; - var select_all_disaster = false, select_all_floor = false, + var select_all_disaster = false, select_all_floor = false,select_all_building = false, select_all_layer2 = false, select_all_layer3 = false; var changeBuilding = ""; @@ -340,7 +345,7 @@ var SelectedFilter = { disasters: [], - building_tag: '', + building_tag: [], floor_guids: [], layer2: [], layer3: [] @@ -890,7 +895,7 @@ SelectedFilter.disasters.push(disaster); $(e).removeClass('btn-outline-success').addClass('btn-success'); } - + is_need_reload = true; ChangeFilterBuilding(); UpdateDeviceAmount(); @@ -925,11 +930,11 @@
`;*@ html += `
- - + +
`; }); - + $('#building').append(``); $('#building').append(html); $('#building').find('div').first().click(); @@ -940,6 +945,7 @@ html += ''; }); + $('#building').append(``); $('#building').append(html); $('#building').find('button').first().click(); @@ -948,51 +954,71 @@ } //#endregion + //#region 計算現有勾選棟別 + function resetCalSelectBuilding(){ + SelectedFilter.building_tag = []; + $('#building').find('button.btn-success').each((index,ele) => { + let ele_building_tag = $(ele).data("tag"); + if(SelectedFilter.building_tag.indexOf(ele_building_tag) == -1){ + SelectedFilter.building_tag.push(ele_building_tag); + } + }) + console.log(SelectedFilter.building_tag) + } + //#endregion + //#region 選擇棟別 function SelectBuilding(building_tag, e) { - $('#building').find('button').removeClass('btn-success').addClass('btn-secondary') + //$('#building').find('button').removeClass('btn-success').addClass('btn-secondary') - SelectedFilter.building_tag = building_tag; + if (show_mode == 'alarm') { - $(e).find('button').addClass('btn-success'); + if($(e).find("button.btn-success").length > 0){ + $(e).find('button').removeClass('btn-success').addClass('btn-secondary'); + } else { + $(e).find('button').removeClass('btn-secondary').addClass('btn-success'); + } } else { $(e).addClass('btn-success'); } + resetCalSelectBuilding(); + is_need_reload = true; ChangeFilterFloor(); UpdateDeviceAmount(); + ResetDeviceTable(); @*console.log("SelectedFilter", SelectedFilter);*@ } //#endregion //#region 修改過濾條件(樓層) function ChangeFilterFloor() { - temp_all_floor = []; - all_device_group.forEach(function (disaster, disaster_index) { - if (SelectedFilter.disasters.findIndex(x => x == disaster.value) > -1) { //抓取已選擇的防災類型的棟別內容 - disaster.groupBuildings.forEach(function (building, building_index) { - if (building.tag == SelectedFilter.building_tag) { //抓取選擇棟別的底下樓層 - building.groupFloors.forEach(function (floor, floor_index) { - if (temp_all_floor.findIndex(x => x.name == floor.name) < 0) { //表示未加入，需加入 - temp_all_floor.push(floor); - } - }); - } - }); - } - }); + //temp_all_floor = []; + //all_device_group.forEach(function (disaster, disaster_index) { + // if (SelectedFilter.disasters.findIndex(x => x == disaster.value) > -1) { //抓取已選擇的防災類型的棟別內容 + // disaster.groupBuildings.forEach(function (building, building_index) { + // if (building.tag == SelectedFilter.building_tag) { //抓取選擇棟別的底下樓層 + // building.groupFloors.forEach(function (floor, floor_index) { + // if (temp_all_floor.findIndex(x => x.name == floor.name) < 0) { //表示未加入，需加入 + // temp_all_floor.push(floor); + // } + // }); + // } + // }); + // } + //}); - $("#floors").empty(); - $("#floors").append(``); - var html = ""; - temp_all_floor.forEach(function (floor, floor_index) { - html += ''; - }); - $('#floors').append(html); + //$("#floors").empty(); + //$("#floors").append(``); + //var html = ""; + //temp_all_floor.forEach(function (floor, floor_index) { + // html += ''; + //}); + //$('#floors').append(html); - select_all_floor = false; - $('#floors').find('button').first().click(); + //select_all_floor = false; + //$('#floors').find('button').first().click(); } //#endregion @@ -1041,51 +1067,68 @@ //#region 修改過濾條件(大類) function ChangeFilterLayer2() { - temp_all_layer2 = []; - all_device_group.forEach(function (disaster, disaster_index) { - if (SelectedFilter.disasters.findIndex(x => x == disaster.value) > -1) { //抓取選擇防災類型的底下棟別 - disaster.groupBuildings.forEach(function (building, building_index) { - if (building.tag == SelectedFilter.building_tag) { //抓取選擇棟別的底下樓層 - building.groupFloors.forEach(function (floor, floor_index) { - if (SelectedFilter.floor_guids.findIndex(x => x == floor.name) > -1) { //抓取選擇樓層的底下大類 - floor.groupLayer2s.forEach(function (layer2, layer2_index) { - if (temp_all_layer2.findIndex(x => x.value == layer2.value) < 0) { - temp_all_layer2.push(layer2); - } - }); - } - }); - } - }); - } - }); + //temp_all_layer2 = []; + //all_device_group.forEach(function (disaster, disaster_index) { + // if (SelectedFilter.disasters.findIndex(x => x == disaster.value) > -1) { //抓取選擇防災類型的底下棟別 + // disaster.groupBuildings.forEach(function (building, building_index) { + // if (building.tag == SelectedFilter.building_tag) { //抓取選擇棟別的底下樓層 + // building.groupFloors.forEach(function (floor, floor_index) { + // if (SelectedFilter.floor_guids.findIndex(x => x == floor.name) > -1) { //抓取選擇樓層的底下大類 + // floor.groupLayer2s.forEach(function (layer2, layer2_index) { + // if (temp_all_layer2.findIndex(x => x.value == layer2.value) < 0) { + // temp_all_layer2.push(layer2); + // } + // }); + // } + // }); + // } + // }); + // } + //}); - $("#layer2").empty(); - $("#layer2").append(`
- -
`); - var html = ""; - temp_all_layer2.forEach(function (layer2, layer2_index) { + //$("#layer2").empty(); + //$("#layer2").append(`
+ // + //
`); + //var html = ""; + //temp_all_layer2.forEach(function (layer2, layer2_index) { - var layer2_device_amount = backfill_layer2_device_amount.filter(x => x.value == layer2.value && x.building_tag == SelectedFilter.building_tag)[0]; + // var layer2_device_amount = backfill_layer2_device_amount.filter(x => x.value == layer2.value && x.building_tag == SelectedFilter.building_tag)[0]; - @*html += ` -
- - -
`;*@ + // @*html += ` + //
+ // + // + //
`;*@ - html += ` -
- - -
`; + // html += ` + //
+ // + // + //
`; - }); - $('#layer2').append(html); + //}); + //$('#layer2').append(html); - select_all_layer2 = false; - $('#layer2').find('div').first().click(); + //select_all_layer2 = false; + //$('#layer2').find('div').first().click(); + } + //#endregion + + //#region 全選棟別 + function AllBuilding() { + if (select_all_building) { //全選 -> 取消全選 + select_all_building = false; + $('#building').find('div > button.btn-success').removeClass('btn-success').addClass('btn-secondary'); + } else { //取消全選 -> 全選 + select_all_building = true; + $('#building').find('div > button.btn-secondary').removeClass('btn-secondary').addClass('btn-success'); + } + + resetCalSelectBuilding(); + is_need_reload = true; + UpdateDeviceAmount(); + @*console.log("SelectedFilter", SelectedFilter);*@ } //#endregion @@ -1134,65 +1177,65 @@ //#region 修改過濾條件(小類) function ChangeFilterLayer3() { - temp_all_layer3 = []; - all_device_group.forEach(function (disaster, disaster_index) { - if (SelectedFilter.disasters.findIndex(x => x == disaster.value) > -1) { //抓取選擇防災類型的底下棟別 - disaster.groupBuildings.forEach(function (building, building_index) { - if (building.tag == SelectedFilter.building_tag) { //抓取選擇棟別的底下樓層 - building.groupFloors.forEach(function (floor, floor_index) { - if (SelectedFilter.floor_guids.findIndex(x => x == floor.name) > -1) { //抓取選擇樓層的底下大類 - floor.groupLayer2s.forEach(function (layer2, layer2_index) { - if (SelectedFilter.layer2.findIndex(x => x == layer2.value) > -1) { //抓取選擇大類的底下小類 - layer2.groupLayer3s.forEach(function (layer3, layer3_index) { - var new_layer3 = { - name: layer3.name, - value: layer3.value, - device_amount: layer3.device_amount - } + //temp_all_layer3 = []; + //all_device_group.forEach(function (disaster, disaster_index) { + // if (SelectedFilter.disasters.findIndex(x => x == disaster.value) > -1) { //抓取選擇防災類型的底下棟別 + // disaster.groupBuildings.forEach(function (building, building_index) { + // if (building.tag == SelectedFilter.building_tag) { //抓取選擇棟別的底下樓層 + // building.groupFloors.forEach(function (floor, floor_index) { + // if (SelectedFilter.floor_guids.findIndex(x => x == floor.name) > -1) { //抓取選擇樓層的底下大類 + // floor.groupLayer2s.forEach(function (layer2, layer2_index) { + // if (SelectedFilter.layer2.findIndex(x => x == layer2.value) > -1) { //抓取選擇大類的底下小類 + // layer2.groupLayer3s.forEach(function (layer3, layer3_index) { + // var new_layer3 = { + // name: layer3.name, + // value: layer3.value, + // device_amount: layer3.device_amount + // } - var temp_device_amount = new_layer3.device_amount; - var temp_layer3_index = temp_all_layer3.findIndex(x => x.value == layer3.value); - if (temp_layer3_index < 0) { - temp_all_layer3.push(new_layer3); - } else { - temp_all_layer3[temp_layer3_index].device_amount += temp_device_amount; - } - }); - } - }); - } - }); - } - }); - } - }); + // var temp_device_amount = new_layer3.device_amount; + // var temp_layer3_index = temp_all_layer3.findIndex(x => x.value == layer3.value); + // if (temp_layer3_index < 0) { + // temp_all_layer3.push(new_layer3); + // } else { + // temp_all_layer3[temp_layer3_index].device_amount += temp_device_amount; + // } + // }); + // } + // }); + // } + // }); + // } + // }); + // } + //}); - $("#layer3").empty(); - $("#layer3").append(`
- -
`); - var html = ""; - temp_all_layer3.forEach(function (layer3, layer3_index) { + //$("#layer3").empty(); + //$("#layer3").append(`
+ // + //
`); + //var html = ""; + //temp_all_layer3.forEach(function (layer3, layer3_index) { - var layer3_device_amount = backfill_layer3_device_amount.filter(x => x.layer3 == layer3.value && x.building_tag == SelectedFilter.building_tag)[0]; + // var layer3_device_amount = backfill_layer3_device_amount.filter(x => x.layer3 == layer3.value && x.building_tag == SelectedFilter.building_tag)[0]; - @*html += ` -
- - -
`;*@ + // @*html += ` + //
+ // + // + //
`;*@ - html += ` -
- - -
`; - }); + // html += ` + //
+ // + // + //
`; + //}); - $('#layer3').append(html); + //$('#layer3').append(html); - select_all_layer3 = false; - $('#layer3').find('div').first().click(); + //select_all_layer3 = false; + //$('#layer3').find('div').first().click(); } //#endregion @@ -1241,9 +1284,7 @@ function ResetDeviceTable() { if ((SelectedFilter.disasters == null || SelectedFilter.disasters.length <= 0) - || (SelectedFilter.building_tag == null || SelectedFilter.building_tag == "") - || (SelectedFilter.floor_guids == null || SelectedFilter.floor_guids.length <= 0) - || (SelectedFilter.layer3 == null || SelectedFilter.layer3.length <= 0) + || (SelectedFilter.building_tag == null || SelectedFilter.building_tag.length <= 0) ) { return; } @@ -1327,7 +1368,7 @@ // de_number = $(e).parent().parent().attr('de-number'); var url = "/api/EmergencyDevice/SaveAndOpenSimulationExercise"; var send_data = { - build: SelectedFilter.building_tag, + build: SelectedFilter.building_tag[0] ?? null, disaster: disaster, type: type, device: guid diff --git a/FrontendWebApi/Views/EmergencyHardwareMenu/Index.cshtml b/FrontendWebApi/Views/EmergencyHardwareMenu/Index.cshtml new file mode 100644 index 0000000..3696639 --- /dev/null +++ b/FrontendWebApi/Views/EmergencyHardwareMenu/Index.cshtml @@ -0,0 +1,1950 @@ +@{ + ViewData["MainNum"] = "4"; + ViewData["SubNum"] = "2"; + ViewData["Title"] = "緊急應變硬體清單"; +} + +
    +
  1. 首頁
    2. +
  2. 緊急應變硬體清單
    3. +
    4. +
+ + +
+
+
+
+ @*
+
顯示類型
+
+ + + +
+
*@ +
+
防災類別
+
防災類別
+
+ +
+
+
+
棟別
+
棟別
+
+
+
樓層
+
棟別
+
+
+
設備大類
+
設備大類
+
+
+
設備小類
+
設備大類
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + +
設備編號設備名稱棟別防災類型設備大類設備小類樓層異常時間功能
+
+
+
+
+
+
+
+
+
+
+
+ + + + + + + +@section Scripts { + +} \ No newline at end of file diff --git a/FrontendWebApi/Views/EmergencyRecord/Index.cshtml b/FrontendWebApi/Views/EmergencyRecord/Index.cshtml index da8cc75..d2ff4f5 100644 --- a/FrontendWebApi/Views/EmergencyRecord/Index.cshtml +++ b/FrontendWebApi/Views/EmergencyRecord/Index.cshtml @@ -1,6 +1,6 @@ @{ ViewData["MainNum"] = "4"; - ViewData["SubNum"] = "3"; + ViewData["SubNum"] = "4"; ViewData["Title"] = "紀錄查詢"; } diff --git a/FrontendWebApi/Views/RescueDevice/AED.cshtml b/FrontendWebApi/Views/RescueDevice/AED.cshtml index 7b5da75..c6c9a4d 100644 --- a/FrontendWebApi/Views/RescueDevice/AED.cshtml +++ b/FrontendWebApi/Views/RescueDevice/AED.cshtml @@ -1,6 +1,6 @@ @{ ViewData["MainNum"] = "4"; - ViewData["SubNum"] = "5"; + ViewData["SubNum"] = "6"; ViewData["Title"] = "AED裝置設定"; } diff --git a/FrontendWebApi/Views/RescueDevice/FireExtinguisher.cshtml b/FrontendWebApi/Views/RescueDevice/FireExtinguisher.cshtml index 0522ce3..ed119da 100644 --- a/FrontendWebApi/Views/RescueDevice/FireExtinguisher.cshtml +++ b/FrontendWebApi/Views/RescueDevice/FireExtinguisher.cshtml @@ -1,6 +1,6 @@ @{ ViewData["MainNum"] = "4"; - ViewData["SubNum"] = "4"; + ViewData["SubNum"] = "5"; ViewData["Title"] = "滅火器設定"; } diff --git a/FrontendWebApi/Views/Shared/_Layout.cshtml b/FrontendWebApi/Views/Shared/_Layout.cshtml index 4b18cd6..7e85354 100644 --- a/FrontendWebApi/Views/Shared/_Layout.cshtml +++ b/FrontendWebApi/Views/Shared/_Layout.cshtml @@ -89,14 +89,22 @@ @if (ViewBag.role.Contains("EmergencyDeviceMenuIndex")) {
  • - - 設備總覽 + + 事件清單 + +
    • + } + @if (ViewBag.role.Contains("EmergencyHardwareIndex")) + { +
  • + + 緊急應變硬體清單
    • } @if (ViewBag.role.Contains("EmergencyContactIndex")) { -
  • +
  • 聯絡清單 @@ -104,7 +112,7 @@ } @if (ViewBag.role.Contains("EmergencyRecordIndex")) { -
  • +
  • 紀錄查詢 @@ -113,7 +121,7 @@ @if (ViewBag.role.Contains("RescueDeviceFireExtinguisher")) { -
  • +
  • 滅火器設定 @@ -121,7 +129,7 @@ } @if (ViewBag.role.Contains("RescueDeviceAED")) { -
  • +
  • AED裝置設定 diff --git a/FrontendWebApi/appsettings.Development.json b/FrontendWebApi/appsettings.Development.json index b87a385..f976969 100644 --- a/FrontendWebApi/appsettings.Development.json +++ b/FrontendWebApi/appsettings.Development.json @@ -18,10 +18,10 @@ "Port": "js2LutKe+rdjzdxMPQUrvQ==", //"Database": "VJB2XC+lAtzuHObDGMVOAA==", //30 //"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp - //"Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome + "Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome //"Database": "siTUcDaC/g2yGTMFWD72Kg==", //tpe_dome_hotel //"Database": "iuaY0h0+TWkir44/eZLDqw==", //tpe_dome_office - "Database": "Rq7Gn4x6LwBvVtl7GY8LbA==", //MCUT + //"Database": "Rq7Gn4x6LwBvVtl7GY8LbA==", //MCUT "Root": "SzdxEgaJJ7tcTCrUl2zKsA==", "Password": "FVAPxztxpY4gJJKQ/se4bQ==" } diff --git a/FrontendWebApi/appsettings.json b/FrontendWebApi/appsettings.json index 7e6da69..e57bf74 100644 --- a/FrontendWebApi/appsettings.json +++ b/FrontendWebApi/appsettings.json @@ -23,8 +23,9 @@ "Server": "FYlY+w0XDIz+jmF2rlZWJw==", //0.201 "Port": "js2LutKe+rdjzdxMPQUrvQ==", //"Database": "VJB2XC+lAtzuHObDGMVOAA==", //三菱 - "Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp - //"Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome + //"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp + //"Database": "Rq7Gn4x6LwBvVtl7GY8LbA==", //MCUT + "Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome //"Database": "siTUcDaC/g2yGTMFWD72Kg==", //tpe_dome_hotel //"Database": "iuaY0h0+TWkir44/eZLDqw==", //tpe_dome_office "Root": "SzdxEgaJJ7tcTCrUl2zKsA==", From 0bd2d0483dc0d880c002e51a7ddfe702d7913488 Mon Sep 17 00:00:00 2001 From: dev01 Date: Wed, 7 Jun 2023 17:28:35 +0800 Subject: [PATCH 13/21] =?UTF-8?q?[=E5=BE=8C=E5=8F=B0][=E7=B7=8A=E6=80=A5?= =?UTF-8?q?=E6=87=89=E8=AE=8A]=20=E5=8F=AF=E5=A4=9A=E9=81=B8=E6=A3=9F?= =?UTF-8?q?=E5=88=A5=E5=89=8D=E7=AB=AF=E7=A8=8B=E5=BA=8F=E5=8F=8Aapi?= =?UTF-8?q?=E8=AA=BF=E6=95=B4=E4=B8=B2=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FrontendWebApi/ApiControllers/EmergencyDeviceController.cs | 2 +- FrontendWebApi/Views/EmergencyHardwareMenu/Index.cshtml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/FrontendWebApi/ApiControllers/EmergencyDeviceController.cs b/FrontendWebApi/ApiControllers/EmergencyDeviceController.cs index 0ba06f1..5571a65 100644 --- a/FrontendWebApi/ApiControllers/EmergencyDeviceController.cs +++ b/FrontendWebApi/ApiControllers/EmergencyDeviceController.cs @@ -108,7 +108,7 @@ namespace FrontendWebApi.ApiControllers [HttpPost] [Route("api/EmergencyDevice")] - public async Task>>> EmergencyDevice([FromBody] selectdevice selectdevice) + public async Task>>> EmergencyDevice(selectdevice selectdevice) { ApiResult> apiResult = new ApiResult>(); if (!jwtlife) diff --git a/FrontendWebApi/Views/EmergencyHardwareMenu/Index.cshtml b/FrontendWebApi/Views/EmergencyHardwareMenu/Index.cshtml index 3696639..e67fc7e 100644 --- a/FrontendWebApi/Views/EmergencyHardwareMenu/Index.cshtml +++ b/FrontendWebApi/Views/EmergencyHardwareMenu/Index.cshtml @@ -26,9 +26,9 @@
    防災類別
    防災類別
    -
    + @*
    -
    +
    *@
    棟別
    @@ -629,7 +629,7 @@ "type": "POST", "data": function (d) { d.select_disasters = SelectedFilter.disasters; - d.selectbuilding = SelectedFilter.building_tag; + d.selectbuilding = SelectedFilter.building_tag != "" ? [SelectedFilter.building_tag] : []; d.select_Floors = SelectedFilter.floor_guids; d.select_Layer3 = SelectedFilter.layer3; }, From cacab7f20e916ddc7f9da414d243deecb5de29cb Mon Sep 17 00:00:00 2001 From: dev02 Date: Thu, 8 Jun 2023 09:55:44 +0800 Subject: [PATCH 14/21] =?UTF-8?q?[=E5=BE=8C=E5=8F=B0]=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8E=92=E7=A8=8B=E5=95=8F=E9=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Quartz/Jobs/ArchiveElectricMeterDayJob.cs | 40 ++-- .../Implement/ProcEletricMeterService.cs | 208 ++++++++++-------- 2 files changed, 132 insertions(+), 116 deletions(-) diff --git a/BackendWorkerService/Quartz/Jobs/ArchiveElectricMeterDayJob.cs b/BackendWorkerService/Quartz/Jobs/ArchiveElectricMeterDayJob.cs index 7874268..79bc6db 100644 --- a/BackendWorkerService/Quartz/Jobs/ArchiveElectricMeterDayJob.cs +++ b/BackendWorkerService/Quartz/Jobs/ArchiveElectricMeterDayJob.cs @@ -127,7 +127,7 @@ namespace BackendWorkerService.Quartz.Jobs obixApiConfig.ApiBase = variableObix.Where(x => x.Name == "ApiBase").Select(x => x.Value).FirstOrDefault(); obixApiConfig.UserName = ed.AESDecrypt(variableObix.Where(x => x.Name == "UserName").Select(x => x.Value).FirstOrDefault()); obixApiConfig.Password = ed.AESDecrypt(variableObix.Where(x => x.Name == "Password").Select(x => x.Value).FirstOrDefault()); - + var station = await backgroundServiceRepository.GetOneAsync($@"select system_value from variable where system_type = 'obixStatus' and deleted = 0"); String encoded = System.Convert.ToBase64String(System.Text.Encoding.GetEncoding("ISO-8859-1").GetBytes(obixApiConfig.UserName + ":" + obixApiConfig.Password)); #endregion 取得obix 設定 @@ -160,8 +160,8 @@ namespace BackendWorkerService.Quartz.Jobs foreach (var deviceNumberPoint in electricDeviceNumberPoints) { - archiveRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); - //HttpWebRequest archiveDayRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); + archiveRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/{station}/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); + //HttpWebRequest archiveDayRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/{station}/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); archiveRequest.Method = "POST"; archiveRequest.Headers.Add("Authorization", "Basic " + encoded); archiveRequest.PreAuthenticate = true; @@ -176,7 +176,7 @@ namespace BackendWorkerService.Quartz.Jobs archiveResponseContent = new StreamReader(archiveResponse.GetResponseStream()).ReadToEnd(); archiveResponse.Dispose(); archiveResponse.Close(); - + xmlDocument.LoadXml(archiveResponseContent); archiveJson = JsonConvert.SerializeXmlNode(xmlDocument); archiveJsonResult = (JObject)JsonConvert.DeserializeObject(archiveJson); @@ -217,12 +217,12 @@ namespace BackendWorkerService.Quartz.Jobs foreach (var deviceNumberPoint in waterDeviceNumberPoints) { - archiveRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); - //HttpWebRequest archiveDayRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); + archiveRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/{station}/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); + //HttpWebRequest archiveDayRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/{station}/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); archiveRequest.Method = "POST"; archiveRequest.Headers.Add("Authorization", "Basic " + encoded); archiveRequest.PreAuthenticate = true; - + byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); using (Stream reqStream = archiveRequest.GetRequestStream()) @@ -628,12 +628,12 @@ namespace BackendWorkerService.Quartz.Jobs List> waterArchiveWeekRawDatas = new List>(); foreach (var deviceNumberPoint in electricDeviceNumberPoints) { - archiveRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); - //HttpWebRequest archiveWeekRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); + archiveRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/{station}/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); + //HttpWebRequest archiveWeekRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/{station}/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); archiveRequest.Method = "POST"; archiveRequest.Headers.Add("Authorization", "Basic " + encoded); archiveRequest.PreAuthenticate = true; - + byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); using (Stream reqStream = archiveRequest.GetRequestStream()) @@ -685,12 +685,12 @@ namespace BackendWorkerService.Quartz.Jobs } foreach (var deviceNumberPoint in waterDeviceNumberPoints) { - archiveRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); - //HttpWebRequest archiveWeekRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); + archiveRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/{station}/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); + //HttpWebRequest archiveWeekRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/{station}/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); archiveRequest.Method = "POST"; archiveRequest.Headers.Add("Authorization", "Basic " + encoded); archiveRequest.PreAuthenticate = true; - + byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); using (Stream reqStream = archiveRequest.GetRequestStream()) { @@ -993,18 +993,18 @@ namespace BackendWorkerService.Quartz.Jobs List> waterArchiveMonthRawDatas = new List>(); foreach (var deviceNumberPoint in electricDeviceNumberPoints) { - archiveRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); - //HttpWebRequest archiveMonthRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); + archiveRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/{station}/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); + //HttpWebRequest archiveMonthRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/{station}/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); archiveRequest.Method = "POST"; archiveRequest.Headers.Add("Authorization", "Basic " + encoded); archiveRequest.PreAuthenticate = true; - + byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); using (Stream reqStream = archiveRequest.GetRequestStream()) { reqStream.Write(byteArray, 0, byteArray.Length); } - + archiveResponse = (HttpWebResponse)archiveRequest.GetResponse(); archiveResponseContent = new StreamReader(archiveResponse.GetResponseStream()).ReadToEnd(); archiveResponse.Dispose(); @@ -1049,12 +1049,12 @@ namespace BackendWorkerService.Quartz.Jobs } foreach (var deviceNumberPoint in waterDeviceNumberPoints) { - archiveRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); - //HttpWebRequest archiveMonthRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); + archiveRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/{station}/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); + //HttpWebRequest archiveMonthRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/{station}/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); archiveRequest.Method = "POST"; archiveRequest.Headers.Add("Authorization", "Basic " + encoded); archiveRequest.PreAuthenticate = true; - + byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); using (Stream reqStream = archiveRequest.GetRequestStream()) diff --git a/BackendWorkerService/Services/Implement/ProcEletricMeterService.cs b/BackendWorkerService/Services/Implement/ProcEletricMeterService.cs index 8478c30..a574ce1 100644 --- a/BackendWorkerService/Services/Implement/ProcEletricMeterService.cs +++ b/BackendWorkerService/Services/Implement/ProcEletricMeterService.cs @@ -16,6 +16,7 @@ using Repository.Helper; using Repository.BackendRepository.Interface; using Repository.BackendRepository.Implement; using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc.Infrastructure; namespace BackendWorkerService.Services.Implement { @@ -39,6 +40,7 @@ namespace BackendWorkerService.Services.Implement bool result = false; int repeatTimes = 0; string targetTable = string.Empty; + string sql_error_day = string.Empty; EDFunction ed = new EDFunction(); XmlDocument xmlDocument = new XmlDocument(); @@ -61,12 +63,12 @@ namespace BackendWorkerService.Services.Implement obixApiConfig.ApiBase = variableObix.Where(x => x.Name == "ApiBase").Select(x => x.Value).FirstOrDefault(); obixApiConfig.UserName = variableObix.Where(x => x.Name == "UserName").Select(x => x.Value).FirstOrDefault(); obixApiConfig.Password = variableObix.Where(x => x.Name == "Password").Select(x => x.Value).FirstOrDefault(); - + var station = await backgroundServiceRepository.GetOneAsync($@"select system_value from variable where system_type = 'obixStatus' and deleted = 0"); encoded = System.Convert.ToBase64String(System.Text.Encoding.GetEncoding("ISO-8859-1").GetBytes(obixApiConfig.UserName + ":" + obixApiConfig.Password)); #endregion 取得obix 設定 //取得錯誤的設備sql format - var sql_error_format = @"SELECT * FROM {0} WHERE is_complete = 0 AND repeat_times < @RepeatTimes"; + var sql_error_format = @"SELECT * FROM {0} WHERE is_complete = 0 AND repeat_times < @RepeatTimes AND (point = 'KWH' or point = 'RCV')"; //MY 新增/修改sql format var MYsql_update_format = @" @@ -113,7 +115,7 @@ namespace BackendWorkerService.Services.Implement WHERE ROW_COUNT() = 0;"; //新增/修改sql format var sql_update_format = @"BEGIN TRANSACTION; - + UPDATE {0} SET count_rawdata = @count_rawdata, min_rawdata = @min_rawdata, @@ -187,8 +189,8 @@ namespace BackendWorkerService.Services.Implement // // "; - // HttpWebRequest archiveHourRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); - // //HttpWebRequest archiveHourRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); + // HttpWebRequest archiveHourRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/{station}/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); + // //HttpWebRequest archiveHourRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/{station}/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); // archiveHourRequest.Method = "POST"; // archiveHourRequest.Headers.Add("Authorization", "Basic " + encoded); // archiveHourRequest.PreAuthenticate = true; @@ -248,96 +250,110 @@ namespace BackendWorkerService.Services.Implement #endregion 時歸檔補償 #region 天歸檔補償 + string schema = await backgroundServiceRepository.GetOneAsync(@" + select system_value from variable where system_type = 'project_name' and deleted = 0"); //取得所有須補償的設備資訊 - targetTable = "archive_electric_meter_day"; - var sql_error_day = string.Format(sql_error_format, targetTable); - var electric_error_days = await backgroundServiceRepository.GetAllAsync(sql_error_day, new { RepeatTimes = repeatTimes }); - List> electricArchiveDayRawDatas = new List>(); - if (electric_error_days.Count() > 0) + targetTable = await backgroundServiceRepository.GetOneAsync($@" + select table_name + from information_schema.`TABLES` + where TABLE_NAME like 'archive_electric_meter_day%' and TABLE_SCHEMA = '{schema.Split('/')[0]}' + order by TABLE_NAME desc limit 1 "); + if (!string.IsNullOrEmpty(targetTable)) { - foreach (var error_day in electric_error_days) + sql_error_day = string.Format(sql_error_format, targetTable); + var electric_error_days = await backgroundServiceRepository.GetAllAsync(sql_error_day, new { RepeatTimes = repeatTimes }); + List> electricArchiveDayRawDatas = new List>(); + if (electric_error_days.Count() > 0) { - DeviceNumberPoint deviceNumberPoint = new DeviceNumberPoint(); - deviceNumberPoint.DeviceNumber = error_day.Device_number; - deviceNumberPoint.Point = error_day.Point; - deviceNumberPoint.FullDeviceNumberPoint = string.Format("{0}_{1}", error_day.Device_number, error_day.Point); - - var startTimestamp = string.Format("{0}+08:00", error_day.Start_timestamp.Replace(" ", "T")); - var endTimestamp = string.Format("{0}+08:00", error_day.End_timestamp.Replace(" ", "T")); - - var historyQueryFilter = $@" - - - - "; - - HttpWebRequest archiveDayRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); - //HttpWebRequest archiveDayRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); - archiveDayRequest.Method = "POST"; - archiveDayRequest.Headers.Add("Authorization", "Basic " + encoded); - archiveDayRequest.PreAuthenticate = true; - - byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); - using (Stream reqStream = archiveDayRequest.GetRequestStream()) + foreach (var error_day in electric_error_days) { - reqStream.Write(byteArray, 0, byteArray.Length); - } + DeviceNumberPoint deviceNumberPoint = new DeviceNumberPoint(); + deviceNumberPoint.DeviceNumber = error_day.Device_number; + deviceNumberPoint.Point = error_day.Point; + deviceNumberPoint.FullDeviceNumberPoint = string.Format("{0}_{1}", error_day.Device_number, error_day.Point); - HttpWebResponse archiveDayResponse = (HttpWebResponse)archiveDayRequest.GetResponse(); - var archiveDayResponseContent = new StreamReader(archiveDayResponse.GetResponseStream()).ReadToEnd(); + var startTimestamp = string.Format("{0}+08:00", error_day.Start_timestamp.Replace(" ", "T")); + var endTimestamp = string.Format("{0}+08:00", error_day.End_timestamp.Replace(" ", "T")); + var historyQueryFilter = $@" + + + + "; - xmlDocument.LoadXml(archiveDayResponseContent); - string archiveDayJson = JsonConvert.SerializeXmlNode(xmlDocument); - JObject archiveDayJsonResult = (JObject)JsonConvert.DeserializeObject(archiveDayJson); + HttpWebRequest archiveDayRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/{station}/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); + //HttpWebRequest archiveDayRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/{station}/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); + archiveDayRequest.Method = "POST"; + archiveDayRequest.Headers.Add("Authorization", "Basic " + encoded); + archiveDayRequest.PreAuthenticate = true; - if (archiveDayJsonResult.ContainsKey("err")) //抓取錯誤 - { - Dictionary archiveDayRawData = new Dictionary(); - archiveDayRawData.Add("@device_number", error_day.Device_number); - archiveDayRawData.Add("@point", error_day.Point); - archiveDayRawData.Add("@start_timestamp", DateTime.Parse(error_day.Start_timestamp, System.Globalization.CultureInfo.CurrentCulture)); - archiveDayRawData.Add("@end_timestamp", DateTime.Parse(error_day.End_timestamp, System.Globalization.CultureInfo.CurrentCulture)); - archiveDayRawData.Add("@is_complete", 0); - archiveDayRawData.Add("@repeat_times", ++error_day.Repeat_times); - archiveDayRawData.Add("@fail_reason", archiveDayJson); - - archiveDayRawData.Add("@count_rawdata", 0); - archiveDayRawData.Add("@min_rawdata", 0); - archiveDayRawData.Add("@max_rawdata", 0); - archiveDayRawData.Add("@avg_rawdata", 0); - archiveDayRawData.Add("@sum_rawdata", 0); - archiveDayRawData.Add("@updated_at", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")); - - electricArchiveDayRawDatas.Add(archiveDayRawData); - } - - if (archiveDayJsonResult.ContainsKey("obj")) //表示可以讀取到內容 - { - var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveDayJsonResult); - if (ArrangeRawDatas != null && ArrangeRawDatas.Count() > 0) + byte[] byteArray = Encoding.UTF8.GetBytes(historyQueryFilter); + using (Stream reqStream = archiveDayRequest.GetRequestStream()) { - electricArchiveDayRawDatas.AddRange(ArrangeRawDatas); + reqStream.Write(byteArray, 0, byteArray.Length); + } + + HttpWebResponse archiveDayResponse = (HttpWebResponse)archiveDayRequest.GetResponse(); + var archiveDayResponseContent = new StreamReader(archiveDayResponse.GetResponseStream()).ReadToEnd(); + + xmlDocument.LoadXml(archiveDayResponseContent); + string archiveDayJson = JsonConvert.SerializeXmlNode(xmlDocument); + JObject archiveDayJsonResult = (JObject)JsonConvert.DeserializeObject(archiveDayJson); + + if (archiveDayJsonResult.ContainsKey("err")) //抓取錯誤 + { + Dictionary archiveDayRawData = new Dictionary(); + archiveDayRawData.Add("@device_number", error_day.Device_number); + archiveDayRawData.Add("@point", error_day.Point); + archiveDayRawData.Add("@start_timestamp", DateTime.Parse(error_day.Start_timestamp, System.Globalization.CultureInfo.CurrentCulture)); + archiveDayRawData.Add("@end_timestamp", DateTime.Parse(error_day.End_timestamp, System.Globalization.CultureInfo.CurrentCulture)); + archiveDayRawData.Add("@is_complete", 0); + archiveDayRawData.Add("@repeat_times", ++error_day.Repeat_times); + archiveDayRawData.Add("@fail_reason", archiveDayJson); + + archiveDayRawData.Add("@count_rawdata", 0); + archiveDayRawData.Add("@min_rawdata", 0); + archiveDayRawData.Add("@max_rawdata", 0); + archiveDayRawData.Add("@avg_rawdata", 0); + archiveDayRawData.Add("@sum_rawdata", 0); + archiveDayRawData.Add("@updated_at", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")); + + electricArchiveDayRawDatas.Add(archiveDayRawData); + } + + if (archiveDayJsonResult.ContainsKey("obj")) //表示可以讀取到內容 + { + var ArrangeRawDatas = ArrangeRawData(deviceNumberPoint, archiveDayJsonResult); + if (ArrangeRawDatas != null && ArrangeRawDatas.Count() > 0) + { + electricArchiveDayRawDatas.AddRange(ArrangeRawDatas); + } + } + } + + if (electricArchiveDayRawDatas.Count() > 0) + { + var Mysql_error_update = string.Format(MYsql_update_format, targetTable); + var sql_error_update = string.Format(sql_update_format, targetTable); + await backgroundServiceRepository.ExecuteSql(Mysql_error_update, electricArchiveDayRawDatas); + if (!string.IsNullOrEmpty(saveToMSDB) && saveToMSDB == "1") + { + await backgroundServiceMsSqlRepository.ExecuteSql(sql_error_update, electricArchiveDayRawDatas); } } } - - if (electricArchiveDayRawDatas.Count() > 0) - { - var Mysql_error_update = string.Format(MYsql_update_format, targetTable); - var sql_error_update = string.Format(sql_update_format, targetTable); - if (!string.IsNullOrEmpty(saveToMSDB) && saveToMSDB == "1") - { - await backgroundServiceMsSqlRepository.ExecuteSql(sql_error_update, electricArchiveDayRawDatas); - } - await backgroundServiceRepository.ExecuteSql(Mysql_error_update, electricArchiveDayRawDatas); - } } - targetTable = "archive_water_meter_day"; - sql_error_day = string.Format(sql_error_format, targetTable); - var water_error_days = await backgroundServiceRepository.GetAllAsync(sql_error_day, new { RepeatTimes = repeatTimes }); - List> waterArchiveDayRawDatas = new List>(); - if (water_error_days.Count() > 0) + targetTable = await backgroundServiceRepository.GetOneAsync($@" + select table_name + from information_schema.`TABLES` + where TABLE_NAME like 'archive_water_meter_day%' and TABLE_SCHEMA = '{schema.Split('/')[0]}' + order by TABLE_NAME desc limit 1 "); + if (!string.IsNullOrEmpty(targetTable)) + { + sql_error_day = string.Format(sql_error_format, targetTable); + var water_error_days = await backgroundServiceRepository.GetAllAsync(sql_error_day, new { RepeatTimes = repeatTimes }); + List> waterArchiveDayRawDatas = new List>(); + if (water_error_days.Count() > 0) { foreach (var error_day in water_error_days) { @@ -348,15 +364,14 @@ namespace BackendWorkerService.Services.Implement var startTimestamp = string.Format("{0}+08:00", error_day.Start_timestamp.Replace(" ", "T")); var endTimestamp = string.Format("{0}+08:00", error_day.End_timestamp.Replace(" ", "T")); - var historyQueryFilter = $@" "; - HttpWebRequest archiveDayRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); - //HttpWebRequest archiveDayRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); + HttpWebRequest archiveDayRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/{station}/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); + //HttpWebRequest archiveDayRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/{station}/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); archiveDayRequest.Method = "POST"; archiveDayRequest.Headers.Add("Authorization", "Basic " + encoded); archiveDayRequest.PreAuthenticate = true; @@ -416,6 +431,7 @@ namespace BackendWorkerService.Services.Implement await backgroundServiceRepository.ExecuteSql(Mysql_error_update, waterArchiveDayRawDatas); } } + } #endregion 天歸檔補償 #region 週歸檔補償 @@ -442,8 +458,8 @@ namespace BackendWorkerService.Services.Implement "; - HttpWebRequest archiveWeekRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); - //HttpWebRequest archiveWeekRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); + HttpWebRequest archiveWeekRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/{station}/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); + //HttpWebRequest archiveWeekRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/{station}/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); archiveWeekRequest.Method = "POST"; archiveWeekRequest.Headers.Add("Authorization", "Basic " + encoded); archiveWeekRequest.PreAuthenticate = true; @@ -526,8 +542,8 @@ namespace BackendWorkerService.Services.Implement "; - HttpWebRequest archiveWeekRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); - //HttpWebRequest archiveWeekRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); + HttpWebRequest archiveWeekRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/{station}/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); + //HttpWebRequest archiveWeekRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/{station}/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); archiveWeekRequest.Method = "POST"; archiveWeekRequest.Headers.Add("Authorization", "Basic " + encoded); archiveWeekRequest.PreAuthenticate = true; @@ -616,8 +632,8 @@ namespace BackendWorkerService.Services.Implement "; - HttpWebRequest archiveMonthRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); - //HttpWebRequest archiveMonthRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); + HttpWebRequest archiveMonthRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/{station}/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); + //HttpWebRequest archiveMonthRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/{station}/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); archiveMonthRequest.Method = "POST"; archiveMonthRequest.Headers.Add("Authorization", "Basic " + encoded); archiveMonthRequest.PreAuthenticate = true; @@ -674,11 +690,11 @@ namespace BackendWorkerService.Services.Implement { await backgroundServiceMsSqlRepository.ExecuteSql(sql_error_update, electricArchiveMonthRawDatas); } - await backgroundServiceRepository.ExecuteSql(MYsql_update_format, electricArchiveMonthRawDatas); + await backgroundServiceRepository.ExecuteSql(Mysql_error_update, electricArchiveMonthRawDatas); } } - targetTable = "archive_electric_meter_month"; + targetTable = "archive_water_meter_month"; sql_error_month = string.Format(sql_error_format, targetTable); var water_error_months = await backgroundServiceRepository.GetAllAsync(sql_error_month, new { RepeatTimes = repeatTimes }); List> waterArchiveMonthRawDatas = new List>(); @@ -703,8 +719,8 @@ namespace BackendWorkerService.Services.Implement "; - HttpWebRequest archiveMonthRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); - //HttpWebRequest archiveMonthRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/FIC_Center/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); + HttpWebRequest archiveMonthRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/{station}/{deviceNumberPoint.FullDeviceNumberPoint}/~historyRollup/"); + //HttpWebRequest archiveMonthRequest = (HttpWebRequest)WebRequest.Create($"{obixApiConfig.ApiBase}obix/histories/{station}/H_E1_B1F_MVCB_MVCBH_V1/~historyRollup/"); archiveMonthRequest.Method = "POST"; archiveMonthRequest.Headers.Add("Authorization", "Basic " + encoded); archiveMonthRequest.PreAuthenticate = true; @@ -761,7 +777,7 @@ namespace BackendWorkerService.Services.Implement { await backgroundServiceMsSqlRepository.ExecuteSql(sql_error_update, waterArchiveMonthRawDatas); } - await backgroundServiceRepository.ExecuteSql(MYsql_update_format, waterArchiveMonthRawDatas); + await backgroundServiceRepository.ExecuteSql(Mysql_error_update, waterArchiveMonthRawDatas); } } #endregion 月歸檔補償 From 330b1964f2d31e951952d6077a29f57dbea09125 Mon Sep 17 00:00:00 2001 From: dev02 Date: Thu, 8 Jun 2023 11:39:17 +0800 Subject: [PATCH 15/21] =?UTF-8?q?[=E5=BE=8C=E7=AB=AF]=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=B0=B4=E9=9B=BB=E8=A1=A8api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApiControllers/HydroMeterController.cs | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/FrontendWebApi/ApiControllers/HydroMeterController.cs b/FrontendWebApi/ApiControllers/HydroMeterController.cs index caa4637..cbe0548 100644 --- a/FrontendWebApi/ApiControllers/HydroMeterController.cs +++ b/FrontendWebApi/ApiControllers/HydroMeterController.cs @@ -75,9 +75,21 @@ namespace FrontendWebApi.ApiControllers string sqlGroup = ""; string sqlAvgRawData = ""; string dbDateName = startTime.Split("-")[0].ToString().PadLeft(4, '0') + startTime.Split("-")[1].ToString().PadLeft(2, '0'); + string buildingSql = ""; + string tag_quantity = await backendRepository.GetOneAsync("select system_value from variable where system_type = 'obixConfig' and system_key = 'tag_quantity' and deleted = 0"); + + if (tag_quantity == "5") + buildingSql = " and SUBSTRING_INDEX(device_number, '_', 1) = @building_tag "; + else + buildingSql = " and SUBSTRING_INDEX(SUBSTRING_INDEX(device_number, '_', 2), '_', -1) = @building_tag "; if (input.floor_tag.Count > 0) - sqlWhere = $@" and substring_index(substring_index(device_number, '_', 3), '_', -1) in @floor_tag "; + { + if (tag_quantity == "5") + sqlWhere = $@" and substring_index(substring_index(device_number, '_', 3), '_', -1) in @floor_tag "; + else + sqlWhere = $@" and substring_index(substring_index(device_number, '_', 5), '_', -1) in @floor_tag "; + } if (input.tableType == "year") { @@ -104,7 +116,7 @@ namespace FrontendWebApi.ApiControllers ( select device_number from {table} - where start_timestamp >= @startTime and end_timestamp < @endTime and point = 'KWH' and SUBSTRING_INDEX(device_number, '_', 1) = @building_tag + where start_timestamp >= @startTime and end_timestamp < @endTime and point = 'KWH' {buildingSql} {sqlWhere} group by device_number ) dn @@ -113,7 +125,7 @@ namespace FrontendWebApi.ApiControllers left join ( select device_number, {sqlAvgRawData} from {table} - where start_timestamp >= @startTime and end_timestamp < @endTime and point = 'KWH' and SUBSTRING_INDEX(device_number, '_', 1) = @building_tag + where start_timestamp >= @startTime and end_timestamp < @endTime and point = 'KWH' {buildingSql} {sqlWhere} {sqlGroup} ) aemm on aemm.start_timestamp >= {aemmStaDate} and aemm.end_timestamp < {aemmEndDate} and aemm.device_number = fd.device_number order by fd.device_number, fd.date"; From 9d36817c52a8157fc2b729dde80a1d24ed8864c5 Mon Sep 17 00:00:00 2001 From: dev02 Date: Thu, 8 Jun 2023 11:40:00 +0800 Subject: [PATCH 16/21] =?UTF-8?q?[=E5=BE=8C=E7=AB=AF]=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=B0=B4=E5=A0=B1=E8=A1=A8=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApiControllers/HydroMeterController.cs | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/FrontendWebApi/ApiControllers/HydroMeterController.cs b/FrontendWebApi/ApiControllers/HydroMeterController.cs index cbe0548..cbf58c0 100644 --- a/FrontendWebApi/ApiControllers/HydroMeterController.cs +++ b/FrontendWebApi/ApiControllers/HydroMeterController.cs @@ -216,8 +216,21 @@ namespace FrontendWebApi.ApiControllers string sqlWhere = ""; string sqlGroup = ""; string sqlAvgRawData = ""; + string buildingSql = ""; + string tag_quantity = await backendRepository.GetOneAsync("select system_value from variable where system_type = 'obixConfig' and system_key = 'tag_quantity' and deleted = 0"); + + if (tag_quantity == "5") + buildingSql = " and SUBSTRING_INDEX(device_number, '_', 1) = @building_tag "; + else + buildingSql = " and SUBSTRING_INDEX(SUBSTRING_INDEX(device_number, '_', 2), '_', -1) = @building_tag "; + if (input.floor_tag.Count > 0) - sqlWhere = $@" and substring_index(substring_index(device_number, '_', 3), '_', -1) in @floor_tag "; + { + if (tag_quantity == "5") + sqlWhere = $@" and substring_index(substring_index(device_number, '_', 3), '_', -1) in @floor_tag "; + else + sqlWhere = $@" and substring_index(substring_index(device_number, '_', 5), '_', -1) in @floor_tag "; + } if (input.tableType == "year") { @@ -242,7 +255,7 @@ namespace FrontendWebApi.ApiControllers ( select device_number from {table} - where start_timestamp >= @startTime and end_timestamp < @endTime and point = 'RCV' and SUBSTRING_INDEX(device_number, '_', 1) = @building_tag + where start_timestamp >= @startTime and end_timestamp < @endTime and point = 'RCV' {buildingSql} {sqlWhere} group by device_number ) dn @@ -251,7 +264,7 @@ namespace FrontendWebApi.ApiControllers left join ( select device_number, {sqlAvgRawData} from {table} - where start_timestamp >= @startTime and end_timestamp < @endTime and point = 'RCV' and SUBSTRING_INDEX(device_number, '_', 1) = @building_tag + where start_timestamp >= @startTime and end_timestamp < @endTime and point = 'RCV' {buildingSql} {sqlWhere} {sqlGroup} ) aemm on aemm.start_timestamp >= fd.date and aemm.end_timestamp < DATE_ADD(fd.date, INTERVAL +1 {input.tableType}) and aemm.device_number = fd.device_number order by fd.device_number, fd.date"; From 9bd6ca4a313522b51ce2d2f42ee6fd4c87e8f945 Mon Sep 17 00:00:00 2001 From: dev02 Date: Thu, 8 Jun 2023 11:49:21 +0800 Subject: [PATCH 17/21] =?UTF-8?q?[=E5=BE=8C=E7=AB=AF]=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=B0=B4=E9=9B=BB=E8=A1=A8=E7=8F=BE=E6=98=AF=E6=AC=84=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApiControllers/HydroMeterController.cs | 58 ++++++++++++++++--- 1 file changed, 50 insertions(+), 8 deletions(-) diff --git a/FrontendWebApi/ApiControllers/HydroMeterController.cs b/FrontendWebApi/ApiControllers/HydroMeterController.cs index cbf58c0..11b8d9e 100644 --- a/FrontendWebApi/ApiControllers/HydroMeterController.cs +++ b/FrontendWebApi/ApiControllers/HydroMeterController.cs @@ -131,17 +131,38 @@ namespace FrontendWebApi.ApiControllers order by fd.device_number, fd.date"; var rawData = await backendRepository.GetAllAsync(sql, new { startTime = startTime, endtime = endTime, building_tag = input.building_tag, floor_tag = input.floor_tag, dateFormat = dateFormat }); - var list = rawData + + List list = new List(); + if (tag_quantity == "5") + { + list = rawData .GroupBy(x => new { building_tag = x.device_number.Split("_")[0], floor_tag = x.device_number.Split("_")[2], device_serial_tag = x.device_number.Split("_")[4] }) .Select(x => new HydroMeterOutput { building_tag = x.Key.building_tag, floor_tag = x.Key.floor_tag, device_serial_tag = x.Key.device_serial_tag }) .ToList(); + } + else + { + list = rawData + .GroupBy(x => new { building_tag = x.device_number.Split("_")[1], floor_tag = x.device_number.Split("_")[4], device_serial_tag = x.device_number.Split("_")[3] }) + .Select(x => new HydroMeterOutput { building_tag = x.Key.building_tag, floor_tag = x.Key.floor_tag, device_serial_tag = x.Key.device_serial_tag }) + .ToList(); + } foreach (var l in list) { l.rawData = new List(); - l.rawData.AddRange( - rawData.Where(x => x.device_number.Split("_")[0] == l.building_tag && x.device_number.Split("_")[2] == l.floor_tag && x.device_number.Split("_")[4] == l.device_serial_tag) - ); + if (tag_quantity == "5") + { + l.rawData.AddRange( + rawData.Where(x => x.device_number.Split("_")[0] == l.building_tag && x.device_number.Split("_")[2] == l.floor_tag && x.device_number.Split("_")[4] == l.device_serial_tag) + ); + } + else + { + l.rawData.AddRange( + rawData.Where(x => x.device_number.Split("_")[1] == l.building_tag && x.device_number.Split("_")[4] == l.floor_tag && x.device_number.Split("_")[3] == l.device_serial_tag) + ); + } l.building_name = await backendRepository.GetOneAsync("select full_name from building where building_tag = @building_tag and deleted = 0", new { building_tag = l.building_tag }); l.total = l.rawData.Sum(x => x.avg_rawdata).ToString(); @@ -271,17 +292,38 @@ namespace FrontendWebApi.ApiControllers var rawData = await backendRepository.GetAllAsync(sql, new { startTime = startTime, endTime = endTime, building_tag = input.building_tag, floor_tag = input.floor_tag, dateFormat = dateFormat }); - var list = rawData + + List list = new List(); + if (tag_quantity == "5") + { + list = rawData .GroupBy(x => new { building_tag = x.device_number.Split("_")[0], floor_tag = x.device_number.Split("_")[2], device_serial_tag = x.device_number.Split("_")[4] }) .Select(x => new HydroMeterOutput { building_tag = x.Key.building_tag, floor_tag = x.Key.floor_tag, device_serial_tag = x.Key.device_serial_tag }) .ToList(); + } + else + { + list = rawData + .GroupBy(x => new { building_tag = x.device_number.Split("_")[1], floor_tag = x.device_number.Split("_")[4], device_serial_tag = x.device_number.Split("_")[3] }) + .Select(x => new HydroMeterOutput { building_tag = x.Key.building_tag, floor_tag = x.Key.floor_tag, device_serial_tag = x.Key.device_serial_tag }) + .ToList(); + } foreach (var l in list) { l.rawData = new List(); - l.rawData.AddRange( - rawData.Where(x => x.device_number.Split("_")[0] == l.building_tag && x.device_number.Split("_")[2] == l.floor_tag && x.device_number.Split("_")[4] == l.device_serial_tag) - ); + if (tag_quantity == "5") + { + l.rawData.AddRange( + rawData.Where(x => x.device_number.Split("_")[0] == l.building_tag && x.device_number.Split("_")[2] == l.floor_tag && x.device_number.Split("_")[4] == l.device_serial_tag) + ); + } + else + { + l.rawData.AddRange( + rawData.Where(x => x.device_number.Split("_")[1] == l.building_tag && x.device_number.Split("_")[4] == l.floor_tag && x.device_number.Split("_")[3] == l.device_serial_tag) + ); + } l.building_name = await backendRepository.GetOneAsync("select full_name from building where building_tag = @building_tag and deleted = 0", new { building_tag = l.building_tag }); l.total = l.rawData.Sum(x => x.avg_rawdata).ToString(); From afc260435320ca3826f70f86bb19bd320908b53f Mon Sep 17 00:00:00 2001 From: dev02 Date: Thu, 8 Jun 2023 11:56:50 +0800 Subject: [PATCH 18/21] =?UTF-8?q?[=E5=BE=8C=E7=AB=AF]=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=B0=B4=E9=9B=BB=E5=A0=B1=E8=A1=A8=E8=A8=AD=E5=82=99tag?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FrontendWebApi/ApiControllers/HydroMeterController.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/FrontendWebApi/ApiControllers/HydroMeterController.cs b/FrontendWebApi/ApiControllers/HydroMeterController.cs index 11b8d9e..07d2ed2 100644 --- a/FrontendWebApi/ApiControllers/HydroMeterController.cs +++ b/FrontendWebApi/ApiControllers/HydroMeterController.cs @@ -143,7 +143,7 @@ namespace FrontendWebApi.ApiControllers else { list = rawData - .GroupBy(x => new { building_tag = x.device_number.Split("_")[1], floor_tag = x.device_number.Split("_")[4], device_serial_tag = x.device_number.Split("_")[3] }) + .GroupBy(x => new { building_tag = x.device_number.Split("_")[1], floor_tag = x.device_number.Split("_")[4], device_serial_tag = x.device_number.Split("_")[7] }) .Select(x => new HydroMeterOutput { building_tag = x.Key.building_tag, floor_tag = x.Key.floor_tag, device_serial_tag = x.Key.device_serial_tag }) .ToList(); } @@ -160,7 +160,7 @@ namespace FrontendWebApi.ApiControllers else { l.rawData.AddRange( - rawData.Where(x => x.device_number.Split("_")[1] == l.building_tag && x.device_number.Split("_")[4] == l.floor_tag && x.device_number.Split("_")[3] == l.device_serial_tag) + rawData.Where(x => x.device_number.Split("_")[1] == l.building_tag && x.device_number.Split("_")[4] == l.floor_tag && x.device_number.Split("_")[7] == l.device_serial_tag) ); } l.building_name = await backendRepository.GetOneAsync("select full_name from building where building_tag = @building_tag and deleted = 0", @@ -304,7 +304,7 @@ namespace FrontendWebApi.ApiControllers else { list = rawData - .GroupBy(x => new { building_tag = x.device_number.Split("_")[1], floor_tag = x.device_number.Split("_")[4], device_serial_tag = x.device_number.Split("_")[3] }) + .GroupBy(x => new { building_tag = x.device_number.Split("_")[1], floor_tag = x.device_number.Split("_")[4], device_serial_tag = x.device_number.Split("_")[7] }) .Select(x => new HydroMeterOutput { building_tag = x.Key.building_tag, floor_tag = x.Key.floor_tag, device_serial_tag = x.Key.device_serial_tag }) .ToList(); } @@ -321,7 +321,7 @@ namespace FrontendWebApi.ApiControllers else { l.rawData.AddRange( - rawData.Where(x => x.device_number.Split("_")[1] == l.building_tag && x.device_number.Split("_")[4] == l.floor_tag && x.device_number.Split("_")[3] == l.device_serial_tag) + rawData.Where(x => x.device_number.Split("_")[1] == l.building_tag && x.device_number.Split("_")[4] == l.floor_tag && x.device_number.Split("_")[7] == l.device_serial_tag) ); } l.building_name = await backendRepository.GetOneAsync("select full_name from building where building_tag = @building_tag and deleted = 0", From 4eeaa48e461397e96b7c03830524168da758c520 Mon Sep 17 00:00:00 2001 From: dev02 Date: Thu, 8 Jun 2023 15:41:40 +0800 Subject: [PATCH 19/21] =?UTF-8?q?[=E5=BE=8C=E5=8F=B0]=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?niagara=E5=90=8C=E6=AD=A5device=5Fdisaster=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NiagaraDataSynchronizeController.cs | 28 +++++++++ Backend/Models/DeviceDisaster.cs | 13 ++++ .../Services/Implement/webRequestService.cs | 63 +++++++++++++++++++ .../NiagaraDataSynchronizeRepository.cs | 52 +++++++++++++++ .../INiagaraDataSynchronizeRepository.cs | 1 + Repository/Models/BackgroundServiceTask.cs | 21 +++++++ 6 files changed, 178 insertions(+) create mode 100644 Backend/Models/DeviceDisaster.cs diff --git a/Backend/Controllers/NiagaraDataSynchronizeController.cs b/Backend/Controllers/NiagaraDataSynchronizeController.cs index c9610c7..2f2c473 100644 --- a/Backend/Controllers/NiagaraDataSynchronizeController.cs +++ b/Backend/Controllers/NiagaraDataSynchronizeController.cs @@ -120,6 +120,7 @@ namespace Backend.Controllers await niagaraDataSynchronizeRepository.CheckFullNameEmptyReplaceByDeviceName(); await niagaraDataSynchronizeRepository.InsertBuildingMenu(); await niagaraDataSynchronizeRepository.InsertSubSystemFloor(); + await this.DeviceDisasterAsync(); result = true; apiResult.Code = "0000"; @@ -221,5 +222,32 @@ namespace Backend.Controllers return apiResult; } + + private async Task DeviceDisasterAsync() + { + var sqlObix = $@"SELECT system_value as Value, system_key as Name FROM variable WHERE deleted = 0 AND system_type = 'obixConfig'"; + var variableObix = await backendRepository.GetAllAsync(sqlObix); + var obixApiConfig = new Models.ObixApiConfig(); + obixApiConfig.ApiBase = variableObix.Where(x => x.Name == "ApiBase").Select(x => x.Value).FirstOrDefault(); + obixApiConfig.UserName = variableObix.Where(x => x.Name == "UserName").Select(x => x.Value).FirstOrDefault(); + obixApiConfig.Password = variableObix.Where(x => x.Name == "Password").Select(x => x.Value).FirstOrDefault(); + obixApiConfig.TagQuantity = variableObix.Where(x => x.Name == "tag_quantity").Select(x => x.Value).FirstOrDefault(); + + if (obixApiConfig.TagQuantity == "5") + { + List dv = new List(); + List urlSlots = await backendRepository.GetAllAsync("select obixSlot from building where deleted = 0"); + List disasterTag = await backendRepository.GetAllAsync("select system_value from variable where system_type = 'disaster' and deleted = 0"); + webRequestService svc = new webRequestService(); + foreach(var dt in disasterTag) + { + string bql = "neql:hs:geoAddr=\"ER" + dt + "\""; + dv.AddRange(svc.obixDevDisaster(obixApiConfig.ApiBase + "obix/config/Arena/Program/ObixQuery/query/", bql, obixApiConfig.TagQuantity, obixApiConfig.UserName, + obixApiConfig.Password, dt)); + } + + await niagaraDataSynchronizeRepository.DeviceDisasterAysnc(dv); + } + } } } diff --git a/Backend/Models/DeviceDisaster.cs b/Backend/Models/DeviceDisaster.cs new file mode 100644 index 0000000..d01abc4 --- /dev/null +++ b/Backend/Models/DeviceDisaster.cs @@ -0,0 +1,13 @@ +namespace Backend.Models +{ + public class DeviceDisasterOutput + { + public string device_guid { get; set; } + public string device_building_tag { get; set; } + public string device_system_tag { get; set; } + public string device_name_tag { get; set; } + public string device_floor_tag { get; set; } + public string device_serial_tag { get; set; } + public string device_number { get; set; } + } +} diff --git a/Backend/Services/Implement/webRequestService.cs b/Backend/Services/Implement/webRequestService.cs index 96e0630..e8ccca6 100644 --- a/Backend/Services/Implement/webRequestService.cs +++ b/Backend/Services/Implement/webRequestService.cs @@ -327,6 +327,69 @@ namespace Backend.Services.Implement return result.Where(x => x.full_name != null).ToList(); } + + public List obixDevDisaster(string urlString, string bql, string tag_quantity, string acc, string pass, string dt) + { + List result = new List(); + //String username = "obixUser"; + //String password = "Admin123456"; + String encoded = System.Convert.ToBase64String(System.Text.Encoding.GetEncoding("ISO-8859-1").GetBytes(acc + ":" + pass)); + String API_Url = urlString; + + HttpWebRequest Postrequest = (HttpWebRequest)WebRequest.Create(API_Url); + Postrequest.Method = "POST"; + Postrequest.Headers.Add("Authorization", "Basic " + encoded); + Postrequest.PreAuthenticate = true; + + using (var streamWriter = new StreamWriter(Postrequest.GetRequestStream())) + { + string json = ""; + + streamWriter.Write(json); + } + + HttpWebResponse response = (HttpWebResponse)Postrequest.GetResponse(); + var responseString = new StreamReader(response.GetResponseStream()).ReadToEnd(); + + XmlDocument xmlDoc = new XmlDocument(); + xmlDoc.LoadXml(responseString); + + string jsonText = JsonConvert.SerializeXmlNode(xmlDoc); + var data = Welcome.FromJson(jsonText); + + if (data.Obj.Str != null) + { + foreach (var item in data.Obj.Str) + { + Device_value_disaster row = new Device_value_disaster(); + row.value = item.Val; + string[] s1 = item.Val.Split(','); + string[] s2 = s1[0].Split('/'); + row.tag_name = ""; + row.disasterValue = dt; + + for (int i = 0; i < s2.Length; i++) + { + if (i == s2.Length - 2) + { + row.point_name = s2[i]; + } + else if (i == 1) + { + row.tag_name += s2[i]; + } + else if (i > 1 && i < s2.Length - 2) + { + row.tag_name += "_" + s2[i].Replace("$3", ""); + } + } + result.Add(row); + } + } + + return result; + } + //private static void getRefData(string urlString, string encoded, List conPoint, List result, Welcome data ) //obixHistory data //{ // foreach (var item in data.Obj.Ref) diff --git a/Repository/BackendRepository/Implement/NiagaraDataSynchronizeRepository.cs b/Repository/BackendRepository/Implement/NiagaraDataSynchronizeRepository.cs index 53e91eb..8ffba7b 100644 --- a/Repository/BackendRepository/Implement/NiagaraDataSynchronizeRepository.cs +++ b/Repository/BackendRepository/Implement/NiagaraDataSynchronizeRepository.cs @@ -858,5 +858,57 @@ namespace Repository.BackendRepository.Implement } } } + + public async Task DeviceDisasterAysnc(List dv) + { + using (IDbConnection conn = GetDbConnection()) + { + conn.Open(); + using (TransactionScope scope = new TransactionScope(TransactionScopeAsyncFlowOption.Enabled)) + { + try + { + StringBuilder sb = new StringBuilder(); + sb.Append("select * from device_disaster"); + var deviceDisaster = (await conn.QueryAsync(sb.ToString())).ToList(); + sb.Clear(); + sb.Append("select * from device where deleted = 0"); + var device = (await conn.QueryAsync(sb.ToString())).ToList(); + dv = dv.Where(x => device.Any(d => d.device_number == x.value.Split('/')[6])).ToList(); + + sb.Clear(); + foreach (var d in dv.Where(x => deviceDisaster.Any(dd => dd.device_number == x.value.Split('/')[6]))) + { + string device_number = d.value.Split('/')[6]; + sb.Append($"update device_disaster set device_system_value = '{d.disasterValue}' where device_number = '{device_number}'; "); + } + + foreach (var d in dv.Where(x => !deviceDisaster.Any(dd => dd.device_number == x.value.Split('/')[6]))) + { + string device_number = d.value.Split('/')[6]; + string device_guid = device.Where(x => x.device_number == device_number).Select(x => x.device_guid).FirstOrDefault(); + string device_system_tag = device.Where(x => x.device_number == device_number).Select(x => x.device_system_tag).FirstOrDefault(); + string device_name_tag = device.Where(x => x.device_number == device_number).Select(x => x.device_name_tag).FirstOrDefault(); + sb.Append($@" + insert into device_disaster + (device_guid, device_system_value, device_building_tag, device_system_tag, device_name_tag, device_floor_tag, device_serial_tag, device_number) + values ({device_guid}, {d.disasterValue}, {device_number.Split('_')[0]}, {device_number.Split('_')[1]}, {device_system_tag}, {device_name_tag}, + {device_number.Split('_')[2]}, {device_number.Split('_')[4]}, {device_number}); "); + } + + if (!string.IsNullOrEmpty(sb.ToString())) + await conn.ExecuteAsync(sb.ToString()); + } + catch (Exception exception) + { + throw exception; + } + finally + { + conn.Close(); + } + } + } + } } } diff --git a/Repository/BackendRepository/Interface/INiagaraDataSynchronizeRepository.cs b/Repository/BackendRepository/Interface/INiagaraDataSynchronizeRepository.cs index ef2688a..a535158 100644 --- a/Repository/BackendRepository/Interface/INiagaraDataSynchronizeRepository.cs +++ b/Repository/BackendRepository/Interface/INiagaraDataSynchronizeRepository.cs @@ -70,5 +70,6 @@ namespace Repository.BackendRepository.Interface /// /// Task InsertSubSystemFloor(); + Task DeviceDisasterAysnc(List dv); } } diff --git a/Repository/Models/BackgroundServiceTask.cs b/Repository/Models/BackgroundServiceTask.cs index 7ccafa3..c049778 100644 --- a/Repository/Models/BackgroundServiceTask.cs +++ b/Repository/Models/BackgroundServiceTask.cs @@ -131,4 +131,25 @@ namespace Repository.Models public string displayName { get; set; } public bool isHistory { get; set; } } + + public class DeviceDisasterOutput + { + public string device_guid { get; set; } + public string device_building_tag { get; set; } + public string device_system_tag { get; set; } + public string device_name_tag { get; set; } + public string device_floor_tag { get; set; } + public string device_serial_tag { get; set; } + public string device_number { get; set; } + } + + public class Device_value_disaster + { + public string value { get; set; } + public string tag_name { get; set; } + public string point_name { get; set; } + public string building { get; set; } + public string displayName { get; set; } + public string disasterValue { get; set; } + } } From f03491e9f65146469536b3a5b81f32f268a3b1b0 Mon Sep 17 00:00:00 2001 From: dev01 Date: Fri, 9 Jun 2023 10:49:44 +0800 Subject: [PATCH 20/21] =?UTF-8?q?[=E5=84=80=E9=8C=B6=E6=9D=BF]=20=E5=8F=96?= =?UTF-8?q?=E5=BE=97=E5=90=84=E6=A3=9F=E7=B8=BD=E9=9B=BB=E8=A1=A8=20api=20?= =?UTF-8?q?=E5=BB=BA=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApiControllers/DashboardController.cs | 30 +++++++++++++++++++ FrontendWebApi/Models/Dashboard.cs | 7 +++++ 2 files changed, 37 insertions(+) diff --git a/FrontendWebApi/ApiControllers/DashboardController.cs b/FrontendWebApi/ApiControllers/DashboardController.cs index 5baa9f4..07999c6 100644 --- a/FrontendWebApi/ApiControllers/DashboardController.cs +++ b/FrontendWebApi/ApiControllers/DashboardController.cs @@ -67,5 +67,35 @@ namespace FrontendWebApi.ApiControllers } return Ok(apiResult); } + + [HttpPost] + [Route("api/Dashboard/GetTotalElec")] + public async Task>>> GetTotalElec() + { + ApiResult> apiResult = new ApiResult>(); + try + { + var sqlString = $@"SELECT + system_key AS 'building_tag', + system_value AS 'device_number', + system_remark AS 'remark' + FROM variable + WHERE + system_type = 'dashboard_total_elec' + AND deleted = '0'"; + var ess = await backendRepository.GetAllAsync(sqlString); + + apiResult.Code = "0000"; + apiResult.Data = ess; + } + catch (Exception exception) + { + apiResult.Code = "9999"; + apiResult.Msg = "系統內部錯誤，請聯絡管理者。"; + Logger.LogError("【" + controllerName + "/" + actionName + "】" + exception.Message); + return Ok(apiResult); + } + return Ok(apiResult); + } } } diff --git a/FrontendWebApi/Models/Dashboard.cs b/FrontendWebApi/Models/Dashboard.cs index 2214668..723b0e2 100644 --- a/FrontendWebApi/Models/Dashboard.cs +++ b/FrontendWebApi/Models/Dashboard.cs @@ -7,4 +7,11 @@ public int DispatchCnt{ get; set; } public int NotDispatchCnt { get; set; } } + + public class TotalElec + { + public string building_tag { get; set; } + public string device_number { get; set; } + public string remark { get; set; } + } } From 8ce63162006c8a5f4ebbe20d1813da1e340a3e56 Mon Sep 17 00:00:00 2001 From: dev02 Date: Fri, 9 Jun 2023 15:33:33 +0800 Subject: [PATCH 21/21] =?UTF-8?q?[=E5=BE=8C=E7=AB=AF]=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?niagara=20=E5=90=8C=E6=AD=A5=20=E8=A8=AD=E5=82=99=E9=98=B2?= =?UTF-8?q?=E7=81=BD=E9=8C=AF=E8=AA=A4,=20=E4=BF=AE=E6=94=B9=E6=B0=B4?= =?UTF-8?q?=E9=9B=BB=E8=A1=A8=E5=88=A4=E6=96=B7=E8=A1=A8=E6=A0=BC=E9=8C=AF?= =?UTF-8?q?=E8=AA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NiagaraDataSynchronizeController.cs | 14 +- .../Services/Implement/webRequestService.cs | 147 ++++++++++++------ Backend/appsettings.Development.json | 4 +- .../ApiControllers/HydroMeterController.cs | 23 ++- .../NiagaraDataSynchronizeRepository.cs | 17 +- Repository/Models/BackgroundServiceTask.cs | 1 + Repository/Models/quickType.cs | 30 +--- Repository/Models/quickTypeSingle.cs | 82 ++++++++++ 8 files changed, 224 insertions(+), 94 deletions(-) create mode 100644 Repository/Models/quickTypeSingle.cs diff --git a/Backend/Controllers/NiagaraDataSynchronizeController.cs b/Backend/Controllers/NiagaraDataSynchronizeController.cs index 2f2c473..22bf9d8 100644 --- a/Backend/Controllers/NiagaraDataSynchronizeController.cs +++ b/Backend/Controllers/NiagaraDataSynchronizeController.cs @@ -113,13 +113,13 @@ namespace Backend.Controllers building = data.GroupBy(x => x.tag_name.Split("_")[1]).Select(x => x.Key).ToList(); } - string LightSwitchLevel = await niagaraDataSynchronizeRepository.getLightSwitchLevel(); //獲取照明開關 是否在 device or device_node - await niagaraDataSynchronizeRepository.InsertNiagaraTagList(ds, building, tag_quantity); // 匯入 MySQL table: import_niagara_tag - await niagaraDataSynchronizeRepository.DeviceComparison(LightSwitchLevel); - await niagaraDataSynchronizeRepository.CheckDiffFullNameAndCover(); - await niagaraDataSynchronizeRepository.CheckFullNameEmptyReplaceByDeviceName(); - await niagaraDataSynchronizeRepository.InsertBuildingMenu(); - await niagaraDataSynchronizeRepository.InsertSubSystemFloor(); + //string LightSwitchLevel = await niagaraDataSynchronizeRepository.getLightSwitchLevel(); //獲取照明開關 是否在 device or device_node + //await niagaraDataSynchronizeRepository.InsertNiagaraTagList(ds, building, tag_quantity); // 匯入 MySQL table: import_niagara_tag + //await niagaraDataSynchronizeRepository.DeviceComparison(LightSwitchLevel); + //await niagaraDataSynchronizeRepository.CheckDiffFullNameAndCover(); + //await niagaraDataSynchronizeRepository.CheckFullNameEmptyReplaceByDeviceName(); + //await niagaraDataSynchronizeRepository.InsertBuildingMenu(); + //await niagaraDataSynchronizeRepository.InsertSubSystemFloor(); await this.DeviceDisasterAsync(); result = true; diff --git a/Backend/Services/Implement/webRequestService.cs b/Backend/Services/Implement/webRequestService.cs index e8ccca6..7219dcd 100644 --- a/Backend/Services/Implement/webRequestService.cs +++ b/Backend/Services/Implement/webRequestService.cs @@ -331,62 +331,113 @@ namespace Backend.Services.Implement public List obixDevDisaster(string urlString, string bql, string tag_quantity, string acc, string pass, string dt) { List result = new List(); - //String username = "obixUser"; - //String password = "Admin123456"; - String encoded = System.Convert.ToBase64String(System.Text.Encoding.GetEncoding("ISO-8859-1").GetBytes(acc + ":" + pass)); - String API_Url = urlString; - - HttpWebRequest Postrequest = (HttpWebRequest)WebRequest.Create(API_Url); - Postrequest.Method = "POST"; - Postrequest.Headers.Add("Authorization", "Basic " + encoded); - Postrequest.PreAuthenticate = true; - - using (var streamWriter = new StreamWriter(Postrequest.GetRequestStream())) + try { - string json = ""; + //String username = "obixUser"; + //String password = "Admin123456"; + String encoded = System.Convert.ToBase64String(System.Text.Encoding.GetEncoding("ISO-8859-1").GetBytes(acc + ":" + pass)); + String API_Url = urlString; - streamWriter.Write(json); - } + HttpWebRequest Postrequest = (HttpWebRequest)WebRequest.Create(API_Url); + Postrequest.Method = "POST"; + Postrequest.Headers.Add("Authorization", "Basic " + encoded); + Postrequest.PreAuthenticate = true; - HttpWebResponse response = (HttpWebResponse)Postrequest.GetResponse(); - var responseString = new StreamReader(response.GetResponseStream()).ReadToEnd(); - - XmlDocument xmlDoc = new XmlDocument(); - xmlDoc.LoadXml(responseString); - - string jsonText = JsonConvert.SerializeXmlNode(xmlDoc); - var data = Welcome.FromJson(jsonText); - - if (data.Obj.Str != null) - { - foreach (var item in data.Obj.Str) - { - Device_value_disaster row = new Device_value_disaster(); - row.value = item.Val; - string[] s1 = item.Val.Split(','); - string[] s2 = s1[0].Split('/'); - row.tag_name = ""; - row.disasterValue = dt; - - for (int i = 0; i < s2.Length; i++) + using (var streamWriter = new StreamWriter(Postrequest.GetRequestStream())) { - if (i == s2.Length - 2) + string json = ""; + + streamWriter.Write(json); + } + + HttpWebResponse response = (HttpWebResponse)Postrequest.GetResponse(); + var responseString = new StreamReader(response.GetResponseStream()).ReadToEnd(); + + XmlDocument xmlDoc = new XmlDocument(); + xmlDoc.LoadXml(responseString); + + string jsonText = JsonConvert.SerializeXmlNode(xmlDoc); + bool welcome = false; + try + { + Welcome.FromJson(jsonText); + welcome = true; + } + catch + { + + } + + if (welcome) + { + var data = Welcome.FromJson(jsonText); + if (data.Obj.Str != null) { - row.point_name = s2[i]; - } - else if (i == 1) - { - row.tag_name += s2[i]; - } - else if (i > 1 && i < s2.Length - 2) - { - row.tag_name += "_" + s2[i].Replace("$3", ""); + foreach (var item in data.Obj.Str) + { + Device_value_disaster row = new Device_value_disaster(); + row.value = item.Val; + string[] s1 = item.Val.Split(','); + string[] s2 = s1[0].Split('/'); + row.tag_name = ""; + row.disasterValue = dt; + + for (int i = 0; i < s2.Length; i++) + { + if (i == s2.Length - 2) + { + row.point_name = s2[i]; + } + else if (i == 1) + { + row.tag_name += s2[i]; + } + else if (i > 1 && i < s2.Length - 2) + { + row.tag_name += "_" + s2[i].Replace("$3", ""); + } + } + result.Add(row); + } } } - result.Add(row); - } - } + else + { + var data = WelcomeSingle.FromJson(jsonText); + if (data.Obj.Str != null) + { + var item = data.Obj.Str; + Device_value_disaster row = new Device_value_disaster(); + row.value = item.Val; + string[] s1 = item.Val.Split(','); + string[] s2 = s1[0].Split('/'); + row.tag_name = ""; + row.disasterValue = dt; + + for (int i = 0; i < s2.Length; i++) + { + if (i == s2.Length - 2) + { + row.point_name = s2[i]; + } + else if (i == 1) + { + row.tag_name += s2[i]; + } + else if (i > 1 && i < s2.Length - 2) + { + row.tag_name += "_" + s2[i].Replace("$3", ""); + } + } + result.Add(row); + } + } + } + catch(Exception e) + { + var a = e; + } return result; } diff --git a/Backend/appsettings.Development.json b/Backend/appsettings.Development.json index b5af96e..83cd09a 100644 --- a/Backend/appsettings.Development.json +++ b/Backend/appsettings.Development.json @@ -18,10 +18,10 @@ "Port": "js2LutKe+rdjzdxMPQUrvQ==", //"Database": "VJB2XC+lAtzuHObDGMVOAA==", //30 //"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp - //"Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome + "Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome //"Database": "siTUcDaC/g2yGTMFWD72Kg==", //tpe_dome_hotel //"Database": "iuaY0h0+TWkir44/eZLDqw==", //tpe_dome_office - "Database": "Rq7Gn4x6LwBvVtl7GY8LbA==", //mcut + //"Database": "Rq7Gn4x6LwBvVtl7GY8LbA==", //mcut "Root": "SzdxEgaJJ7tcTCrUl2zKsA==", "Password": "FVAPxztxpY4gJJKQ/se4bQ==" }, diff --git a/FrontendWebApi/ApiControllers/HydroMeterController.cs b/FrontendWebApi/ApiControllers/HydroMeterController.cs index 07d2ed2..baa6388 100644 --- a/FrontendWebApi/ApiControllers/HydroMeterController.cs +++ b/FrontendWebApi/ApiControllers/HydroMeterController.cs @@ -1,6 +1,7 @@ using FrontendWebApi.Models; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; +using MySqlX.XDevAPI; using NPOI.SS.UserModel; using NPOI.XSSF.UserModel; using Repository.BackendRepository.Interface; @@ -100,6 +101,15 @@ namespace FrontendWebApi.ApiControllers sqlAvgRawData = " round(avg_rawdata, 2) as avg_rawdata, start_timestamp, end_timestamp "; var table = input.tableType == "year" ? "archive_electric_meter_month" : "archive_electric_meter_" + input.tableType + (input.tableType == "day" ? "_" + dbDateName : ""); + var schema = await backendRepository.GetOneAsync($"select system_value from variable where system_type = 'project_name'"); + var isTable = await backendRepository.GetOneAsync($"select table_name from information_schema.tables where table_name = '{table}' and table_schema = '{schema.Split('/')[0]}'"); + if (string.IsNullOrEmpty(isTable)) //check for has table or not + { + apiResult.Code = "0000"; + apiResult.Data = new List() { }; + return Ok(apiResult); + } + var dateFormat = input.tableType == "day" || input.tableType == "week" ? "%Y-%m-%d" : input.tableType == "month" ? "%Y-%m" : input.tableType == "year" ? "%Y" : null; var aemmEndDate = input.tableType == "year" ? $"year(DATE_ADD(fd.date, INTERVAL +1 {input.tableType}))" : $"DATE_ADD(fd.date, INTERVAL +1 {input.tableType})"; var aemmStaDate = input.tableType == "year" ? "year(fd.date)" : "fd.date"; @@ -262,7 +272,18 @@ namespace FrontendWebApi.ApiControllers sqlAvgRawData = " round(avg_rawdata, 2) as avg_rawdata, start_timestamp, end_timestamp "; var table = input.tableType == "year" ? "archive_electric_meter_month" : "archive_electric_meter_" + input.tableType + (input.tableType == "day" ? "_" + dbDateName : ""); + var schema = await backendRepository.GetOneAsync($"select system_value from variable where system_type = 'project_name'"); + var isTable = await backendRepository.GetOneAsync($"select table_name from information_schema.tables where table_name = '{table}' and table_schema = '{schema.Split('/')[0]}'"); + if (string.IsNullOrEmpty(isTable)) //check for has table or not + { + apiResult.Code = "0000"; + apiResult.Data = new List() { }; + return Ok(apiResult); + } + var dateFormat = input.tableType == "day" || input.tableType == "week" ? "%Y-%m-%d" : input.tableType == "month" ? "%Y-%m" : input.tableType == "year" ? "%Y" : null; + var aemmEndDate = input.tableType == "year" ? $"year(DATE_ADD(fd.date, INTERVAL +1 {input.tableType}))" : $"DATE_ADD(fd.date, INTERVAL +1 {input.tableType})"; + var aemmStaDate = input.tableType == "year" ? "year(fd.date)" : "fd.date"; var sql = $@"set @i = -1; select fd.device_number, aemm.avg_rawdata, DATE_FORMAT(fd.date, @dateFormat) as timestamp from ( @@ -285,7 +306,7 @@ namespace FrontendWebApi.ApiControllers left join ( select device_number, {sqlAvgRawData} from {table} - where start_timestamp >= @startTime and end_timestamp < @endTime and point = 'RCV' {buildingSql} + where start_timestamp >= {aemmStaDate} and end_timestamp < {aemmEndDate} and point = 'RCV' {buildingSql} {sqlWhere} {sqlGroup} ) aemm on aemm.start_timestamp >= fd.date and aemm.end_timestamp < DATE_ADD(fd.date, INTERVAL +1 {input.tableType}) and aemm.device_number = fd.device_number order by fd.device_number, fd.date"; diff --git a/Repository/BackendRepository/Implement/NiagaraDataSynchronizeRepository.cs b/Repository/BackendRepository/Implement/NiagaraDataSynchronizeRepository.cs index 8ffba7b..7fe8a27 100644 --- a/Repository/BackendRepository/Implement/NiagaraDataSynchronizeRepository.cs +++ b/Repository/BackendRepository/Implement/NiagaraDataSynchronizeRepository.cs @@ -12,6 +12,7 @@ using Repository.Models; using System.Data.SqlTypes; using Microsoft.Extensions.Primitives; using System.Web; +using Org.BouncyCastle.Utilities.Collections; namespace Repository.BackendRepository.Implement { @@ -864,26 +865,28 @@ namespace Repository.BackendRepository.Implement using (IDbConnection conn = GetDbConnection()) { conn.Open(); - using (TransactionScope scope = new TransactionScope(TransactionScopeAsyncFlowOption.Enabled)) + using (TransactionScope scope = new TransactionScope((TransactionScopeOption)TransactionScopeAsyncFlowOption.Enabled, new TimeSpan(0, 5, 0))) { try { StringBuilder sb = new StringBuilder(); - sb.Append("select * from device_disaster"); + sb.Append("select * from device_disaster;"); var deviceDisaster = (await conn.QueryAsync(sb.ToString())).ToList(); sb.Clear(); - sb.Append("select * from device where deleted = 0"); + sb.Append("select * from device where deleted = 0;"); var device = (await conn.QueryAsync(sb.ToString())).ToList(); dv = dv.Where(x => device.Any(d => d.device_number == x.value.Split('/')[6])).ToList(); sb.Clear(); - foreach (var d in dv.Where(x => deviceDisaster.Any(dd => dd.device_number == x.value.Split('/')[6]))) + var updateList = dv.Where(x => deviceDisaster.Any(dd => dd.device_number == x.value.Split('/')[6] && dd.device_system_value != x.disasterValue)); + foreach (var d in updateList) { string device_number = d.value.Split('/')[6]; sb.Append($"update device_disaster set device_system_value = '{d.disasterValue}' where device_number = '{device_number}'; "); } - foreach (var d in dv.Where(x => !deviceDisaster.Any(dd => dd.device_number == x.value.Split('/')[6]))) + var insertList = dv.Where(x => !deviceDisaster.Any(dd => dd.device_number == x.value.Split('/')[6])); + foreach (var d in insertList) { string device_number = d.value.Split('/')[6]; string device_guid = device.Where(x => x.device_number == device_number).Select(x => x.device_guid).FirstOrDefault(); @@ -892,8 +895,8 @@ namespace Repository.BackendRepository.Implement sb.Append($@" insert into device_disaster (device_guid, device_system_value, device_building_tag, device_system_tag, device_name_tag, device_floor_tag, device_serial_tag, device_number) - values ({device_guid}, {d.disasterValue}, {device_number.Split('_')[0]}, {device_number.Split('_')[1]}, {device_system_tag}, {device_name_tag}, - {device_number.Split('_')[2]}, {device_number.Split('_')[4]}, {device_number}); "); + values ('{device_guid}', '{d.disasterValue}', '{device_number.Split('_')[0]}', '{device_system_tag}', '{device_name_tag}', '{device_number.Split('_')[2]}', + '{device_number.Split('_')[4]}', '{device_number}'); "); } if (!string.IsNullOrEmpty(sb.ToString())) diff --git a/Repository/Models/BackgroundServiceTask.cs b/Repository/Models/BackgroundServiceTask.cs index c049778..d806dad 100644 --- a/Repository/Models/BackgroundServiceTask.cs +++ b/Repository/Models/BackgroundServiceTask.cs @@ -141,6 +141,7 @@ namespace Repository.Models public string device_floor_tag { get; set; } public string device_serial_tag { get; set; } public string device_number { get; set; } + public string device_system_value { get; set; } } public class Device_value_disaster diff --git a/Repository/Models/quickType.cs b/Repository/Models/quickType.cs index 13eb593..d215aef 100644 --- a/Repository/Models/quickType.cs +++ b/Repository/Models/quickType.cs @@ -20,11 +20,6 @@ namespace Repository.Models public partial class Obj { - [JsonProperty("@href")] - public string? href { get; set; } - [JsonProperty("@icon")] - public string? icon { get; set; } - [JsonProperty("@display")] public string Display { get; set; } @@ -38,11 +33,7 @@ namespace Repository.Models public Uri XmlnsXsi { get; set; } [JsonProperty("str")] - public Str[] Str { get; set; } - - [JsonProperty("ref")] - public Str[] Ref { get; set; } - //public Ref Ref { get; set; } + public List Str { get; set; } } public partial class Str @@ -55,25 +46,6 @@ namespace Repository.Models [JsonProperty("@href")] public string Href { get; set; } - [JsonProperty("@display")] - public string display { get; set; } - [JsonProperty("@_icon")] - public string _icon { get; set; } - } - - public class Ref - { - [JsonProperty("_name")] - public string Name { get; set; } - - [JsonProperty("_href")] - public string Href { get; set; } - - [JsonProperty("_display")] - public string Display { get; set; } - - [JsonProperty("_icon")] - public string Icon { get; set; } } public partial class Xml diff --git a/Repository/Models/quickTypeSingle.cs b/Repository/Models/quickTypeSingle.cs new file mode 100644 index 0000000..7c38efe --- /dev/null +++ b/Repository/Models/quickTypeSingle.cs @@ -0,0 +1,82 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; + +namespace Repository.Models +{ + public partial class WelcomeSingle + { + [JsonProperty("?xml")] + public XmlSingle Xml { get; set; } + + [JsonProperty("?xml-stylesheet")] + public string XmlStylesheet { get; set; } + + [JsonProperty("obj")] + public ObjSingle Obj { get; set; } + } + + public partial class ObjSingle + { + [JsonProperty("@display")] + public string Display { get; set; } + + [JsonProperty("@xmlns")] + public Uri Xmlns { get; set; } + + [JsonProperty("@xsi:schemaLocation")] + public Uri XsiSchemaLocation { get; set; } + + [JsonProperty("@xmlns:xsi")] + public Uri XmlnsXsi { get; set; } + + [JsonProperty("str")] + public Str Str { get; set; } + } + + public partial class StrSingle + { + [JsonProperty("@name")] + public string Name { get; set; } + + [JsonProperty("@val")] + public string Val { get; set; } + + [JsonProperty("@href")] + public string Href { get; set; } + } + + public partial class XmlSingle + { + [JsonProperty("@version")] + public string Version { get; set; } + + [JsonProperty("@encoding")] + public string Encoding { get; set; } + } + + public partial class WelcomeSingle + { + public static WelcomeSingle FromJson(string json) => JsonConvert.DeserializeObject(json, Models.ConverterSingle.Settings); + } + + public static class SerializeSingle + { + public static string ToJson(this WelcomeSingle self) => JsonConvert.SerializeObject(self, Models.ConverterSingle.Settings); + } + + internal static class ConverterSingle + { + public static readonly JsonSerializerSettings Settings = new JsonSerializerSettings + { + MetadataPropertyHandling = MetadataPropertyHandling.Ignore, + DateParseHandling = DateParseHandling.None, + Converters = + { + new IsoDateTimeConverter { DateTimeStyles = DateTimeStyles.AssumeUniversal } + }, + }; + } +}