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

修改device list

Browse Source
This commit is contained in:
dev02 2022-11-18 17:18:04 +08:00
parent c5416dbd7c
commit 46e7515d44
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
FrontendWebApi/ApiControllers/DeviceManageController.cs
View File

@ -154,7 +154,7 @@ namespace FrontendWebApi.ApiControllers
{ {
var sqlString = $@"select f.full_name as floor_tag var sqlString = $@"select f.full_name as floor_tag
from sub_system_floor ssf from sub_system_floor ssf
join floor f on ssf.floor_tag = f.full_name and f.deleted = 0 join floor f on ssf.floor_tag = f.full_name and ssf.building_tag = f.building_tag and f.deleted = 0
where ssf.deleted = 0 and f.building_tag = @building_tag and sub_system_tag = @sub_system_tag order by f.priority"; where ssf.deleted = 0 and f.building_tag = @building_tag and sub_system_tag = @sub_system_tag order by f.priority";
var param = new { @building_tag = fd.building_tag, @sub_system_tag = fd.sub_system_tag }; var param = new { @building_tag = fd.building_tag, @sub_system_tag = fd.sub_system_tag };
var fl = await backendRepository.GetAllAsync<FloorList>(sqlString, param); var fl = await backendRepository.GetAllAsync<FloorList>(sqlString, param);
@ -198,8 +198,11 @@ namespace FrontendWebApi.ApiControllers
try try
{ {
var sqlString = $@"select full_name, InitMapName as map_name, concat(floor_map_name,'.svg') as floor_map_name from floor where deleted = 0 and building_tag = @building_tag and full_name = ifnull(@floor_tag, full_name)"; var sqlString = $@"select f.full_name, f.InitMapName as map_name, concat(f.floor_map_name,'.svg') as floor_map_name
var param = new { @building_tag = fd.building_tag, @floor_tag = fd.floor_tag }; from sub_system_floor ssf
join floor f on ssf.floor_tag = f.full_name and ssf.building_tag = f.building_tag and f.deleted = 0
where ssf.deleted = 0 and ssf.building_tag = @building_tag and ssf.sub_system_tag = @sub_system_tag and ssf.floor_tag = ifnull(@floor_tag, ssf.floor_tag);";
var param = new { @building_tag = fd.building_tag, @floor_tag = fd.floor_tag, @sub_system_tag = fd.sub_system_tag };
var fl = await backendRepository.GetAllAsync<FloorList>(sqlString, param); var fl = await backendRepository.GetAllAsync<FloorList>(sqlString, param);
foreach (var f in fl) foreach (var f in fl)