From af876d7e77d09e1d69b1c72d8f9efd5d735ebfe7 Mon Sep 17 00:00:00 2001 From: dev02 Date: Wed, 4 Oct 2023 10:42:10 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=BE=8C=E7=AB=AF]=20=E4=BF=AE=E6=94=B9api=20?= =?UTF-8?q?=E5=88=A4=E6=96=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Backend/Services/Implement/webRequestService.cs | 4 ++-- FrontendWebApi/ApiControllers/HistoryController.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Backend/Services/Implement/webRequestService.cs b/Backend/Services/Implement/webRequestService.cs index bcf182d..be8f1af 100644 --- a/Backend/Services/Implement/webRequestService.cs +++ b/Backend/Services/Implement/webRequestService.cs @@ -240,7 +240,7 @@ namespace Backend.Services.Implement // result.Add(row); // } - // else if (tagName.Split('_').Length == 6) + // else if (tagName.Split('_').Length == 6) // { //巨蛋 tag 5 段版本 // ImpNiaItem row = new ImpNiaItem(); // if (tagName.Split('_')[1] == "S" || tagName.Split('_')[1] == "B" || tagName.Split('_')[1] == "CWB") //for security system and parking system @@ -275,7 +275,7 @@ namespace Backend.Services.Implement //} #endregion - foreach(var n in conPoint) + foreach (var n in conPoint) { if (n.name.Split('/').Length == 9) { diff --git a/FrontendWebApi/ApiControllers/HistoryController.cs b/FrontendWebApi/ApiControllers/HistoryController.cs index b01f79f..347e94d 100644 --- a/FrontendWebApi/ApiControllers/HistoryController.cs +++ b/FrontendWebApi/ApiControllers/HistoryController.cs @@ -570,7 +570,7 @@ namespace FrontendWebApi.ApiControllers join variable v1 on v1.system_value = b.device_system_tag and v1.deleted = 0 and v1.system_type = 'device_system_category_layer2' join variable v2 on v2.system_value = b.device_name_tag and v2.deleted = 0 and v2.system_type = 'device_system_category_layer3' where a.deleted = 0 and b.deleted = 0 and v2.deleted = 0 and v1.deleted = 0 - and a.unit is not null and b.device_number in @Device_number + and a.unit is not null and b.device_number in @Device_number and a.is_link = 1 order by c.priority,b.priority;" , new { Device_number = postDevice.select_data.Select(a => a.device_number).ToList() } );