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

[後端] 修改api 判斷

Browse Source
This commit is contained in:
dev02 2023-10-04 10:42:10 +08:00
parent 6bcaaef80f
commit af876d7e77
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Backend/Services/Implement/webRequestService.cs
View File

@ -240,7 +240,7 @@ namespace Backend.Services.Implement
// result.Add(row); // result.Add(row);
// } // }
// else if (tagName.Split('_').Length == 6) // else if (tagName.Split('_').Length == 6)
// { //巨蛋 tag 5 段版本 // { //巨蛋 tag 5 段版本
// ImpNiaItem row = new ImpNiaItem(); // ImpNiaItem row = new ImpNiaItem();
// if (tagName.Split('_')[1] == "S" || tagName.Split('_')[1] == "B" || tagName.Split('_')[1] == "CWB") //for security system and parking system // if (tagName.Split('_')[1] == "S" || tagName.Split('_')[1] == "B" || tagName.Split('_')[1] == "CWB") //for security system and parking system
@ -275,7 +275,7 @@ namespace Backend.Services.Implement
//} //}
#endregion #endregion
foreach(var n in conPoint) foreach (var n in conPoint)
{ {
if (n.name.Split('/').Length == 9) if (n.name.Split('/').Length == 9)
{ {

2
FrontendWebApi/ApiControllers/HistoryController.cs
View File

@ -570,7 +570,7 @@ namespace FrontendWebApi.ApiControllers
join variable v1 on v1.system_value = b.device_system_tag and v1.deleted = 0 and v1.system_type = 'device_system_category_layer2' join variable v1 on v1.system_value = b.device_system_tag and v1.deleted = 0 and v1.system_type = 'device_system_category_layer2'
join variable v2 on v2.system_value = b.device_name_tag and v2.deleted = 0 and v2.system_type = 'device_system_category_layer3' join variable v2 on v2.system_value = b.device_name_tag and v2.deleted = 0 and v2.system_type = 'device_system_category_layer3'
where a.deleted = 0 and b.deleted = 0 and v2.deleted = 0 and v1.deleted = 0 where a.deleted = 0 and b.deleted = 0 and v2.deleted = 0 and v1.deleted = 0
and a.unit is not null and b.device_number in @Device_number and a.unit is not null and b.device_number in @Device_number and a.is_link = 1
order by c.priority,b.priority;" order by c.priority,b.priority;"
, new { Device_number = postDevice.select_data.Select(a => a.device_number).ToList() } , new { Device_number = postDevice.select_data.Select(a => a.device_number).ToList() }
); );