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

[FE API] 更新 HydroMeterOutput 架構

Browse Source
This commit is contained in:
keke 2023-08-29 15:47:56 +08:00
parent d409e18845
commit 96c3c2426f
2 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
FrontendWebApi/ApiControllers/HydroMeterController.cs
View File

@ -830,15 +830,8 @@ namespace FrontendWebApi.ApiControllers
public FileResult OpeExportEachTotalCompareExcelElec([FromBody] HydroMeterInput input) public FileResult OpeExportEachTotalCompareExcelElec([FromBody] HydroMeterInput input)
{ {
List<List<HydroMeterOutput>> result = new List<List<HydroMeterOutput>>(); List<List<HydroMeterOutput>> result = new List<List<HydroMeterOutput>>();
var building = backendRepository.GetAllAsync<HydroBuildList>("select * from building where deleted = 0").Result;
StringBuilder fix_buildingTag = new StringBuilder();
foreach (var b in building)
{
fix_buildingTag.Append("'").Append(b.building_tag.Trim()).Append("', ");
}
input.building_tag = fix_buildingTag.ToString().TrimEnd(',', ' ');
// result.Add(ElectricListEachTotal(input).Result.Value.Data.ToList()); result.Add(ElectricListEachTotal(input).Result.Value.Data.ToList());
// --- 8/24 修改到這裡囉 --- // --- 8/24 修改到這裡囉 ---
@ -999,9 +992,9 @@ namespace FrontendWebApi.ApiControllers
[HttpPost] [HttpPost]
[Route("api/ElectricListEachTotal")] [Route("api/ElectricListEachTotal")]
public async Task<ActionResult<ApiResult<List<HydroMeterEachTotalOutput>>>> ElectricListEachTotal([FromBody] HydroMeterInput input) public async Task<ActionResult<ApiResult<List<HydroMeterOutput>>>> ElectricListEachTotal([FromBody] HydroMeterInput input)
{ {
ApiResult<List<HydroMeterEachTotalOutput>> apiResult = new ApiResult<List<HydroMeterEachTotalOutput>>(jwt_str); ApiResult<List<HydroMeterOutput>> apiResult = new ApiResult<List<HydroMeterOutput>>(jwt_str);
if (!jwtlife) if (!jwtlife)
{ {
apiResult.Code = "5000"; apiResult.Code = "5000";
@ -1053,7 +1046,7 @@ namespace FrontendWebApi.ApiControllers
if (string.IsNullOrEmpty(isTable)) //check for has table or not if (string.IsNullOrEmpty(isTable)) //check for has table or not
{ {
apiResult.Code = "0000"; apiResult.Code = "0000";
apiResult.Data = new List<HydroMeterEachTotalOutput>() { }; apiResult.Data = new List<HydroMeterOutput>() { };
return Ok(apiResult); return Ok(apiResult);
} }
@ -1073,11 +1066,11 @@ order by a.priority";
Logger.LogInformation("SQL = " + sql + " building=" + input.building_tag + " floor_tag = " + input.floor_tag); Logger.LogInformation("SQL = " + sql + " building=" + input.building_tag + " floor_tag = " + input.floor_tag);
var rawData = await backendRepository.GetAllAsync<HydroMeterRawDataEachTotalOutput>(sql); var rawData = await backendRepository.GetAllAsync<HydroMeterRawDataEachTotalOutput>(sql);
List<HydroMeterEachTotalOutput> ResultData = new List<HydroMeterEachTotalOutput>(); List<HydroMeterOutput> ResultData = new List<HydroMeterOutput>();
ResultData = rawData ResultData = rawData
.GroupBy(x => new { building_tag = x.device_number.Split("_")[1], floor_tag = x.device_number.Split("_")[4], device_master = x.device_number.Split("_")[5], device_serial_tag = x.device_number.Split("_")[7], device_number = x.device_number }) .GroupBy(x => new { building_tag = x.device_number.Split("_")[1], floor_tag = x.device_number.Split("_")[4], device_master = x.device_number.Split("_")[5], device_serial_tag = x.device_number.Split("_")[7], device_number = x.device_number })
.Select(x => new HydroMeterEachTotalOutput { building_tag = x.Key.building_tag, floor_tag = x.Key.floor_tag, device_serial_tag = x.Key.device_serial_tag, device_master = x.Key.device_master, device_number = x.Key.device_number }) .Select(x => new HydroMeterOutput { building_tag = x.Key.building_tag, floor_tag = x.Key.floor_tag, device_serial_tag = x.Key.device_serial_tag, device_master = x.Key.device_master, device_number = x.Key.device_number })
.ToList(); .ToList();
foreach (var l in ResultData) foreach (var l in ResultData)

15
FrontendWebApi/Models/HydroMeter.cs
View File

@ -49,21 +49,6 @@ namespace FrontendWebApi.Models
public string avg_rawdata { get; set; } public string avg_rawdata { get; set; }
} }
public class HydroMeterEachTotalOutput
{
public string building_name { get; set; }
public string building_tag { get; set; }
public string floor_tag { get; set; }
public string device_serial_tag { get; set; }
public string device_master { get; set; }
public string device_number { get; set; }
public string device_full_name { get; set; }
public string total { get; set; }
public string price { get; set; }
public string total_price { get; set; }
public List<HydroMeterRawDataOutput> rawData { get; set; }
}
public class HydroMeterRawDataEachTotalOutput public class HydroMeterRawDataEachTotalOutput
{ {
public string building_name { get; set; } public string building_name { get; set; }