From be20f97f3b926b1a3be2bbc0ec7682ba0035496c Mon Sep 17 00:00:00 2001 From: dev02 Date: Fri, 5 May 2023 11:45:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B8=AC=E8=A9=A6=E9=8C=AF?= =?UTF-8?q?=E8=AA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApiControllers/BuildController.cs | 19 +++++++------ FrontendWebApi/Models/Build.cs | 28 +++++++++---------- 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/FrontendWebApi/ApiControllers/BuildController.cs b/FrontendWebApi/ApiControllers/BuildController.cs index 3cf3c6b..b0e97a7 100644 --- a/FrontendWebApi/ApiControllers/BuildController.cs +++ b/FrontendWebApi/ApiControllers/BuildController.cs @@ -244,7 +244,7 @@ namespace FrontendWebApi.ApiControllers priority = sub.Select(a => a.subpriority).FirstOrDefault(), device_system_tag = sub.Select(a => a.device_system_tag).FirstOrDefault(), OpenTab = sub.Select(a => a.OpenTab).FirstOrDefault(), - system_url = sub.Select(a => a.system_url).FirstOrDefault() + system_url = sub.Select(a => a.left_system_url).FirstOrDefault() }; main_System.Sub_system.Add(sub_System); } @@ -268,6 +268,9 @@ namespace FrontendWebApi.ApiControllers [Route("api/GetSubSystem")] public async Task>> GetSubSystem(GetSubPost get) { + get.building_tag = "D2"; + get.main_system_tag = "EE"; + get.sub_system_tag = "E4"; ApiResult apiResult = new ApiResult(jwt_str); if (!jwtlife) { @@ -292,15 +295,15 @@ namespace FrontendWebApi.ApiControllers Sub_system sub_System = new Sub_system() { sub_system_guid = sub_system.sub_system_tag, - system_url = sub_system.system_url, - drawing = sub_system.drawing, + left_system_url = sub_system.left_system_url, + left_drawing = sub_system.left_drawing, Floors = new List(), full_name = sub_system.subfull_name, - icon_click = sub_system.icon_click, - icon_click_url = sub_system.icon_click_url, - planimetric_click = sub_system.planimetric_click, - planimetric_floor_guid = sub_system.planimetric_floor_guid, - riser_diagram_url = sub_system.riser_diagram_url, + left_icon_click = sub_system.left_icon_click, + left_icon_click_url = sub_system.left_icon_click_url, + left_planimetric_click = sub_system.left_planimetric_click, + left_planimetric_floor_guid = sub_system.left_planimetric_floor_guid, + left_riser_diagram_url = sub_system.left_riser_diagram_url, priority = sub_system.subpriority }; foreach (var floor in floorsql) diff --git a/FrontendWebApi/Models/Build.cs b/FrontendWebApi/Models/Build.cs index be0a4ca..2cc3bf5 100644 --- a/FrontendWebApi/Models/Build.cs +++ b/FrontendWebApi/Models/Build.cs @@ -30,18 +30,18 @@ namespace FrontendWebApi.Models { public string main_system_tag { get; set; } public string sub_system_tag { get; set; } - public byte drawing { get; set; } - public byte icon_click { get; set; } - public string icon_click_url { get; set; } - public string system_url { get; set; } + public byte left_drawing { get; set; } + public byte left_icon_click { get; set; } + public string left_icon_click_url { get; set; } + public string left_system_url { get; set; } public string mafull_name { get; set; } public int mapriority { get; set; } public string code { get; set; } public string subfull_name { get; set; } public int subpriority { get; set; } - public byte planimetric_click { get; set; } - public string planimetric_floor_guid { get; set; } - public string riser_diagram_url { get; set; } + public byte left_planimetric_click { get; set; } + public string left_planimetric_floor_guid { get; set; } + public string left_riser_diagram_url { get; set; } public string device_building_tag { get; set; } public string device_system_tag { get; set; } public byte OpenTab { get; set; } @@ -100,14 +100,14 @@ namespace FrontendWebApi.Models public string sub_system_guid { get; set; } public string full_name { get; set; } public int priority { get; set; } - public byte drawing { get; set; } - public byte icon_click { get; set; } - public string icon_click_url { get; set; } - public string system_url { get; set; } + public byte left_drawing { get; set; } + public byte left_icon_click { get; set; } + public string left_icon_click_url { get; set; } + public string left_system_url { get; set; } public List Floors { get; set; } - public byte planimetric_click { get; set; } - public string planimetric_floor_guid { get; set; } - public string riser_diagram_url { get; set; } + public byte left_planimetric_click { get; set; } + public string left_planimetric_floor_guid { get; set; } + public string left_riser_diagram_url { get; set; } } public class Floor