diff --git a/REPORT_API_ver6/Controllers/ExportAPI.cs b/REPORT_API_ver6/Controllers/ExportAPI.cs index 2b2865c..fa6db6e 100644 --- a/REPORT_API_ver6/Controllers/ExportAPI.cs +++ b/REPORT_API_ver6/Controllers/ExportAPI.cs @@ -128,12 +128,33 @@ namespace REPORT_API_ver6.Controllers Project project = new Project(); PkeyInfo pkeyInfo = new PkeyInfo(skey); - DataTable headerTable = project.getExportHeader(pkeyInfo.Pkey, pkeyInfo.isKiwi, userInfo.IsAdmin); - DataTable bodyTable = project.getProjectData(pkeyInfo.Pkey, "", "", "", "", pkeyInfo.isKiwi, 1,"", "", type); - DataTable exportTable = project.makeExportTable(headerTable, bodyTable); + string fileName = "[DATA]" + pkeyInfo.Pkey + "_" + DateTime.Now.ToString("yyyy-MM-dd HHmmss") + ".xlsx"; + byte[] fileByteArray = project.makeDataAndGuidFile(pkeyInfo, userInfo, type, "ALL"); + + Response.StatusCode = (int)HttpStatusCode.OK; + return File(fileByteArray, "application/octet-stream", fileName); + } + + Response.StatusCode = (int)HttpStatusCode.Unauthorized; + return Content(null); + } + + [Route("data/{start}/{end}")] + [HttpGet] + public IActionResult ExportDataWithDate( + [FromHeader] string token, [FromHeader] string skey, [FromHeader] string type + ,[FromRoute] string start, [FromRoute] string end + ) + { + UserInfo userInfo = Security.ValidateToken(token); + + if (userInfo != null) + { + Project project = new Project(); + PkeyInfo pkeyInfo = new PkeyInfo(skey); string fileName = "[DATA]" + pkeyInfo.Pkey + "_" + DateTime.Now.ToString("yyyy-MM-dd HHmmss") + ".xlsx"; - byte[] fileByteArray = Common.DataTableToExcel(exportTable); + byte[] fileByteArray = project.makeDataAndGuidFile(pkeyInfo, userInfo, type, "ALL", start, end); Response.StatusCode = (int)HttpStatusCode.OK; return File(fileByteArray, "application/octet-stream", fileName); @@ -152,10 +173,9 @@ namespace REPORT_API_ver6.Controllers { Project project = new Project(); PkeyInfo pkeyInfo = new PkeyInfo(skey); - DataTable guideTable = project.makeGuideTable(pkeyInfo.Pkey, pkeyInfo.isKiwi, userInfo.IsAdmin); string fileName = "[GUIDE]" + pkeyInfo.Pkey + "_" + DateTime.Now.ToString("yyyy-MM-dd HHmmss") + ".xlsx"; - byte[] fileByteArray = Common.DataTableToExcel(guideTable); + byte[] fileByteArray = project.makeDataAndGuidFile(pkeyInfo, userInfo, "", "GUIDE"); Response.StatusCode = (int)HttpStatusCode.OK; return File(fileByteArray, "application/octet-stream", fileName); diff --git a/REPORT_API_ver6/Models/CommonModels.cs b/REPORT_API_ver6/Models/CommonModels.cs new file mode 100644 index 0000000..6df54f6 --- /dev/null +++ b/REPORT_API_ver6/Models/CommonModels.cs @@ -0,0 +1,15 @@ +using System.Data; + +namespace REPORT_API_ver6.Models; + +public class DataTabelToExcelSheet +{ + public DataTable ExcelData { get; set; } = new DataTable(); + public string SheetName { get; set; } = string.Empty; + public DataTabelToExcelSheet(DataTable excelData, string sheetName) + { + ExcelData = excelData; + SheetName = sheetName; + } + public DataTabelToExcelSheet() { } +} \ No newline at end of file diff --git a/REPORT_API_ver6/REPORT_API_ver6.csproj b/REPORT_API_ver6/REPORT_API_ver6.csproj index 2a6b89e..40b81e3 100644 --- a/REPORT_API_ver6/REPORT_API_ver6.csproj +++ b/REPORT_API_ver6/REPORT_API_ver6.csproj @@ -23,7 +23,6 @@ - diff --git a/REPORT_API_ver6/Services/Common.cs b/REPORT_API_ver6/Services/Common.cs index 38b1369..38de27f 100644 --- a/REPORT_API_ver6/Services/Common.cs +++ b/REPORT_API_ver6/Services/Common.cs @@ -11,6 +11,7 @@ using System.Net; using System.Text; using System.Text.RegularExpressions; using System.Web; +using REPORT_API_ver6.Models; namespace REPORT_API_ver6.Services { @@ -493,6 +494,35 @@ namespace REPORT_API_ver6.Services return excelPackage.GetAsByteArray(); } + + /// + /// DataTable을 Excel로 변환 + /// + /// 변환할 DataTable + /// 만들 Sheet Name / 기본값 : Sheet1 + /// Excel파일 + public static byte[] DataTableToExcel(List excelDataList) + { + ExcelPackage excelPackage = new ExcelPackage(); + + int i = 1; + foreach(DataTabelToExcelSheet excelData in excelDataList) + { + + if (String.IsNullOrEmpty(excelData.SheetName)) + { + excelData.SheetName = "Sheet" + i; + } + + ExcelWorksheet worksheet = excelPackage.Workbook.Worksheets.Add(excelData.SheetName); + worksheet.Cells["A1"].LoadFromDataTable(excelData.ExcelData, true); + + i++; + } + + + return excelPackage.GetAsByteArray(); + } /// /// DataTable을 CSV로 변환 diff --git a/REPORT_API_ver6/Services/Project.cs b/REPORT_API_ver6/Services/Project.cs index 1a38073..ca05d08 100644 --- a/REPORT_API_ver6/Services/Project.cs +++ b/REPORT_API_ver6/Services/Project.cs @@ -1918,14 +1918,36 @@ namespace REPORT_API_ver6.Services returnTable.Rows.Add(labelRow); j++; } - } } - return returnTable; - } + + public byte[] makeDataAndGuidFile(PkeyInfo pkeyInfo, UserInfo userInfo, string dataType, string fileTarget, string start = "", string end = "") + { + List excelDataList = new List(); + + if (fileTarget.ToUpper() == "ALL" || fileTarget.ToUpper() == "DATA") + { + DataTable headerTable = getExportHeader(pkeyInfo.Pkey, pkeyInfo.isKiwi, userInfo.IsAdmin); + DataTable bodyTable = getProjectData(pkeyInfo.Pkey, "", "", start, end, pkeyInfo.isKiwi, 1,"", "", dataType); + DataTable dataTable = makeExportTable(headerTable, bodyTable); + + excelDataList.Add(new DataTabelToExcelSheet(dataTable, "DATA")); + } + + if (fileTarget.ToUpper() == "ALL" || fileTarget.ToUpper() == "GUIDE") + { + DataTable guideTable = makeGuideTable(pkeyInfo.Pkey, pkeyInfo.isKiwi, userInfo.IsAdmin); + + excelDataList.Add(new DataTabelToExcelSheet(guideTable, "GUIDE")); + } + + return Common.DataTableToExcel(excelDataList); + } + + /// /// 저장된 북마크 정보 반환 ///