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

[後端] 修改水報表同步

Browse Source
This commit is contained in:
dev02 2023-06-08 11:40:00 +08:00
parent 330b1964f2
commit 9d36817c52
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
FrontendWebApi/ApiControllers/HydroMeterController.cs
View File

@ -216,8 +216,21 @@ namespace FrontendWebApi.ApiControllers
string sqlWhere = ""; string sqlWhere = "";
string sqlGroup = ""; string sqlGroup = "";
string sqlAvgRawData = ""; string sqlAvgRawData = "";
string buildingSql = "";
string tag_quantity = await backendRepository.GetOneAsync<string>("select system_value from variable where system_type = 'obixConfig' and system_key = 'tag_quantity' and deleted = 0");
if (tag_quantity == "5")
buildingSql = " and SUBSTRING_INDEX(device_number, '_', 1) = @building_tag ";
else
buildingSql = " and SUBSTRING_INDEX(SUBSTRING_INDEX(device_number, '_', 2), '_', -1) = @building_tag ";
if (input.floor_tag.Count > 0) if (input.floor_tag.Count > 0)
{
if (tag_quantity == "5")
sqlWhere = $@" and substring_index(substring_index(device_number, '_', 3), '_', -1) in @floor_tag "; sqlWhere = $@" and substring_index(substring_index(device_number, '_', 3), '_', -1) in @floor_tag ";
else
sqlWhere = $@" and substring_index(substring_index(device_number, '_', 5), '_', -1) in @floor_tag ";
}
if (input.tableType == "year") if (input.tableType == "year")
{ {
@ -242,7 +255,7 @@ namespace FrontendWebApi.ApiControllers
( (
select device_number select device_number
from {table} from {table}
where start_timestamp >= @startTime and end_timestamp < @endTime and point = 'RCV' and SUBSTRING_INDEX(device_number, '_', 1) = @building_tag where start_timestamp >= @startTime and end_timestamp < @endTime and point = 'RCV' {buildingSql}
{sqlWhere} {sqlWhere}
group by device_number group by device_number
) dn ) dn
@ -251,7 +264,7 @@ namespace FrontendWebApi.ApiControllers
left join ( left join (
select device_number, {sqlAvgRawData} select device_number, {sqlAvgRawData}
from {table} from {table}
where start_timestamp >= @startTime and end_timestamp < @endTime and point = 'RCV' and SUBSTRING_INDEX(device_number, '_', 1) = @building_tag where start_timestamp >= @startTime and end_timestamp < @endTime and point = 'RCV' {buildingSql}
{sqlWhere} {sqlGroup} {sqlWhere} {sqlGroup}
) aemm on aemm.start_timestamp >= fd.date and aemm.end_timestamp < DATE_ADD(fd.date, INTERVAL +1 {input.tableType}) and aemm.device_number = fd.device_number ) aemm on aemm.start_timestamp >= fd.date and aemm.end_timestamp < DATE_ADD(fd.date, INTERVAL +1 {input.tableType}) and aemm.device_number = fd.device_number
order by fd.device_number, fd.date"; order by fd.device_number, fd.date";