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-11-22 10:22:43 +08:00
parent b0295ba003
commit 0c662ec5d1
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
FrontendWebApi/ApiControllers/BuildController.cs
View File

@ -477,6 +477,7 @@ namespace FrontendWebApi.ApiControllers
var devicesql = ""; var devicesql = "";
var layer3sql = ""; var layer3sql = "";
var sWhere = ""; var sWhere = "";
var singleSubSql = "";
if (!String.IsNullOrEmpty(post.main_system_tag)) if (!String.IsNullOrEmpty(post.main_system_tag))
{ {
main_system_guidsql = $" and d.device_system_tag = '{post.main_system_tag}'"; main_system_guidsql = $" and d.device_system_tag = '{post.main_system_tag}'";
@ -484,9 +485,15 @@ namespace FrontendWebApi.ApiControllers
if (!String.IsNullOrEmpty(post.sub_system_tag)) if (!String.IsNullOrEmpty(post.sub_system_tag))
{ {
if (!string.IsNullOrEmpty(projectName) && projectName.Contains("ibms_dome") && (post.main_system_tag == "S" && post.sub_system_tag == "P")) if (!string.IsNullOrEmpty(projectName) && projectName.Contains("ibms_dome") && (post.main_system_tag == "S" && post.sub_system_tag == "P"))
{
sub_system_guidsql = $@" and (d.device_name_tag = '{post.sub_system_tag}' or d.device_name_tag = 'B')"; sub_system_guidsql = $@" and (d.device_name_tag = '{post.sub_system_tag}' or d.device_name_tag = 'B')";
singleSubSql = $"and (di.device_name_tag = '{post.sub_system_tag}' or di.device_name_tag = 'B')";
}
else else
{
sub_system_guidsql = $" and d.device_name_tag = '{post.sub_system_tag}'"; sub_system_guidsql = $" and d.device_name_tag = '{post.sub_system_tag}'";
singleSubSql = $"and di.device_name_tag = '{post.sub_system_tag}'";
}
} }
if (!String.IsNullOrEmpty(post.device_system_category_layer3)) if (!String.IsNullOrEmpty(post.device_system_category_layer3))
{ {
@ -592,7 +599,7 @@ namespace FrontendWebApi.ApiControllers
AND di.deleted = 0 AND di.deleted = 0
AND di.is_link = 1 AND di.is_link = 1
AND di.is_show_riserDiagram = 1 AND di.is_show_riserDiagram = 1
and di.device_name_tag = '{post.sub_system_tag}' {(string.IsNullOrEmpty(singleSubSql) ? $"and di.device_name_tag = '{post.sub_system_tag}'" : singleSubSql)}
limit 1000 limit 1000
) di on di.device_name_tag = d.device_name_tag ) di on di.device_name_tag = d.device_name_tag
left join floor f on d.device_floor_tag = f.full_name and f.deleted = 0 left join floor f on d.device_floor_tag = f.full_name and f.deleted = 0