zhibinlv
/
QRAPI
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

提交

master
zxy 2 weeks ago
parent
8e8d81c4f5
commit
97d26636b5
5 changed files with 348 additions and 246 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 51
      API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs
  2. 92
      API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs
  3. 91
      API/Wood.Service/Controllers/NormalBaseController.cs
  4. 58
      API/Wood.Service/Controllers/TaskConifgureController.cs
  5. 302
      API/Wood.Util/EntityHelper.cs

51
API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs
View File

@ -18,7 +18,7 @@ using TaskManager.EntityFramework.Repository;
namespace TaskManager.Controllers namespace TaskManager.Controllers
{ {
public class CheryRecurringJobInputPageController<T,OUTPUT> : RecurringJobBaseController where T : BaseEntity public class CheryRecurringJobInputPageController<T,OUTPUT> : RecurringJobBaseController where T : BaseEntity ,new()
{ {
protected readonly IRepository<T> _repository; protected readonly IRepository<T> _repository;
public CheryRecurringJobInputPageController(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<T> repository) : base(httpClient, jobDbContext, log) public CheryRecurringJobInputPageController(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<T> repository) : base(httpClient, jobDbContext, log)
@ -256,19 +256,14 @@ namespace TaskManager.Controllers
}; };
// 可以在这里构建表达式树过滤条件 // 可以在这里构建表达式树过滤条件
Expression<Func<T, bool>> filter = null; //Expression<Func<T, bool>> filter = null;
var pagedResult = await _repository.GetPagedAsync(null, pagingParams); var pagedResult = await _repository.GetPagedAsync(null, pagingParams);
return await ExportFile(pagedResult.Data, Guid.NewGuid().ToString() + ".xlsx");
var dataTable = pagedResult.Data.ToDataTable();
return await ExportFile(dataTable, Guid.NewGuid().ToString() + ".xlsx");
} }
protected async Task<FileStreamResult> ExportFile(DataTable dtos, string fileName) protected async Task<FileStreamResult> ExportFile(ICollection<T> dtos, string fileName)
{ {
var excelExporter = HttpContext.RequestServices.GetRequiredService<IExcelExporter>(); var excelExporter = HttpContext.RequestServices.GetRequiredService<IExcelExporter>();
var res = await excelExporter.ExportAsByteArray(dtos); var res = await excelExporter.ExportAsByteArray(dtos);
@ -278,6 +273,44 @@ namespace TaskManager.Controllers
[HttpGet]
public async Task<IActionResult> GetImportTemplate()
{
try
{
// 创建导入模板生成器
var importer = new ExcelImporter();
// 生成导入模板流（这里假设使用 YourModel 作为导入模型）
var bytes = await importer.GenerateTemplateBytes<T>();
using var stream = new MemoryStream(bytes);
stream.Seek(0, SeekOrigin.Begin);
// 设置友好的文件名，例如："导入模板_20250530.xlsx"
var fileName = $"导入模板_{DateTime.Now:yyyyMMdd}.xlsx";
// 返回文件流结果
return File(
fileStream: stream,
contentType: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
fileDownloadName: fileName);
}
catch (Exception ex)
{
// 记录异常日志
Console.WriteLine($"生成导入模板时出错: {ex.Message}");
// 返回错误响应
return StatusCode(500, "生成导入模板时发生错误");
}
}

92
API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs
View File

@ -28,32 +28,7 @@ namespace TaskManager.Controllers
_repository = repository; _repository = repository;
} }
protected async Task<FileStreamResult> ExportFile<T>(ICollection<T> dtos, string fileName) where T : class, new()
{
var excelExporter = HttpContext.RequestServices.GetRequiredService<IExcelExporter>();
var res = await excelExporter.ExportAsByteArray(dtos);
return new FileStreamResult(new MemoryStream(res), "application/octet-stream") { FileDownloadName = DateTime.Now.ToString("yyyyMMddHHmm") + "_" + fileName };
}
public async Task<FileStreamResult> Export([FromQuery] int pageNumber = 1,
[FromQuery] int pageSize = 10,
[FromQuery] string sortBy = "",
[FromQuery] bool isAscending = true,
[FromQuery] Dictionary<string, string> filters = null)
{
var pagingParams = new PagingParams
{
PageNumber = pageNumber,
PageSize = pageSize,
SortBy = sortBy,
IsAscending = isAscending,
Filters = filters
};
// 可以在这里构建表达式树过滤条件
Expression<Func<T, bool>> filter = null;
var pagedResult = await _repository.GetPagedAsync(filter, pagingParams);
return await ExportFile(pagedResult.Data.ToDataTable(), Guid.NewGuid().ToString() + ".xlsx");
}
[NonAction] [NonAction]
public async Task<List<ToutputDetial>> FetchAllDataAsync(string inputdate) public async Task<List<ToutputDetial>> FetchAllDataAsync(string inputdate)
@ -381,8 +356,33 @@ namespace TaskManager.Controllers
return Ok(pagedResult); return Ok(pagedResult);
} }
protected async Task<FileStreamResult> ExportFile(DataTable dtos, string fileName)
[HttpGet]
public async Task<FileStreamResult> Export([FromQuery] int pageNumber = 1,
[FromQuery] int pageSize = 10,
[FromQuery] string sortBy = "",
[FromQuery] bool isAscending = true,
[FromQuery] Dictionary<string, string> filters = null)
{
var pagingParams = new PagingParams
{
PageNumber = pageNumber,
PageSize = pageSize,
SortBy = sortBy,
IsAscending = isAscending,
Filters = filters
};
// 可以在这里构建表达式树过滤条件
//Expression<Func<T, bool>> filter = null;
var pagedResult = await _repository.GetPagedAsync(null, pagingParams);
return await ExportFile(pagedResult.Data, Guid.NewGuid().ToString() + ".xlsx");
}
protected async Task<FileStreamResult> ExportFile(ICollection<T> dtos, string fileName)
{ {
var excelExporter = HttpContext.RequestServices.GetRequiredService<IExcelExporter>(); var excelExporter = HttpContext.RequestServices.GetRequiredService<IExcelExporter>();
var res = await excelExporter.ExportAsByteArray(dtos); var res = await excelExporter.ExportAsByteArray(dtos);
@ -392,6 +392,42 @@ namespace TaskManager.Controllers
[HttpGet]
public async Task<IActionResult> GetImportTemplate()
{
try
{
// 创建导入模板生成器
var importer = new ExcelImporter();
// 生成导入模板流（这里假设使用 YourModel 作为导入模型）
var bytes = await importer.GenerateTemplateBytes<T>();
using var stream = new MemoryStream(bytes);
stream.Seek(0, SeekOrigin.Begin);
// 设置友好的文件名，例如："导入模板_20250530.xlsx"
var fileName = $"导入模板_{DateTime.Now:yyyyMMdd}.xlsx";
// 返回文件流结果
return File(
fileStream: stream,
contentType: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
fileDownloadName: fileName);
}
catch (Exception ex)
{
// 记录异常日志
Console.WriteLine($"生成导入模板时出错: {ex.Message}");
// 返回错误响应
return StatusCode(500, "生成导入模板时发生错误");
}
}

91
API/Wood.Service/Controllers/NormalBaseController.cs
View File

@ -22,7 +22,7 @@ using Magicodes.ExporterAndImporter.Core.Extension;
namespace Wood.Service.Controllers namespace Wood.Service.Controllers
{ {
[AllowAnonymous] [AllowAnonymous]
public class NormalBaseController<T>:ControllerBase where T:BaseEntity public class NormalBaseController<T>:ControllerBase where T:BaseEntity ,new()
{ {
protected readonly JobDbContext _context; protected readonly JobDbContext _context;
@ -120,12 +120,14 @@ namespace Wood.Service.Controllers
return Ok(pagedResult); return Ok(pagedResult);
} }
[HttpGet] [HttpGet]
public async Task<FileStreamResult> Export([FromQuery] int pageNumber = 1, public async Task<FileStreamResult> Export([FromQuery] int pageNumber = 1,
[FromQuery] int pageSize = 10, [FromQuery] int pageSize = 10,
[FromQuery] string sortBy = "", [FromQuery] string sortBy = "",
[FromQuery] bool isAscending = true, [FromQuery] bool isAscending = true,
[FromQuery] Dictionary<string, string> filters = null) [FromQuery] Dictionary<string, string> filters = null)
{ {
var pagingParams = new PagingParams var pagingParams = new PagingParams
{ {
@ -137,19 +139,14 @@ namespace Wood.Service.Controllers
}; };
// 可以在这里构建表达式树过滤条件 // 可以在这里构建表达式树过滤条件
Expression<Func<T, bool>> filter = null; //Expression<Func<T, bool>> filter = null;
var pagedResult = await _repository.GetPagedAsync(null, pagingParams); var pagedResult = await _repository.GetPagedAsync(null, pagingParams);
return await ExportFile(pagedResult.Data, Guid.NewGuid().ToString() + ".xlsx");
var dataTable = pagedResult.Data.ToDataTable();
return await ExportFile(dataTable, Guid.NewGuid().ToString() + ".xlsx");
} }
protected async Task<FileStreamResult> ExportFile(DataTable dtos, string fileName) protected async Task<FileStreamResult> ExportFile(ICollection<T> dtos, string fileName)
{ {
var excelExporter = HttpContext.RequestServices.GetRequiredService<IExcelExporter>(); var excelExporter = HttpContext.RequestServices.GetRequiredService<IExcelExporter>();
var res = await excelExporter.ExportAsByteArray(dtos); var res = await excelExporter.ExportAsByteArray(dtos);
@ -157,38 +154,42 @@ namespace Wood.Service.Controllers
} }
//[HttpGet]
//public async Task<IActionResult> GetImportTemplate() [HttpGet]
//{
// try public async Task<IActionResult> GetImportTemplate()
// { {
// // 创建导入模板生成器 try
// var importer = new ExcelImporter(); {
// 创建导入模板生成器
// // 生成导入模板流（这里假设使用 YourModel 作为导入模型） var importer = new ExcelImporter();
// byte[] by = await importer.GenerateTemplate<T>;
// using var stream = new MemoryStream(by); // 生成导入模板流（这里假设使用 YourModel 作为导入模型）
// stream.Seek(0, SeekOrigin.Begin); var bytes = await importer.GenerateTemplateBytes<T>();
// // 设置友好的文件名，例如："导入模板_20250530.xlsx"
// var fileName = $"导入模板_{DateTime.Now:yyyyMMdd}.xlsx"; using var stream = new MemoryStream(bytes);
stream.Seek(0, SeekOrigin.Begin);
// // 返回文件流结果
// return File( // 设置友好的文件名，例如："导入模板_20250530.xlsx"
// fileStream: stream, var fileName = $"导入模板_{DateTime.Now:yyyyMMdd}.xlsx";
// contentType: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
// fileDownloadName: fileName); // 返回文件流结果
// } return File(
// catch (Exception ex) fileStream: stream,
// { contentType: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
// // 记录异常日志 fileDownloadName: fileName);
// Console.WriteLine($"生成导入模板时出错: {ex.Message}"); }
catch (Exception ex)
// // 返回错误响应 {
// return StatusCode(500, "生成导入模板时发生错误"); // 记录异常日志
// } Console.WriteLine($"生成导入模板时出错: {ex.Message}");
//}
// 返回错误响应
return StatusCode(500, "生成导入模板时发生错误");
}
}

58
API/Wood.Service/Controllers/TaskConifgureController.cs
View File

@ -1,20 +1,17 @@
using Hangfire; using System;
using System.Data;
using System.IO;
using System.Linq.Expressions;
using System.Security.Policy;
using System.Threading.Tasks;
using Hangfire;
using Magicodes.ExporterAndImporter.Excel; using Magicodes.ExporterAndImporter.Excel;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
//using Microsoft.AspNetCore.Mvc; //using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using System;
using System.IO;
using System.Linq.Expressions;
using System.Security.Policy;
using System.Threading.Tasks;
using TaskManager.Controllers; using TaskManager.Controllers;
using TaskManager.Entity; using TaskManager.Entity;
using TaskManager.EntityFramework; using TaskManager.EntityFramework;
@ -723,9 +720,44 @@ namespace TaskManager.Controllers
} }
[HttpGet]
public async Task<FileStreamResult> Exportextend([FromQuery] int pageNumber = 1,
[FromQuery] int pageSize = 10,
[FromQuery] string sortBy = "",
[FromQuery] bool isAscending = true,
[FromQuery] Dictionary<string, string> filters = null)
{
var pagingParams = new PagingParams
{
PageNumber = pageNumber,
PageSize = pageSize,
SortBy = sortBy,
IsAscending = isAscending,
Filters = filters
};
// 可以在这里构建表达式树过滤条件
//Expression<Func<T, bool>> filter = null;
var pagedResult = await _repository.GetPagedAsync(null, pagingParams);
return await ExportFile(pagedResult.Data, Guid.NewGuid().ToString() + ".xlsx");
}
protected async Task<FileStreamResult> ExportFile<T>(ICollection<T> dtos, string fileName) where T : class, new()
{
var excelExporter = HttpContext.RequestServices.GetRequiredService<IExcelExporter>();
var res = await excelExporter.ExportAsByteArray(dtos);
return new FileStreamResult(new MemoryStream(res), "application/octet-stream") { FileDownloadName = DateTime.Now.ToString("yyyyMMddHHmm") + "_" + fileName };
}
// 使用 Hangfire 注册定时任务 // 使用 Hangfire 注册定时任务

302
API/Wood.Util/EntityHelper.cs
View File

@ -71,157 +71,157 @@ namespace Wood.Util
} }
public static class DataTableHelper //public static class DataTableHelper
{ //{
/// <summary> // /// <summary>
/// 将泛型列表转换为DataTable // /// 将泛型列表转换为DataTable
/// </summary> // /// </summary>
/// <typeparam name="T">实体类型</typeparam> // /// <typeparam name="T">实体类型</typeparam>
/// <param name="list">泛型列表</param> // /// <param name="list">泛型列表</param>
/// <param name="config">转换配置（可选）</param> // /// <param name="config">转换配置（可选）</param>
/// <returns>DataTable</returns> // /// <returns>DataTable</returns>
public static DataTable ToDataTable<T>(this List<T> list, Action<DataTableConfig<T>> config = null) // public static DataTable ToDataTable<T>(this List<T> list, Action<DataTableConfig<T>> config = null)
{ // {
if (list == null || list.Count == 0) // if (list == null || list.Count == 0)
return new DataTable(); // return new DataTable();
var tableConfig = new DataTableConfig<T>(); // var tableConfig = new DataTableConfig<T>();
config?.Invoke(tableConfig); // config?.Invoke(tableConfig);
var dataTable = new DataTable(); // var dataTable = new DataTable();
var properties = GetProperties(typeof(T), tableConfig); // var properties = GetProperties(typeof(T), tableConfig);
// 创建列 // // 创建列
foreach (var property in properties) // foreach (var property in properties)
{ // {
var columnType = Nullable.GetUnderlyingType(property.PropertyType) ?? property.PropertyType; // var columnType = Nullable.GetUnderlyingType(property.PropertyType) ?? property.PropertyType;
var columnName = tableConfig.ColumnMappings.TryGetValue(property.Name, out var mappedName) // var columnName = tableConfig.ColumnMappings.TryGetValue(property.Name, out var mappedName)
? mappedName // ? mappedName
: property.Name; // : property.Name;
var column = new DataColumn(columnName, columnType); // var column = new DataColumn(columnName, columnType);
dataTable.Columns.Add(column); // dataTable.Columns.Add(column);
} // }
// 填充数据 // // 填充数据
foreach (var item in list) // foreach (var item in list)
{ // {
var row = dataTable.NewRow(); // var row = dataTable.NewRow();
foreach (var property in properties) // foreach (var property in properties)
{ // {
var columnName = tableConfig.ColumnMappings.TryGetValue(property.Name, out var mappedName) // var columnName = tableConfig.ColumnMappings.TryGetValue(property.Name, out var mappedName)
? mappedName // ? mappedName
: property.Name; // : property.Name;
var value = property.GetValue(item); // var value = property.GetValue(item);
row[columnName] = value ?? DBNull.Value; // row[columnName] = value ?? DBNull.Value;
} // }
dataTable.Rows.Add(row); // dataTable.Rows.Add(row);
} // }
return dataTable; // return dataTable;
} // }
/// <summary> // /// <summary>
/// 获取需要转换的属性列表 // /// 获取需要转换的属性列表
/// </summary> // /// </summary>
private static PropertyInfo[] GetProperties(Type type, DataTableConfig config) // private static PropertyInfo[] GetProperties(Type type, DataTableConfig config)
{ // {
var bindingFlags = BindingFlags.Public | BindingFlags.Instance; // var bindingFlags = BindingFlags.Public | BindingFlags.Instance;
if (config.IgnoreNonPublicProperties) // if (config.IgnoreNonPublicProperties)
bindingFlags &= ~BindingFlags.NonPublic; // bindingFlags &= ~BindingFlags.NonPublic;
var properties = type.GetProperties(bindingFlags); // var properties = type.GetProperties(bindingFlags);
if (config.IgnoreProperties?.Count > 0) // if (config.IgnoreProperties?.Count > 0)
{ // {
properties = Array.FindAll(properties, p => !config.IgnoreProperties.Contains(p.Name)); // properties = Array.FindAll(properties, p => !config.IgnoreProperties.Contains(p.Name));
} // }
if (config.OnlyIncludeProperties?.Count > 0) // if (config.OnlyIncludeProperties?.Count > 0)
{ // {
properties = Array.FindAll(properties, p => config.OnlyIncludeProperties.Contains(p.Name)); // properties = Array.FindAll(properties, p => config.OnlyIncludeProperties.Contains(p.Name));
} // }
return properties; // return properties;
} // }
/// <summary> // /// <summary>
/// 数据转换配置类 // /// 数据转换配置类
/// </summary> // /// </summary>
public class DataTableConfig<T> : DataTableConfig // public class DataTableConfig<T> : DataTableConfig
{ // {
public new Dictionary<string, string> ColumnMappings { get; } = new Dictionary<string, string>(); // public new Dictionary<string, string> ColumnMappings { get; } = new Dictionary<string, string>();
/// <summary> // /// <summary>
/// 设置列映射（属性名 -> 列名） // /// 设置列映射（属性名 -> 列名）
/// </summary> // /// </summary>
public DataTableConfig<T> MapColumn(string propertyName, string columnName) // public DataTableConfig<T> MapColumn(string propertyName, string columnName)
{ // {
ColumnMappings[propertyName] = columnName; // ColumnMappings[propertyName] = columnName;
return this; // return this;
} // }
/// <summary> // /// <summary>
/// 设置忽略的属性 // /// 设置忽略的属性
/// </summary> // /// </summary>
public new DataTableConfig<T> IgnoreProperty(params string[] propertyNames) // public new DataTableConfig<T> IgnoreProperty(params string[] propertyNames)
{ // {
base.IgnoreProperty(propertyNames); // base.IgnoreProperty(propertyNames);
return this; // return this;
} // }
/// <summary> // /// <summary>
/// 设置只包含的属性 // /// 设置只包含的属性
/// </summary> // /// </summary>
public new DataTableConfig<T> OnlyIncludeProperty(params string[] propertyNames) // public new DataTableConfig<T> OnlyIncludeProperty(params string[] propertyNames)
{ // {
base.OnlyIncludeProperty(propertyNames); // base.OnlyIncludeProperty(propertyNames);
return this; // return this;
} // }
/// <summary> // /// <summary>
/// 设置是否忽略非公共属性（默认忽略） // /// 设置是否忽略非公共属性（默认忽略）
/// </summary> // /// </summary>
public new DataTableConfig<T> SetIgnoreNonPublicProperties(bool ignore = true) // public new DataTableConfig<T> SetIgnoreNonPublicProperties(bool ignore = true)
{ // {
base.SetIgnoreNonPublicProperties(ignore); // base.SetIgnoreNonPublicProperties(ignore);
return this; // return this;
} // }
} // }
/// <summary> // /// <summary>
/// 数据转换配置基类 // /// 数据转换配置基类
/// </summary> // /// </summary>
public class DataTableConfig // public class DataTableConfig
{ // {
public HashSet<string> IgnoreProperties { get; } = new HashSet<string>(); // public HashSet<string> IgnoreProperties { get; } = new HashSet<string>();
public HashSet<string> OnlyIncludeProperties { get; } = new HashSet<string>(); // public HashSet<string> OnlyIncludeProperties { get; } = new HashSet<string>();
public Dictionary<string, string> ColumnMappings { get; } = new Dictionary<string, string>(); // public Dictionary<string, string> ColumnMappings { get; } = new Dictionary<string, string>();
public bool IgnoreNonPublicProperties { get; private set; } = true; // public bool IgnoreNonPublicProperties { get; private set; } = true;
public DataTableConfig IgnoreProperty(params string[] propertyNames) // public DataTableConfig IgnoreProperty(params string[] propertyNames)
{ // {
foreach (var name in propertyNames) // foreach (var name in propertyNames)
IgnoreProperties.Add(name); // IgnoreProperties.Add(name);
return this; // return this;
} // }
public DataTableConfig OnlyIncludeProperty(params string[] propertyNames) // public DataTableConfig OnlyIncludeProperty(params string[] propertyNames)
{ // {
OnlyIncludeProperties.Clear(); // OnlyIncludeProperties.Clear();
foreach (var name in propertyNames) // foreach (var name in propertyNames)
OnlyIncludeProperties.Add(name); // OnlyIncludeProperties.Add(name);
return this; // return this;
} // }
public DataTableConfig SetIgnoreNonPublicProperties(bool ignore = true) // public DataTableConfig SetIgnoreNonPublicProperties(bool ignore = true)
{ // {
IgnoreNonPublicProperties = ignore; // IgnoreNonPublicProperties = ignore;
return this; // return this;
} // }
} // }
} //}

Write Preview
Loading…
Cancel
Save