|
|
@ -196,11 +196,12 @@ namespace _24Hour.Controllers.Common |
|
|
|
int updated = 0, added = 0; |
|
|
|
int updated = 0, added = 0; |
|
|
|
var ext = Path.GetExtension(path).ToLower(); |
|
|
|
var ext = Path.GetExtension(path).ToLower(); |
|
|
|
|
|
|
|
|
|
|
|
if (ext == ".xlsx" || ext == ".xls") |
|
|
|
var excelpath = System.IO.Path.ChangeExtension(path, ".xlsx"); |
|
|
|
{ |
|
|
|
|
|
|
|
if (System.IO.File.Exists(path)) |
|
|
|
if (System.IO.File.Exists(path)) |
|
|
|
{ |
|
|
|
{ |
|
|
|
var reader = new ExcelReader(path); |
|
|
|
|
|
|
|
|
|
|
|
Elight.Utility.Encrypt.DataEncryption.Decryption(path, excelpath); |
|
|
|
|
|
|
|
var reader = new ExcelReader(excelpath); |
|
|
|
var dt = reader.ExcelToDataTable(); |
|
|
|
var dt = reader.ExcelToDataTable(); |
|
|
|
if (dt != null) |
|
|
|
if (dt != null) |
|
|
|
{ |
|
|
|
{ |
|
|
@ -289,14 +290,13 @@ namespace _24Hour.Controllers.Common |
|
|
|
res.IsSucceed = false; |
|
|
|
res.IsSucceed = false; |
|
|
|
res.Message = "文件上传失败"; |
|
|
|
res.Message = "文件上传失败"; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
else |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
res.IsSucceed = false; |
|
|
|
|
|
|
|
res.Message = "文件格式不支持"; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if (System.IO.File.Exists(path)) |
|
|
|
if (System.IO.File.Exists(path)) |
|
|
|
System.IO.File.Delete(path); |
|
|
|
System.IO.File.Delete(path); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (System.IO.File.Exists(excelpath)) |
|
|
|
|
|
|
|
System.IO.File.Delete(excelpath); |
|
|
|
|
|
|
|
|
|
|
|
return res; |
|
|
|
return res; |
|
|
|
} |
|
|
|
} |
|
|
|
/// <summary> |
|
|
|
/// <summary> |
|
|
@ -1052,7 +1052,7 @@ namespace _24Hour.Controllers.Common |
|
|
|
{ |
|
|
|
{ |
|
|
|
|
|
|
|
|
|
|
|
var path = item.Replace(@"/", @"\"); |
|
|
|
var path = item.Replace(@"/", @"\"); |
|
|
|
var filepath = Environment.CurrentDirectory+@"\wwwroot"+path; |
|
|
|
var filepath = Environment.CurrentDirectory + @"\wwwroot" + path; |
|
|
|
if (System.IO.File.Exists(filepath)) |
|
|
|
if (System.IO.File.Exists(filepath)) |
|
|
|
{ |
|
|
|
{ |
|
|
|
var basestr = Convert.ToBase64String(System.IO.File.ReadAllBytes(filepath)); |
|
|
|
var basestr = Convert.ToBase64String(System.IO.File.ReadAllBytes(filepath)); |
|
|
@ -1742,7 +1742,7 @@ namespace _24Hour.Controllers.Common |
|
|
|
/// <summary> |
|
|
|
/// <summary> |
|
|
|
/// 导入律师信息 |
|
|
|
/// 导入律师信息 |
|
|
|
/// </summary> |
|
|
|
/// </summary> |
|
|
|
/// <param name="path"></param> |
|
|
|
/// <param name="secpath"></param> |
|
|
|
/// <returns></returns> |
|
|
|
/// <returns></returns> |
|
|
|
[HttpGet] |
|
|
|
[HttpGet] |
|
|
|
[Route("ImportLawyerArchivesInfo")] |
|
|
|
[Route("ImportLawyerArchivesInfo")] |
|
|
@ -1756,13 +1756,16 @@ namespace _24Hour.Controllers.Common |
|
|
|
result.IsSucceed = false; |
|
|
|
result.IsSucceed = false; |
|
|
|
return result; |
|
|
|
return result; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
var decrypath = System.IO.Path.ChangeExtension(path, ".zip"); |
|
|
|
|
|
|
|
Elight.Utility.Encrypt.DataEncryption.Decryption(path, decrypath); |
|
|
|
|
|
|
|
|
|
|
|
var dir = Path.Combine(Environment.CurrentDirectory, "wwwroot", "CaseFile", "imports"); |
|
|
|
var dir = Path.Combine(Environment.CurrentDirectory, "wwwroot", "CaseFile", "imports"); |
|
|
|
var userdir = Path.Combine(dir, "users"); |
|
|
|
var userdir = Path.Combine(dir, "users"); |
|
|
|
var lawyersvcs = Path.Combine(dir, "lawyersvcs"); |
|
|
|
var lawyersvcs = Path.Combine(dir, "lawyersvcs"); |
|
|
|
|
|
|
|
|
|
|
|
var extratname = Path.GetFileNameWithoutExtension(path); |
|
|
|
var extratname = Path.GetFileNameWithoutExtension(decrypath); |
|
|
|
var extratdirpath = Path.Combine(dir, extratname); |
|
|
|
var extratdirpath = Path.Combine(dir, extratname); |
|
|
|
ZipFile.ExtractToDirectory(path, extratdirpath, true); |
|
|
|
ZipFile.ExtractToDirectory(decrypath, extratdirpath, true); |
|
|
|
var zipusers = Path.Combine(extratdirpath, "users"); |
|
|
|
var zipusers = Path.Combine(extratdirpath, "users"); |
|
|
|
var ziplawyersvcs = Path.Combine(extratdirpath, "lawyerservices"); |
|
|
|
var ziplawyersvcs = Path.Combine(extratdirpath, "lawyerservices"); |
|
|
|
var zipjson = Path.Combine(extratdirpath, "data"); |
|
|
|
var zipjson = Path.Combine(extratdirpath, "data"); |
|
|
@ -2098,7 +2101,12 @@ namespace _24Hour.Controllers.Common |
|
|
|
ZipFile.CreateFromDirectory(packegdir, packegzipname); |
|
|
|
ZipFile.CreateFromDirectory(packegdir, packegzipname); |
|
|
|
Directory.Delete(packegdir, true); |
|
|
|
Directory.Delete(packegdir, true); |
|
|
|
|
|
|
|
|
|
|
|
result.result = $"/temp/{packegdirname}.zip"; |
|
|
|
FileInfo fi = new FileInfo(packegzipname); //xx/xx/aa.rar |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var akspath = System.IO.Path.ChangeExtension(packegzipname, ".aks"); |
|
|
|
|
|
|
|
fi.MoveTo(akspath); //xx/xx/xx.rar |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
result.result = $"/temp/{packegdirname}.aks"; |
|
|
|
result.IsSucceed = true; |
|
|
|
result.IsSucceed = true; |
|
|
|
logger.LogInformation("step5"); |
|
|
|
logger.LogInformation("step5"); |
|
|
|
return result; |
|
|
|
return result; |
|
|
|