diff --git a/FrontendWebApi/ApiControllers/DeviceManageController.cs b/FrontendWebApi/ApiControllers/DeviceManageController.cs index 2bb6c75..eb24c3c 100644 --- a/FrontendWebApi/ApiControllers/DeviceManageController.cs +++ b/FrontendWebApi/ApiControllers/DeviceManageController.cs @@ -296,7 +296,7 @@ namespace FrontendWebApi.ApiControllers try { - var sqlString = $@"select b.building_tag, b.full_name, b.urn_3D, b.forge_light_group, SUBSTRING_INDEX(v.system_value, '/', 1) as getway + var sqlString = $@"select b.building_tag, b.full_name, b.urn_3D, b.forge_light_group, b.school_zone, 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;"; @@ -315,6 +315,38 @@ namespace FrontendWebApi.ApiControllers return Ok(apiResult); } + /// + /// 校區種類 + /// + /// + /// + [HttpPost] + [Route("api/Device/GetSchoolZone")] + public async Task>>> GetSchoolZone() + { + ApiResult> apiResult = new ApiResult>(); + + try + { + var sqlString = $@"select system_key, system_value from variable + where system_type = 'school_zone_type';"; + var bl = await backendRepository.GetAllAsync(sqlString); + + Console.WriteLine(bl); + + apiResult.Code = "0000"; + apiResult.Data = bl; + } + catch (Exception exception) + { + apiResult.Code = "9999"; + apiResult.Msg = "系統內部錯誤,請聯絡管理者。"; + Logger.LogError("【" + controllerName + "/" + actionName + "】" + exception.Message); + return Ok(apiResult); + } + return Ok(apiResult); + } + /// /// 樓層列表 /// diff --git a/FrontendWebApi/Models/Device.cs b/FrontendWebApi/Models/Device.cs index aaf14ca..7a08535 100644 --- a/FrontendWebApi/Models/Device.cs +++ b/FrontendWebApi/Models/Device.cs @@ -23,8 +23,14 @@ namespace FrontendWebApi.Models /// 0single_1group;燈控是否為群控/單獨(個別燈具)控制 /// public Int16 forge_light_group { get; set; } + public string school_zone { get; set; } public string getway { get; set; } } + public class SchoolZoneList + { + public string system_key { get; set; } + public string system_value { get; set; } + } public class FloorList {