This commit is contained in:
2021-12-23 19:08:13 +00:00
parent 20e4826e9c
commit 3b83c29f11

View File

@@ -15,6 +15,7 @@ using Newtonsoft.Json.Linq;
using System.IO; using System.IO;
using System.IO.Compression; using System.IO.Compression;
using ChoETL; using ChoETL;
using System;
namespace AyaNova.Api.Controllers namespace AyaNova.Api.Controllers
{ {
@@ -99,12 +100,14 @@ namespace AyaNova.Api.Controllers
string outputZipFullpath = System.IO.Path.Combine(FileUtil.TemporaryFilesFolder, baseFileName + ".zip"); string outputZipFullpath = System.IO.Path.Combine(FileUtil.TemporaryFilesFolder, baseFileName + ".zip");
log.LogDebug($"Calling render export data to file {outputZipFullpath}"); log.LogDebug($"Calling render export data to file {outputZipFullpath}");
try
{
switch (format) switch (format)
{ {
case "csv": case "csv":
using (var w = new ChoCSVWriter(outputSourceFullPath).WithFirstLineHeader()) using (var w = new ChoCSVWriter(outputSourceFullPath).WithFirstLineHeader())
{ {
var dat = await ((IExportAbleObject)biz).GetExportData(selectedRequest); var dat = await ((IExportAbleObject)biz).GetExportData(selectedRequest, DateTime.UtcNow.AddMinutes(ServerBootConfig.AYANOVA_REPORT_RENDERING_TIMEOUT));
w.Write(ToDynamicList(dat)); w.Write(ToDynamicList(dat));
} }
break; break;
@@ -112,7 +115,7 @@ namespace AyaNova.Api.Controllers
using (StreamWriter file = System.IO.File.CreateText(outputSourceFullPath)) using (StreamWriter file = System.IO.File.CreateText(outputSourceFullPath))
using (JsonTextWriter writer = new JsonTextWriter(file)) using (JsonTextWriter writer = new JsonTextWriter(file))
{ {
var dat = await ((IExportAbleObject)biz).GetExportData(selectedRequest); var dat = await ((IExportAbleObject)biz).GetExportData(selectedRequest, DateTime.UtcNow.AddMinutes(ServerBootConfig.AYANOVA_REPORT_RENDERING_TIMEOUT));
dat.WriteTo(writer); dat.WriteTo(writer);
} }
break; break;
@@ -127,7 +130,12 @@ namespace AyaNova.Api.Controllers
log.LogDebug($"Completed, returning results"); log.LogDebug($"Completed, returning results");
return Ok(ApiOkResponse.Response(baseFileName + ".zip")); return Ok(ApiOkResponse.Response(baseFileName + ".zip"));
}
catch (ReportRenderTimeOutException)
{
log.LogInformation($"RenderExport timeout data list key: {selectedRequest.DataListKey}, record count:{selectedRequest.SelectedRowIds.LongLength}, user:{UserNameFromContext.Name(HttpContext.Items)} ");
return BadRequest(new ApiErrorResponse(ApiErrorCode.INVALID_OPERATION, null, "timeout - select fewer records"));
}
} }