From 3b19c94246bb0757e3f77bd2402b423baee2795f Mon Sep 17 00:00:00 2001 From: dev02 Date: Wed, 4 Oct 2023 14:41:52 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=BE=8C=E7=AB=AF]=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=BE=8C=E5=8F=B0=E5=90=8C=E6=AD=A5=E6=B5=81=E7=A8=8B,=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AF=AB=E5=85=A5=E6=89=80=E6=9C=89control?= =?UTF-8?q?=20point=20=E8=A8=AD=E5=82=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NiagaraDataSynchronizeController.cs | 72 +++++++----- .../Services/Implement/webRequestService.cs | 106 ++++++++++++++++++ Backend/appsettings.Development.json | 4 +- .../NiagaraDataSynchronizeRepository.cs | 89 +++++++++++++-- .../INiagaraDataSynchronizeRepository.cs | 7 ++ Repository/Models/BackgroundServiceTask.cs | 13 +++ 6 files changed, 250 insertions(+), 41 deletions(-) diff --git a/Backend/Controllers/NiagaraDataSynchronizeController.cs b/Backend/Controllers/NiagaraDataSynchronizeController.cs index c30ef88..682f9b4 100644 --- a/Backend/Controllers/NiagaraDataSynchronizeController.cs +++ b/Backend/Controllers/NiagaraDataSynchronizeController.cs @@ -62,7 +62,7 @@ namespace Backend.Controllers string top100 = "";//" top 100 "; webRequestService svc = new webRequestService(); var urlSlots = backendRepository.GetAllAsync("select obixSlot from building where deleted = 0").Result; - foreach(var us in urlSlots) + foreach (var us in urlSlots) { string bql = us + "bql:select " + top100 + " * from baja:Folder "; //ds = svc.obixQuery("http://192.168.0.136:8080/obix/config/Arena/Program/ObixQuery/query/", bql); @@ -100,7 +100,7 @@ namespace Backend.Controllers string tag_quantity = variableObix.Where(x => x.Name == "tag_quantity").Select(x => x.Value).FirstOrDefault(); try - { + { string ss = ds.Where(x => x.tag_name != "").FirstOrDefault().tag_name; var data = ds.Where(x => x.tag_name != ""); List building = null; @@ -161,15 +161,24 @@ namespace Backend.Controllers 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.UrlSlot = variableObix.Where(x => x.Name == "url_slot").Select(x => x.Value).FirstOrDefault(); + obixApiConfig.UrlSlot = variableObix.Where(x => x.Name == "url_slot").Select(x => x.Value).FirstOrDefault(); var urlSlots = backendRepository.GetAllAsync("select obixSlot, area_tag from building where deleted = 0").Result; - foreach(var us in urlSlots) + var data2 = new List(); + foreach (var us in urlSlots) { var data = svc.obixHisQuery(obixApiConfig.ApiBase + "obix/config/Program/ObixQuery/query/", obixApiConfig.ApiBase + "obix/histories", us.obixSlot, obixApiConfig.UserName, obixApiConfig.Password, us.area_tag); + + data2.AddRange(svc.obixAllDevicePoint(obixApiConfig.ApiBase + "obix/config/Program/ObixQuery/query/", obixApiConfig.ApiBase + "obix/histories", us.obixSlot, + obixApiConfig.UserName, obixApiConfig.Password, us.area_tag)); + ds.AddRange(data); } - + + if (data2.Any()) + { + niagaraDataSynchronizeRepository.DeviceControlPoint(data2); + } var buildings = backendRepository.GetAllAsync("select building_tag from building where deleted = 0").Result; apiResult.Code = "0000"; apiResult.Data = ds.Where(x => buildings.Contains(x.device_building_tag)).ToList(); @@ -201,33 +210,34 @@ namespace Backend.Controllers { //string ss = ds.Where(x => x.tag_name != "").FirstOrDefault().tag_name; //var building = ss.Split("_")[0]; - var building = ds.GroupBy(x => x.device_building_tag).Select(x => x.Key).ToList(); - #region 歷史資料處理 - ds.Clear(); - var isDome = await backendRepository.GetOneAsync("select system_value from variable where deleted = 0 and system_type = 'project_name';"); - var sqlObix = $@"SELECT system_value as Value, system_key as Name FROM variable WHERE deleted = 0 AND system_type = 'obixConfig'"; - var variableObix = backendRepository.GetAllAsync(sqlObix).Result; - var obixApiConfig = new Backend.Models.ObixApiConfig(); - EDFunction ed = new EDFunction(); - 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.UrlSlot = variableObix.Where(x => x.Name == "url_slot").Select(x => x.Value).FirstOrDefault(); - webRequestService svc = new webRequestService(); - var data = svc.obixHisQuery_v2(obixApiConfig.ApiBase + "obix/config/Program/ObixQuery/query/", obixApiConfig.ApiBase + "obix/histories", "", - obixApiConfig.UserName, obixApiConfig.Password); - ds.AddRange(data); - // save to history - await niagaraDataSynchronizeRepository.InsertItemFromNiagara_History(ds, building); // insert 暫存table import_niagara_item_history - if (!string.IsNullOrEmpty(isDome) && isDome.Contains("ibms_dome")) - await niagaraDataSynchronizeRepository.RecoverSysTag("import_niagara_item_history"); // recover missing deivce_system_tag - #endregion + //var building = ds.GroupBy(x => x.device_building_tag).Select(x => x.Key).ToList(); + //#region 歷史資料處理 + //ds.Clear(); + //var isDome = await backendRepository.GetOneAsync("select system_value from variable where deleted = 0 and system_type = 'project_name';"); + //var sqlObix = $@"SELECT system_value as Value, system_key as Name FROM variable WHERE deleted = 0 AND system_type = 'obixConfig'"; + //var variableObix = backendRepository.GetAllAsync(sqlObix).Result; + //var obixApiConfig = new Backend.Models.ObixApiConfig(); + //EDFunction ed = new EDFunction(); + //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.UrlSlot = variableObix.Where(x => x.Name == "url_slot").Select(x => x.Value).FirstOrDefault(); + //webRequestService svc = new webRequestService(); + //var data = svc.obixHisQuery_v2(obixApiConfig.ApiBase + "obix/config/Program/ObixQuery/query/", obixApiConfig.ApiBase + "obix/histories", "", + // obixApiConfig.UserName, obixApiConfig.Password); + //ds.AddRange(data); - await niagaraDataSynchronizeRepository.InsertItemFromNiagara(oldDs, building); // insert 暫存table import_niagara_item - await niagaraDataSynchronizeRepository.DeviceItemComparison(); //insert device_item - await niagaraDataSynchronizeRepository.CheckItemDiffFullNameAndCover(); // update device_item.fullname - await niagaraDataSynchronizeRepository.ItemCheckFullNameEmptyReplaceByDeviceName(); // 檢查device_item內FullName為空的值，以points取代 - await niagaraDataSynchronizeRepository.CheckItemIsShowHistory(); + //// save to history + //await niagaraDataSynchronizeRepository.InsertItemFromNiagara_History(ds, building); // insert 暫存table import_niagara_item_history + //if (!string.IsNullOrEmpty(isDome) && isDome.Contains("ibms_dome")) + // await niagaraDataSynchronizeRepository.RecoverSysTag("import_niagara_item_history"); // recover missing deivce_system_tag + //#endregion + + //await niagaraDataSynchronizeRepository.InsertItemFromNiagara(oldDs, building); // insert 暫存table import_niagara_item + //await niagaraDataSynchronizeRepository.DeviceItemComparison(); //insert device_item + //await niagaraDataSynchronizeRepository.CheckItemDiffFullNameAndCover(); // update device_item.fullname + //await niagaraDataSynchronizeRepository.ItemCheckFullNameEmptyReplaceByDeviceName(); // 檢查device_item內FullName為空的值，以points取代 + //await niagaraDataSynchronizeRepository.CheckItemIsShowHistory(); result = true; diff --git a/Backend/Services/Implement/webRequestService.cs b/Backend/Services/Implement/webRequestService.cs index be8f1af..c7c96d7 100644 --- a/Backend/Services/Implement/webRequestService.cs +++ b/Backend/Services/Implement/webRequestService.cs @@ -729,5 +729,111 @@ namespace Backend.Services.Implement // } // } //} + + /// + /// 獲取 niagara history 中的點位 + /// + /// + /// + /// + /// + public List obixAllDevicePoint(string bqlUrlString, string urlString, string slot, string acc, string pass, string AreaTag) + { + String username = acc; + String password = pass; + String encoded = System.Convert.ToBase64String(System.Text.Encoding.GetEncoding("ISO-8859-1").GetBytes(username + ":" + password)); + + #region get control point data + List conPoint = new List(); + String cp_API_Url = bqlUrlString; + String building_tag = slot.Split("/")[2].Replace("|", "_").Trim(); //Ex: D2_, M_ + + HttpWebRequest cp_Postrequest = (HttpWebRequest)WebRequest.Create(cp_API_Url); + cp_Postrequest.Method = "POST"; + cp_Postrequest.Headers.Add("Authorization", "Basic " + encoded); + cp_Postrequest.PreAuthenticate = true; + + using (var streamWriter = new StreamWriter(cp_Postrequest.GetRequestStream())) + { + string json = ""; + + streamWriter.Write(json); + } + cp_Postrequest.Timeout = System.Threading.Timeout.Infinite; + HttpWebResponse cp_response = (HttpWebResponse)cp_Postrequest.GetResponse(); + var cp_responseString = new StreamReader(cp_response.GetResponseStream()).ReadToEnd(); + + XmlDocument cp_xmlDoc = new XmlDocument(); + cp_xmlDoc.LoadXml(cp_responseString); + + string cp_jsonText = JsonConvert.SerializeXmlNode(cp_xmlDoc); + var cp_data = Welcome.FromJson(cp_jsonText); + + foreach (var item in cp_data.Obj.Str) + { + control_point row = new control_point(); + string[] s1 = item.Val.Split(','); + + string[] s2 = s1[0].Split('/'); + var displayName = s1[1].Split('=')[1]; + + row.name = s1[0].Remove(s1[0].Length - 1, 1).Remove(0, 1); + row.displayName = displayName; + row.isHistory = false; + + conPoint.Add(row); + } + #endregion + + var result = new List(); + foreach (var n in conPoint) + { + if (n.name.Split('/').Length == 9) + { + result.Add(new DeviceControlPoint + { + name = n.name, + displayName = n.displayName, + device_area_tag = n.name.Split('/')[0], + device_building_tag = n.name.Split('/')[1], + device_system_tag = n.name.Split('/')[2], + device_name_tag = n.name.Split('/')[3], + device_point_name = n.name.Split('/')[8], + }); + } + else if (n.name.Split('/').Length == 7) // Arena/D2/CWB/L110/CAP/D2_CWB_L110_CAP_MET1/Summery + { + if (n.name.Split('/')[2] == "S" || n.name.Split('/')[2] == "B" || n.name.Split('/')[2] == "CWB") //for security system and CWB system + { + result.Add(new DeviceControlPoint + { + name = n.name, + displayName = n.displayName, + device_building_tag = n.name.Split('/')[1], + device_system_tag = n.name.Split('/')[2], + device_floor_tag = n.name.Split('/')[3], + device_name_tag = n.name.Split('/')[4], + device_point_name = n.name.Split('/')[6], + device_number = n.name.Split('/')[5] + }); + } + else //for normal + { + result.Add(new DeviceControlPoint + { + name = n.name, + displayName = n.displayName, + device_building_tag = n.name.Split('/')[1], + //device_system_tag = n.name.Split('/')[1], + device_floor_tag = n.name.Split('/')[3], + device_name_tag = n.name.Split('/')[2], + device_point_name = n.name.Split('/')[6], + device_number = n.name.Split('/')[5] + }); + } + } + } + return result.ToList(); + } } } diff --git a/Backend/appsettings.Development.json b/Backend/appsettings.Development.json index cf06bea..7704050 100644 --- a/Backend/appsettings.Development.json +++ b/Backend/appsettings.Development.json @@ -22,8 +22,8 @@ //"Database": "siTUcDaC/g2yGTMFWD72Kg==", //tpe_dome_hotel //"Database": "iuaY0h0+TWkir44/eZLDqw==", //tpe_dome_office //"Database": "Rq7Gn4x6LwBvVtl7GY8LbA==", //mcut - //"Database": "+5RAiFLJVU+LRyDxF1K/pcLZaoZa4k/thZqF6xKoCag=", //dome_online_0821 - "Database": "2U+9jYGy0dCbMzLaguBXow==", //tpe_dome_mall + "Database": "+5RAiFLJVU+LRyDxF1K/pcLZaoZa4k/thZqF6xKoCag=", //dome_online_0821 + //"Database": "2U+9jYGy0dCbMzLaguBXow==", //tpe_dome_mall //"Database": "FbHCCU4CapG9UryANXC1W+iMe403Bd82RnA7bCNVbL0=", //ibms_dome_cinema, "Root": "SzdxEgaJJ7tcTCrUl2zKsA==", "Password": "FVAPxztxpY4gJJKQ/se4bQ==" diff --git a/Repository/BackendRepository/Implement/NiagaraDataSynchronizeRepository.cs b/Repository/BackendRepository/Implement/NiagaraDataSynchronizeRepository.cs index 4ce81fc..57f40ab 100644 --- a/Repository/BackendRepository/Implement/NiagaraDataSynchronizeRepository.cs +++ b/Repository/BackendRepository/Implement/NiagaraDataSynchronizeRepository.cs @@ -15,6 +15,7 @@ using System.Web; using Org.BouncyCastle.Utilities.Collections; using System.Reflection; using System.Drawing; +using Org.BouncyCastle.Asn1.Mozilla; namespace Repository.BackendRepository.Implement { @@ -156,9 +157,10 @@ namespace Repository.BackendRepository.Implement where (device_system_tag <> 'S' and device_system_tag <> 'CWB' and device_system_tag <> 'B' and (device_system_tag <> 'FM' or device_system_tag <> 'APS' or device_system_tag <> 'VICL')); - update import_niagara_tag a join dic_system b - on a.device_name_tag COLLATE utf8mb4_general_ci = b.s2_code - set device_system_tag = b.s1_code -- tag 第二碼為小類(除了安全系統之外) + update import_niagara_tag a + join variable b on a.device_name_tag COLLATE utf8mb4_general_ci = b.system_value and b.deleted = 0 and b.system_type = 'device_system_category_layer3' + join variable v1 on b.system_parent_id = v1.id + set device_system_tag = v1.system_value -- tag 第二碼為小類(除了安全系統之外) where (device_system_tag <> 'S' and device_system_tag <> 'CWB' and device_system_tag <> 'B' and (device_system_tag <> 'FM' or device_system_tag <> 'APS' or device_system_tag <> 'VICL')); -- 安全系統 第二段大類 第四段小類"); using (TransactionScope scope = new TransactionScope(TransactionScopeAsyncFlowOption.Enabled)) @@ -276,9 +278,10 @@ namespace Repository.BackendRepository.Implement { if (isDome.Contains("ibms_dome")) { - sb.Append($@" update import_niagara_item a join dic_system b - on a.device_name_tag COLLATE utf8mb4_0900_ai_ci = b.s2_code COLLATE utf8mb4_0900_ai_ci - set device_system_tag = b.s1_code + sb.Append($@" update import_niagara_item a + join variable b on a.device_name_tag COLLATE utf8mb4_0900_ai_ci = b.system_value COLLATE utf8mb4_0900_ai_ci and b.deleted = 0 and b.system_type = 'device_system_category_layer3' + join variable v1 on b.system_parent_id = v1.id + set device_system_tag = v1.system_value where (device_system_tag <> 'S' and device_system_tag <> 'CWB' and device_system_tag <> 'B');"); } @@ -1378,8 +1381,9 @@ device_floor_tag, device_master_tag, device_last_name_tag, device_serial_tag, d StringBuilder sb = new StringBuilder(); sb.Append($@"SET SQL_SAFE_UPDATES = 0; update {tableName} a - join dic_system ds on ds.s2_code = a.device_name_tag - set a.device_system_tag = ds.s1_code + join variable v2 on v2.system_value = a.device_name_tag and v2.deleted = 0 and v2.system_type = 'device_system_category_layer3' + join variable v1 on v1.id = v2.system_parent_id + set a.device_system_tag = v1.system_value where a.device_system_tag is null or a.device_system_tag = '';"); await conn.ExecuteAsync(sb.ToString()); } @@ -1394,5 +1398,74 @@ device_floor_tag, device_master_tag, device_last_name_tag, device_serial_tag, d } } } + + /// + /// record all device control point + /// + /// + /// + public async Task DeviceControlPoint (List dcp) + { + using (IDbConnection conn = GetDbConnection()) + { + try + { + string sql = @"CREATE TABLE IF NOT EXISTS `import_niagara_device_control_point` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `name` varchar(1000) DEFAULT NULL, + `displayName` varchar(50) DEFAULT NULL, + `device_area_tag` varchar(50) DEFAULT NULL, + `device_building_tag` varchar(50) DEFAULT NULL, + `device_system_tag` varchar(50) DEFAULT NULL, + `device_name_tag` varchar(50) DEFAULT NULL, + `device_floor_tag` varchar(50) DEFAULT NULL, + `device_number` varchar(50) DEFAULT NULL, + `device_point_name` varchar(50) DEFAULT NULL, + PRIMARY KEY (`id`) + ) ENGINE=InnoDB AUTO_INCREMENT=59 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;"; + using (TransactionScope scope = new TransactionScope(TransactionScopeAsyncFlowOption.Enabled)) + { + await conn.ExecuteAsync(sql); + } + + sql = @"truncate table import_niagara_device_control_point"; + using (TransactionScope scope = new TransactionScope(TransactionScopeAsyncFlowOption.Enabled)) + { + await conn.ExecuteAsync(sql); + } + + StringBuilder sb = new StringBuilder(); + int count = 0; + foreach (var data in dcp) + { + sql = $@" insert into import_niagara_device_control_point(name, displayName, device_area_tag, device_building_tag, device_system_tag, device_name_tag, device_floor_tag, + device_number, device_point_name) + values ('{data.name}', '{data.displayName}', '{data.device_area_tag}', '{data.device_building_tag}', '{data.device_system_tag}', '{data.device_name_tag}', + '{data.device_floor_tag}', '{data.device_number}', '{data.device_point_name}');"; + sb.Append(sql); + count++; + if (count.Equals(100)) + { + await conn.ExecuteAsync(sb.ToString()); + sb.Clear(); + count = 0; + } + } + if (sb.Length > 0) + { + await conn.ExecuteAsync(sb.ToString()); + sb.Clear(); + } + } + catch (Exception e) + { + throw e; + } + finally + { + conn.Close(); + } + } + } } } diff --git a/Repository/BackendRepository/Interface/INiagaraDataSynchronizeRepository.cs b/Repository/BackendRepository/Interface/INiagaraDataSynchronizeRepository.cs index b14f12a..351047c 100644 --- a/Repository/BackendRepository/Interface/INiagaraDataSynchronizeRepository.cs +++ b/Repository/BackendRepository/Interface/INiagaraDataSynchronizeRepository.cs @@ -82,5 +82,12 @@ namespace Repository.BackendRepository.Interface /// /// Task RecoverSysTag(string tableName); + + /// + /// record all device control point + /// + /// + /// + Task DeviceControlPoint(List dcp); } } diff --git a/Repository/Models/BackgroundServiceTask.cs b/Repository/Models/BackgroundServiceTask.cs index c206285..fbfc179 100644 --- a/Repository/Models/BackgroundServiceTask.cs +++ b/Repository/Models/BackgroundServiceTask.cs @@ -164,4 +164,17 @@ namespace Repository.Models public string area_tag { get; set; } public string obixSlot { get; set; } } + + public class DeviceControlPoint + { + public string name { get; set; } + public string displayName { get; set; } + public string device_area_tag { 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_number { get; set; } + public string device_point_name { get; set; } + } }