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

.gitignore

@@ -362,3 +362,4 @@ MigrationBackup/
 # Fody - auto-generated XML schema
 FodyWeavers.xsd
 /Backend/wwwroot/upload/floor_map.zip
+*.nwd

Backend/Controllers/BuildInfoController.cs

@@ -47,7 +47,7 @@ namespace Backend.Controllers
             try
             {
                 var sqlString = @$"SELECT A.priority, A.building_tag, A.full_name, A.ip_address, A.ip_port, (SELECT COUNT(*) FROM floor f WHERE f.deleted = 0 AND f.building_tag = A.building_tag) AS 'floorNum', A.created_at,
-                                        A.orgName_3D, A.extName_3D
+                                        A.orgName_3D, A.extName_3D, forge_light_group
                                    FROM building A
                                    WHERE A.deleted = 0
                                    ORDER BY A.priority ASC, A.created_at DESC";

Backend/Models/BuildModel.cs

@@ -22,6 +22,11 @@ namespace Backend.Models
         public string extName_3D { get; set; }
         public string urn_3D { get; set; }
         //public string Created_at { get; set; }  //建立時間
+
+        /// <summary>
+        /// 0single_1group；燈控是否為群控/單獨(個別燈具)控制
+        /// </summary>
+        public Int16 forge_light_group { get; set; }
     }
 
     public class BuildFloor : Actor

Backend/appsettings.Development.json

@@ -16,8 +16,8 @@
     "MySqlDBConfig": {
       "Server": "FYlY+w0XDIz+jmF2rlZWJw==", //0.201
       "Port": "js2LutKe+rdjzdxMPQUrvQ==",
-      "Database": "VJB2XC+lAtzuHObDGMVOAA==", //30  
+      //"Database": "VJB2XC+lAtzuHObDGMVOAA==", //30  
-      //"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp
+      "Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp
       "Root": "SzdxEgaJJ7tcTCrUl2zKsA==",
       "Password": "FVAPxztxpY4gJJKQ/se4bQ=="
     }

Backend/appsettings.json

@@ -16,7 +16,7 @@
     "MySqlDBConfig": {
       "Server": "FYlY+w0XDIz+jmF2rlZWJw==", //0.201
       "Port": "js2LutKe+rdjzdxMPQUrvQ==",
-      //"Database": "VJB2XC+lAtzuHObDGMVOAA==", //三菱
+     // "Database": "VJB2XC+lAtzuHObDGMVOAA==", //三菱
       "Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp
       "Root": "SzdxEgaJJ7tcTCrUl2zKsA==",
       "Password": "FVAPxztxpY4gJJKQ/se4bQ=="

Backend/wwwroot/forgeDemo.html

@@ -252,7 +252,7 @@
           /* launchViewer("dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dGEzaHFzZmZ6cWJub3V4a3BsZGt1a3NldzRzajIxdzUtYmltc19tb2RlbHMvJUUzJTgwJTkwJUU1JThGJUIwJUU1JThDJTk3JUU0JUI4JUFEJUU4JThGJUIxJUU1JUE0JUE3JUU2JUE4JTkzJUUzJTgwJTkxQVJDJUU5JTlCJTk5JUU2JUE4JUExJUU1JUJDJThGK01FUCVFNiU4QiU4NiVFNyVCMyVCQiVFNyVCNSVCMV8wMTE2Lm53ZA")*/
 
           /*新增軌道燈軌道*/
-          launchViewer("dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dGEzaHFzZmZ6cWJub3V4a3BsZGt1a3NldzRzajIxdzUtYmltc19tb2RlbHMvJUUzJTgwJTkwJUU1JThGJUIwJUU1JThDJTk3JUU0JUI4JUFEJUU4JThGJUIxJUU1JUE0JUE3JUU2JUE4JTkzJUUzJTgwJTkxQVJDJUU5JTlCJTk5JUU2JUE4JUExJUU1JUJDJThGK01FUCVFNiU4QiU4NiVFNyVCMyVCQiVFNyVCNSVCMV8wMTE5Lm53ZA")
+            launchViewer("dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dGEzaHFzZmZ6cWJub3V4a3BsZGt1a3NldzRzajIxdzUtYmltc19tb2RlbHMvQmFucWlhbyUyMFRhaXBlaSUyME1haW4lMjBPZmZpY2UtQUxMLm53ZA")
 
             //launchViewer('dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dnNjb2RlFX2ZvcmdlX3Rlc3QvJUUzJFTgwJTkwQVJDJUUzJTgwJTkxXzIwMjJfMTJfMTMubndk');//new ARC
             //launchViewer('dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dnNjb2RlX2ZvcmdlX3Rlc3QvJUUzJTgwJTkwTUVQJUUzJTgwJTkxXzIwMjJfMTJfMTMubndj');//new MEP

FrontendWebApi/ApiControllers/DeviceManageController.cs

@@ -176,7 +176,7 @@ namespace FrontendWebApi.ApiControllers
 
 
         /// <summary>
-        /// 東別列表
+        /// 棟別列表
         /// </summary>
         /// <param name="account"></param>
         /// <returns></returns>
@@ -188,7 +188,7 @@ namespace FrontendWebApi.ApiControllers
 
             try
             {
-                var sqlString = $@"select building_tag, full_name, urn_3D from building where deleted = 0 order by priority";
+                var sqlString = $@"select building_tag, full_name, urn_3D, forge_light_group from building where deleted = 0 order by priority";
                 var bl = await backendRepository.GetAllAsync<BuildList>(sqlString);
 
                 apiResult.Code = "0000";

FrontendWebApi/Models/Device.cs

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