v3.4.6
This commit is contained in:
@@ -5,6 +5,7 @@ using JNPF.Common.Enums;
|
||||
using JNPF.Common.Extension;
|
||||
using JNPF.Common.Filter;
|
||||
using JNPF.Common.Helper;
|
||||
using JNPF.Common.Manager;
|
||||
using JNPF.Common.Models.NPOI;
|
||||
using JNPF.Common.Security;
|
||||
using JNPF.DataEncryption;
|
||||
@@ -34,12 +35,14 @@ public class EmployeeService : IDynamicApiController, ITransient
|
||||
private readonly ISqlSugarRepository<EmployeeEntity> _repository;
|
||||
private readonly IFileManager _fileManager;
|
||||
private readonly IUserManager _userManager;
|
||||
private readonly ICacheManager _cacheManager;
|
||||
|
||||
public EmployeeService(ISqlSugarRepository<EmployeeEntity> repository, IFileManager fileManager, IUserManager userManager)
|
||||
public EmployeeService(ISqlSugarRepository<EmployeeEntity> repository, IFileManager fileManager, IUserManager userManager,ICacheManager cacheManager)
|
||||
{
|
||||
_repository = repository;
|
||||
_fileManager = fileManager;
|
||||
_userManager = userManager;
|
||||
_cacheManager = cacheManager;
|
||||
}
|
||||
|
||||
#region GET
|
||||
@@ -114,6 +117,7 @@ public class EmployeeService : IDynamicApiController, ITransient
|
||||
//得到数据
|
||||
var sr = await _fileManager.GetFileStream(savePath);
|
||||
var excelData = ExcelImportHelper.ToDataTable(savePath, sr);
|
||||
excelData.Rows.RemoveAt(0);
|
||||
foreach (var item in excelData.Columns)
|
||||
{
|
||||
excelData.Columns[item.ToString()].ColumnName = GetFiledEncode(item.ToString());
|
||||
@@ -200,6 +204,7 @@ public class EmployeeService : IDynamicApiController, ITransient
|
||||
var addPath = Path.Combine(FileVariable.TemporaryFilePath, excelconfig.FileName);
|
||||
var stream = ExcelExportHelper<EmployeeEntity>.ExportMemoryStream(dataList, excelconfig);
|
||||
await _fileManager.UploadFileByType(stream, FileVariable.TemporaryFilePath, excelconfig.FileName);
|
||||
_cacheManager.Set(excelconfig.FileName, string.Empty);
|
||||
return new { name = excelconfig.FileName, url = "/api/file/Download?encryption=" + DESCEncryption.Encrypt(_userManager.UserId + "|" + excelconfig.FileName + "|" + addPath, "JNPF") };
|
||||
}
|
||||
|
||||
@@ -214,6 +219,7 @@ public class EmployeeService : IDynamicApiController, ITransient
|
||||
var _fileName = DateTime.Now.ToString("yyyyMMdd") + "_" + SnowflakeIdHelper.NextId() + Path.GetExtension(file.FileName);
|
||||
var stream = file.OpenReadStream();
|
||||
await _fileManager.UploadFileByType(stream, _filePath, _fileName);
|
||||
_cacheManager.Set(_fileName, string.Empty);
|
||||
return new { name = _fileName, url = string.Format("/api/File/Image/{0}/{1}", string.Empty, _fileName) };
|
||||
}
|
||||
|
||||
@@ -267,6 +273,7 @@ public class EmployeeService : IDynamicApiController, ITransient
|
||||
{
|
||||
var stream = await _fileManager.GetFileStream(filePath);
|
||||
await _fileManager.UploadFileByType(stream, FileVariable.TemporaryFilePath, "职员信息.xlsx");
|
||||
_cacheManager.Set("职员信息.xlsx", string.Empty);
|
||||
}
|
||||
return new { name = "职员信息.xlsx", url = "/api/file/Download?encryption=" + DESCEncryption.Encrypt(_userManager.UserId + "|职员信息.xlsx", "JNPF") };
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user