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-14 18:54:22 +08:00
parent 9ad73b749b
commit 3a0ead386b
2 changed files with 50 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Backend/Controllers/DeviceManageController.cs
View File

@ -207,6 +207,7 @@ namespace Backend.Controllers
AND d.device_name_tag = @sub_system_tag AND d.device_name_tag = @sub_system_tag
AND d.device_floor_tag = @floor_tag AND d.device_floor_tag = @floor_tag
AND d.deleted = 0 AND d.deleted = 0
AND d.is_link = 1
) d ) d
JOIN building b ON d.device_building_tag = b.building_tag JOIN building b ON d.device_building_tag = b.building_tag
JOIN variable mv ON d.device_system_tag = mv.system_value AND mv.system_type = @main_system_type and mv.deleted = 0 JOIN variable mv ON d.device_system_tag = mv.system_value AND mv.system_type = @main_system_type and mv.deleted = 0

6
Repository/BackendRepository/Implement/NiagaraDataSynchronizeRepository.cs
View File

@ -290,6 +290,7 @@ namespace Repository.BackendRepository.Implement
{ {
await conn.ExecuteAsync(sb.ToString()); await conn.ExecuteAsync(sb.ToString());
} }
}
sb.Clear(); sb.Clear();
@ -343,7 +344,8 @@ namespace Repository.BackendRepository.Implement
{ {
await conn.ExecuteAsync(sb.ToString()); await conn.ExecuteAsync(sb.ToString());
} }
}
await RecoverSysTag("import_niagara_item");
#endregion #endregion
} }
catch (Exception exception) catch (Exception exception)
@ -553,7 +555,7 @@ namespace Repository.BackendRepository.Implement
FROM import_niagara_tag FROM import_niagara_tag
LIMIT 100000 LIMIT 100000
) i ON d.device_number = i.niagara_tags ) i ON d.device_number = i.niagara_tags
SET d.is_link = 1"); SET d.is_link = 1, d.deleted = 0");
using (TransactionScope scope = new TransactionScope((TransactionScopeOption)TransactionScopeAsyncFlowOption.Enabled)) using (TransactionScope scope = new TransactionScope((TransactionScopeOption)TransactionScopeAsyncFlowOption.Enabled))
{ {
await conn.ExecuteAsync(sb.ToString()); await conn.ExecuteAsync(sb.ToString());