jay.chang/ibms-MCUT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改測試錯誤

Browse Source
This commit is contained in:
dev02 2023-05-05 11:45:43 +08:00
parent 8071a0bb50
commit be20f97f3b
2 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
FrontendWebApi/ApiControllers/BuildController.cs
View File

@ -244,7 +244,7 @@ namespace FrontendWebApi.ApiControllers
priority = sub.Select(a => a.subpriority).FirstOrDefault(), priority = sub.Select(a => a.subpriority).FirstOrDefault(),
device_system_tag = sub.Select(a => a.device_system_tag).FirstOrDefault(), device_system_tag = sub.Select(a => a.device_system_tag).FirstOrDefault(),
OpenTab = sub.Select(a => a.OpenTab).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); main_System.Sub_system.Add(sub_System);
} }
@ -268,6 +268,9 @@ namespace FrontendWebApi.ApiControllers
[Route("api/GetSubSystem")] [Route("api/GetSubSystem")]
public async Task<ActionResult<ApiResult<Sub_system>>> GetSubSystem(GetSubPost get) public async Task<ActionResult<ApiResult<Sub_system>>> GetSubSystem(GetSubPost get)
{ {
get.building_tag = "D2";
get.main_system_tag = "EE";
get.sub_system_tag = "E4";
ApiResult<Sub_system> apiResult = new ApiResult<Sub_system>(jwt_str); ApiResult<Sub_system> apiResult = new ApiResult<Sub_system>(jwt_str);
if (!jwtlife) if (!jwtlife)
{ {
@ -292,15 +295,15 @@ namespace FrontendWebApi.ApiControllers
Sub_system sub_System = new Sub_system() Sub_system sub_System = new Sub_system()
{ {
sub_system_guid = sub_system.sub_system_tag, sub_system_guid = sub_system.sub_system_tag,
system_url = sub_system.system_url, left_system_url = sub_system.left_system_url,
drawing = sub_system.drawing, left_drawing = sub_system.left_drawing,
Floors = new List<Floor>(), Floors = new List<Floor>(),
full_name = sub_system.subfull_name, full_name = sub_system.subfull_name,
icon_click = sub_system.icon_click, left_icon_click = sub_system.left_icon_click,
icon_click_url = sub_system.icon_click_url, left_icon_click_url = sub_system.left_icon_click_url,
planimetric_click = sub_system.planimetric_click, left_planimetric_click = sub_system.left_planimetric_click,
planimetric_floor_guid = sub_system.planimetric_floor_guid, left_planimetric_floor_guid = sub_system.left_planimetric_floor_guid,
riser_diagram_url = sub_system.riser_diagram_url, left_riser_diagram_url = sub_system.left_riser_diagram_url,
priority = sub_system.subpriority priority = sub_system.subpriority
}; };
foreach (var floor in floorsql) foreach (var floor in floorsql)

28
FrontendWebApi/Models/Build.cs
View File

@ -30,18 +30,18 @@ namespace FrontendWebApi.Models
{ {
public string main_system_tag { get; set; } public string main_system_tag { get; set; }
public string sub_system_tag { get; set; } public string sub_system_tag { get; set; }
public byte drawing { get; set; } public byte left_drawing { get; set; }
public byte icon_click { get; set; } public byte left_icon_click { get; set; }
public string icon_click_url { get; set; } public string left_icon_click_url { get; set; }
public string system_url { get; set; } public string left_system_url { get; set; }
public string mafull_name { get; set; } public string mafull_name { get; set; }
public int mapriority { get; set; } public int mapriority { get; set; }
public string code { get; set; } public string code { get; set; }
public string subfull_name { get; set; } public string subfull_name { get; set; }
public int subpriority { get; set; } public int subpriority { get; set; }
public byte planimetric_click { get; set; } public byte left_planimetric_click { get; set; }
public string planimetric_floor_guid { get; set; } public string left_planimetric_floor_guid { get; set; }
public string riser_diagram_url { get; set; } public string left_riser_diagram_url { get; set; }
public string device_building_tag { get; set; } public string device_building_tag { get; set; }
public string device_system_tag { get; set; } public string device_system_tag { get; set; }
public byte OpenTab { get; set; } public byte OpenTab { get; set; }
@ -100,14 +100,14 @@ namespace FrontendWebApi.Models
public string sub_system_guid { get; set; } public string sub_system_guid { get; set; }
public string full_name { get; set; } public string full_name { get; set; }
public int priority { get; set; } public int priority { get; set; }
public byte drawing { get; set; } public byte left_drawing { get; set; }
public byte icon_click { get; set; } public byte left_icon_click { get; set; }
public string icon_click_url { get; set; } public string left_icon_click_url { get; set; }
public string system_url { get; set; } public string left_system_url { get; set; }
public List<Floor> Floors { get; set; } public List<Floor> Floors { get; set; }
public byte planimetric_click { get; set; } public byte left_planimetric_click { get; set; }
public string planimetric_floor_guid { get; set; } public string left_planimetric_floor_guid { get; set; }
public string riser_diagram_url { get; set; } public string left_riser_diagram_url { get; set; }
} }
public class Floor public class Floor