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

[FE API] 各分表查詢改成查全部棟，building_tag 傳 null

Browse Source
This commit is contained in:
keke 2023-08-28 11:42:59 +08:00
parent 58aad75319
commit 0ec343d5e5
1 changed files with 37 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
FrontendWebApi/ApiControllers/HydroMeterController.cs
View File

@ -1021,13 +1021,7 @@ namespace FrontendWebApi.ApiControllers
}
string tableType = "day week month year";
if (input.building_tag == null)
{
apiResult.Code = "9999";
apiResult.Msg = "棟別沒有被選取";
return BadRequest(apiResult);
}
else if (input.tableType == null || !tableType.Contains(input.tableType))
if (input.tableType == null || !tableType.Contains(input.tableType))
{
apiResult.Code = "9999";
apiResult.Msg = "表單類別錯誤";
@ -1058,18 +1052,18 @@ namespace FrontendWebApi.ApiControllers
string tag_quantity = await backendRepository.GetOneAsync<string>("select system_value from variable where system_type = 'obixConfig' and system_key = 'tag_quantity' and deleted = 0");
// 將棟別字串前處理 (後續 SQL 語法可以使用 IN 的格式)
string[] parts_buildingTag = input.building_tag.Split(',');
StringBuilder fix_buildingTag = new StringBuilder();
foreach (string part in parts_buildingTag)
{
fix_buildingTag.Append("'").Append(part.Trim()).Append("', ");
}
input.building_tag = fix_buildingTag.ToString().TrimEnd(',', ' ');
//string[] parts_buildingTag = input.building_tag.Split(',');
//StringBuilder fix_buildingTag = new StringBuilder();
//foreach (string part in parts_buildingTag)
//{
// fix_buildingTag.Append("'").Append(part.Trim()).Append("', ");
//}
//input.building_tag = fix_buildingTag.ToString().TrimEnd(',', ' ');
if (tag_quantity == "5")
buildingSql = @$" and SUBSTRING_INDEX(device_number, '_', 1) in ({input.building_tag}) ";
else
buildingSql = @$" and SUBSTRING_INDEX(SUBSTRING_INDEX(device_number, '_', 2), '_', -1) in ({input.building_tag}) ";
buildingSql = @$" and SUBSTRING_INDEX(SUBSTRING_INDEX(device_number, '_', 2), '_', -1) in (select building_tag COLLATE utf8mb4_0900_ai_ci from building) ";
sqlAvgRawData = " round(kwh_result, 2) as avg_rawdata, start_timestamp, end_timestamp ";
@ -1086,7 +1080,8 @@ namespace FrontendWebApi.ApiControllers
var dateFormat = input.tableType == "day" || input.tableType == "week" ? "%Y-%m-%d" : input.tableType == "month" ? "%Y-%m" : input.tableType == "year" ? "%Y" : null;
var aemmEndDate = input.tableType == "year" ? $"year(DATE_ADD(fd.date, INTERVAL +1 {input.tableType}))" : $"DATE_ADD(fd.date, INTERVAL +1 {input.tableType})";
var aemmStaDate = input.tableType == "year" ? "year(fd.date)" : "fd.date";
var sql = $@"set @i = -1;
var sql = $@"
set @i = -1;
select fd.device_number, case when aemm.avg_rawdata = -1.0 then 'NaN' when aemm.avg_rawdata is null then 0.00 else aemm.avg_rawdata end as avg_rawdata, DATE_FORMAT(fd.date, '{dateFormat}') as timestamp
from (
select *