From 5d2d6f059af7abec89514a3e4e245e35e953a874 Mon Sep 17 00:00:00 2001 From: GiteaAdmin Date: Thu, 2 Feb 2023 12:08:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[frontendWebApi]=20[BackEnd]=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=87=88=E6=8E=A7=E6=98=AF=E5=90=A6=E7=BE=A4=E6=8E=A7?= =?UTF-8?q?=E6=AC=84=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index bdac7ba..17b04ea 100644 --- a/.gitignore +++ b/.gitignore @@ -362,3 +362,4 @@ MigrationBackup/ # Fody - auto-generated XML schema FodyWeavers.xsd /Backend/wwwroot/upload/floor_map.zip +*.nwd From 62aa404dc6f49720c52c4691101dd3bf0599a153 Mon Sep 17 00:00:00 2001 From: GiteaAdmin Date: Thu, 2 Feb 2023 12:08:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[frontendWebApi]=20[BackEnd]=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=87=88=E6=8E=A7=E6=98=AF=E5=90=A6=E7=BE=A4=E6=8E=A7?= =?UTF-8?q?=E6=AC=84=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Backend/Controllers/BuildInfoController.cs | 2 +- Backend/Models/BuildModel.cs | 5 +++++ Backend/appsettings.Development.json | 4 ++-- Backend/appsettings.json | 2 +- Backend/wwwroot/forgeDemo.html | 2 +- FrontendWebApi/ApiControllers/DeviceManageController.cs | 4 ++-- FrontendWebApi/Models/Device.cs | 4 ++++ 7 files changed, 16 insertions(+), 7 deletions(-) diff --git a/Backend/Controllers/BuildInfoController.cs b/Backend/Controllers/BuildInfoController.cs index 9fc3a02..24faf5b 100644 --- a/Backend/Controllers/BuildInfoController.cs +++ b/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"; diff --git a/Backend/Models/BuildModel.cs b/Backend/Models/BuildModel.cs index 8c3784d..a80232d 100644 --- a/Backend/Models/BuildModel.cs +++ b/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; } //建立時間 + + /// + /// 0single_1group；燈控是否為群控/單獨(個別燈具)控制 + /// + public Int16 forge_light_group { get; set; } } public class BuildFloor : Actor diff --git a/Backend/appsettings.Development.json b/Backend/appsettings.Development.json index e02e024..4dca5d7 100644 --- a/Backend/appsettings.Development.json +++ b/Backend/appsettings.Development.json @@ -16,8 +16,8 @@ "MySqlDBConfig": { "Server": "FYlY+w0XDIz+jmF2rlZWJw==", //0.201 "Port": "js2LutKe+rdjzdxMPQUrvQ==", - "Database": "VJB2XC+lAtzuHObDGMVOAA==", //30 - //"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp + //"Database": "VJB2XC+lAtzuHObDGMVOAA==", //30 + "Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp "Root": "SzdxEgaJJ7tcTCrUl2zKsA==", "Password": "FVAPxztxpY4gJJKQ/se4bQ==" } diff --git a/Backend/appsettings.json b/Backend/appsettings.json index 42086f8..1087b28 100644 --- a/Backend/appsettings.json +++ b/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==" diff --git a/Backend/wwwroot/forgeDemo.html b/Backend/wwwroot/forgeDemo.html index ff65298..efc5b35 100644 --- a/Backend/wwwroot/forgeDemo.html +++ b/Backend/wwwroot/forgeDemo.html @@ -252,7 +252,7 @@ /* launchViewer("dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dGEzaHFzZmZ6cWJub3V4a3BsZGt1a3NldzRzajIxdzUtYmltc19tb2RlbHMvJUUzJTgwJTkwJUU1JThGJUIwJUU1JThDJTk3JUU0JUI4JUFEJUU4JThGJUIxJUU1JUE0JUE3JUU2JUE4JTkzJUUzJTgwJTkxQVJDJUU5JTlCJTk5JUU2JUE4JUExJUU1JUJDJThGK01FUCVFNiU4QiU4NiVFNyVCMyVCQiVFNyVCNSVCMV8wMTE2Lm53ZA")*/ /*新增軌道燈軌道*/ - launchViewer("dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dGEzaHFzZmZ6cWJub3V4a3BsZGt1a3NldzRzajIxdzUtYmltc19tb2RlbHMvJUUzJTgwJTkwJUU1JThGJUIwJUU1JThDJTk3JUU0JUI4JUFEJUU4JThGJUIxJUU1JUE0JUE3JUU2JUE4JTkzJUUzJTgwJTkxQVJDJUU5JTlCJTk5JUU2JUE4JUExJUU1JUJDJThGK01FUCVFNiU4QiU4NiVFNyVCMyVCQiVFNyVCNSVCMV8wMTE5Lm53ZA") + launchViewer("dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dGEzaHFzZmZ6cWJub3V4a3BsZGt1a3NldzRzajIxdzUtYmltc19tb2RlbHMvQmFucWlhbyUyMFRhaXBlaSUyME1haW4lMjBPZmZpY2UtQUxMLm53ZA") //launchViewer('dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dnNjb2RlFX2ZvcmdlX3Rlc3QvJUUzJFTgwJTkwQVJDJUUzJTgwJTkxXzIwMjJfMTJfMTMubndk');//new ARC //launchViewer('dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dnNjb2RlX2ZvcmdlX3Rlc3QvJUUzJTgwJTkwTUVQJUUzJTgwJTkxXzIwMjJfMTJfMTMubndj');//new MEP diff --git a/FrontendWebApi/ApiControllers/DeviceManageController.cs b/FrontendWebApi/ApiControllers/DeviceManageController.cs index 2757769..f16601e 100644 --- a/FrontendWebApi/ApiControllers/DeviceManageController.cs +++ b/FrontendWebApi/ApiControllers/DeviceManageController.cs @@ -176,7 +176,7 @@ namespace FrontendWebApi.ApiControllers /// - /// 東別列表 + /// 棟別列表 /// /// /// @@ -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(sqlString); apiResult.Code = "0000"; diff --git a/FrontendWebApi/Models/Device.cs b/FrontendWebApi/Models/Device.cs index b8eb38d..d1bcfc2 100644 --- a/FrontendWebApi/Models/Device.cs +++ b/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; } + /// + /// 0single_1group；燈控是否為群控/單獨(個別燈具)控制 + /// + public Int16 forge_light_group { get; set; } } public class FloorList