From ca9bc2d809cfd8df732659b803349e452851e845 Mon Sep 17 00:00:00 2001 From: GiteaAdmin Date: Tue, 31 Jan 2023 15:45:38 +0800 Subject: [PATCH] =?UTF-8?q?[frontendWebApi]=20=E9=A6=96=E9=A0=81=E5=8D=A1?= =?UTF-8?q?=E7=89=87=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Backend/Services/Implement/webRequestService.cs | 2 ++ FrontendWebApi/ApiControllers/DeviceManageController.cs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Backend/Services/Implement/webRequestService.cs b/Backend/Services/Implement/webRequestService.cs index 9ae6333..ca135aa 100644 --- a/Backend/Services/Implement/webRequestService.cs +++ b/Backend/Services/Implement/webRequestService.cs @@ -195,6 +195,8 @@ namespace Backend.Services.Implement row.device_name_tag = item2.Name.Split('_')[3]; row.device_point_name = item2.Name.Split('_')[8]; row.parent_path = item.Name; + + //full_name 其實是點位名稱 point_name row.full_name = conPoint.Where(x => x.name == item2.Name).Select(x => x.displayName).FirstOrDefault(); result.Add(row); diff --git a/FrontendWebApi/ApiControllers/DeviceManageController.cs b/FrontendWebApi/ApiControllers/DeviceManageController.cs index d2faa5a..2757769 100644 --- a/FrontendWebApi/ApiControllers/DeviceManageController.cs +++ b/FrontendWebApi/ApiControllers/DeviceManageController.cs @@ -78,7 +78,7 @@ namespace FrontendWebApi.ApiControllers select distinct main_system_tag, sub_system_tag from building_menu where building_tag = @building_tag ) as bm on v2.system_value = bm.sub_system_tag and v1.system_value = bm.main_system_tag where c.account = @account - order by v1.system_priority, v2.system_priority", new { @account = myUser.account, @sub_system_type = sub_system_type, @main_system_type = main_system_type, @building_tag = fd.building_tag }); + order by v2.system_priority", new { @account = myUser.account, @sub_system_type = sub_system_type, @main_system_type = main_system_type, @building_tag = fd.building_tag }); var mains = dbsub.GroupBy(a => a.main_system_tag).ToList(); apiResult.Data = new History_MainSubBuildFloor(); apiResult.Data.history_Main_Systems = new List();