From 9d24a97e3e01f3cfa3eb9e26fe3edc88c2a830f5 Mon Sep 17 00:00:00 2001 From: "jay.chang" Date: Thu, 22 Feb 2024 17:03:09 +0800 Subject: [PATCH] =?UTF-8?q?[Backend]=E4=BF=AE=E6=94=B9=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E8=B3=87=E6=96=99=E7=9A=84=E7=AF=A9=E9=81=B8=E6=A2=9D=E4=BB=B6?= =?UTF-8?q?=20=20[WebApi]=E4=BF=AE=E6=94=B9=E6=AD=B7=E5=8F=B2=E8=B3=87?= =?UTF-8?q?=E6=96=99=E6=8A=93Niagara=E8=B3=87=E6=96=99=E7=9A=84=E7=AF=A9?= =?UTF-8?q?=E9=81=B8=E6=A2=9D=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Backend/Services/Implement/webRequestService.cs | 2 +- Backend/appsettings.Development.json | 2 +- FrontendWebApi/ApiControllers/HistoryController.cs | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Backend/Services/Implement/webRequestService.cs b/Backend/Services/Implement/webRequestService.cs index 59abbaf..b833407 100644 --- a/Backend/Services/Implement/webRequestService.cs +++ b/Backend/Services/Implement/webRequestService.cs @@ -607,7 +607,7 @@ namespace Backend.Services.Implement else if (tagName.Split('_').Length == 6) { //巨蛋 tag 5 段版本 ImpNiaItem row = new ImpNiaItem(); - if (tagName.Split('_')[1] == "S") //for security system + if (tagName.Split('_')[1] == "S" || tagName.Split('_')[1] == "B" || tagName.Split('_')[1] == "CWB") //for security system { row.device_building_tag = tagName.Split('_')[0]; row.device_system_tag = tagName.Split('_')[1]; diff --git a/Backend/appsettings.Development.json b/Backend/appsettings.Development.json index 16453c3..da0f81b 100644 --- a/Backend/appsettings.Development.json +++ b/Backend/appsettings.Development.json @@ -14,7 +14,7 @@ }, "DBConfig": { "MySqlDBConfig": { - "Server": "CYGthbCeGtAXT4s1NOSJHQ==", //0.201 + "Server": "CYGthbCeGtAXT4s1NOSJHQ==", //0.132 "Port": "mkF51jVbg40V5K5eTh2Ckw==", //3306 //"Database": "VJB2XC+lAtzuHObDGMVOAA==", //30 //"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp diff --git a/FrontendWebApi/ApiControllers/HistoryController.cs b/FrontendWebApi/ApiControllers/HistoryController.cs index 8591f8a..cebd90d 100644 --- a/FrontendWebApi/ApiControllers/HistoryController.cs +++ b/FrontendWebApi/ApiControllers/HistoryController.cs @@ -1161,8 +1161,7 @@ namespace FrontendWebApi.ApiControllers if (tagQuantity.Equals("5")) { - if (device_number_point.Split("_")[1].Equals("S") || device_number_point.Split("_")[1].Equals("CWB") || device_number_point.Split("_")[1].Equals("B") || - device_number_point.Split("_")[1].Equals("FM") || device_number_point.Split("_")[1].Equals("APS") || device_number_point.Split("_")[1].Equals("VICL")) + if (device_number_point.Split("_")[1].Equals("S") || device_number_point.Split("_")[1].Equals("CWB") || device_number_point.Split("_")[1].Equals("B") ) { station = await frontendRepository.GetOneAsync($@"select parent_path from import_niagara_item_history where device_building_tag = '{device_number_point.Split("_")[0]}' and device_floor_tag = '{device_number_point.Split("_")[2]}'