Merge branch 'MCUT' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS into MCUT

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<BuildList>(sqlString);
 
                 apiResult.Code = "0000";

FrontendWebApi/Models/Device.cs

@@ -23,6 +23,7 @@ namespace FrontendWebApi.Models
         /// 0single_1group；燈控是否為群控/單獨(個別燈具)控制
         /// </summary>
         public Int16 forge_light_group { get; set; }
+        public string getway { get; set; }
     }
 
     public class FloorList