From b3af8cb4612dd6ce987c9eabc936c98618f3f43f Mon Sep 17 00:00:00 2001 From: dev02 Date: Wed, 28 Jun 2023 16:19:35 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=BE=8C=E7=AB=AF]=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=85=A8=E5=9F=9F=E6=A3=9F=E5=88=A5api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FrontendWebApi/ApiControllers/DeviceManageController.cs | 5 ++++- FrontendWebApi/Models/Device.cs | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/FrontendWebApi/ApiControllers/DeviceManageController.cs b/FrontendWebApi/ApiControllers/DeviceManageController.cs index 46d5154..2bb6c75 100644 --- a/FrontendWebApi/ApiControllers/DeviceManageController.cs +++ b/FrontendWebApi/ApiControllers/DeviceManageController.cs @@ -296,7 +296,10 @@ namespace FrontendWebApi.ApiControllers try { - var sqlString = $@"select building_tag, full_name, urn_3D, forge_light_group from building where deleted = 0 order by priority"; + var sqlString = $@"select b.building_tag, b.full_name, b.urn_3D, b.forge_light_group, SUBSTRING_INDEX(v.system_value, '/', 1) as getway + from building b + left join variable v on v.system_key = b.building_tag and v.system_type = 'dashboard_total_elec' + where b.deleted = 0 order by b.priority;"; var bl = await backendRepository.GetAllAsync(sqlString); apiResult.Code = "0000"; diff --git a/FrontendWebApi/Models/Device.cs b/FrontendWebApi/Models/Device.cs index d17498a..af49f86 100644 --- a/FrontendWebApi/Models/Device.cs +++ b/FrontendWebApi/Models/Device.cs @@ -23,6 +23,7 @@ namespace FrontendWebApi.Models /// 0single_1group;燈控是否為群控/單獨(個別燈具)控制 /// public Int16 forge_light_group { get; set; } + public string getway { get; set; } } public class FloorList