diff --git a/.gitignore b/.gitignore
index 3922885..9ec5cfe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -81,4 +81,14 @@ dkms.conf
/24Hour/Properties/PublishProfiles/FolderProfile1.pubxml.user
/24Hour/wwwroot
/Dto/obj
-/Dto/obj/Debug
\ No newline at end of file
+/Dto/obj/Debug
+/Dto/obj/Debug/net6.0
+/Dto/obj/Release
+*.cs
+/Dto/obj/Debug/net6.0/Dto.csproj.AssemblyReference.cache
+/Dto/obj/Debug/net6.0/Dto.AssemblyInfoInputs.cache
+/Dto/obj/Debug/net6.0/Dto.GeneratedMSBuildEditorConfig.editorconfig
+/Dto/obj/Dto.csproj.nuget.dgspec.json
+/Dto/obj/Dto.csproj.nuget.g.props
+/Dto/obj/project.assets.json
+/Dto/obj/project.nuget.cache
diff --git a/24Hour/24Hour.csproj b/24Hour/24Hour.csproj
index c7460f4..369ecfb 100644
--- a/24Hour/24Hour.csproj
+++ b/24Hour/24Hour.csproj
@@ -8,8 +8,8 @@
True
e485308c-2f05-470b-b0a4-68f1ec2b3412
Linux
- 1.0.1.16
- 1.0.1.16
+ 1.0.1.17
+ 1.0.1.17
@@ -28,6 +28,7 @@
+
diff --git a/24Hour/Controllers/Common/LawyerArchivesController.cs b/24Hour/Controllers/Common/LawyerArchivesController.cs
index 746c372..93ff698 100644
--- a/24Hour/Controllers/Common/LawyerArchivesController.cs
+++ b/24Hour/Controllers/Common/LawyerArchivesController.cs
@@ -80,7 +80,6 @@ namespace _24Hour.Controllers.Common
res.result = data;
return res;
}
-
///
/// 修改内网律师信息
///
@@ -815,8 +814,6 @@ namespace _24Hour.Controllers.Common
};
return result;
}
-
-
///
/// 统计阅卷信息
///
@@ -989,7 +986,6 @@ namespace _24Hour.Controllers.Common
};
return result;
}
-
///
/// 按律师分类
///
@@ -1106,335 +1102,353 @@ namespace _24Hour.Controllers.Common
[Route("ImportLawyerArchivesInfo")]
public async Task ImportLawyerArchivesInfo(string path)
{
- if (System.IO.File.Exists(path) == false)
- {
- result.Message = "文件丢失";
- result.IsSucceed = false;
- return result;
- }
- var dir = Path.Combine(Environment.CurrentDirectory, "wwwroot", "CaseFile", "imports");
- var userdir = Path.Combine(dir, "users");
- var lawyersvcs = Path.Combine(dir, "lawyersvcs");
-
- var extratname = Path.GetFileNameWithoutExtension(path);
- var extratdirpath = Path.Combine(dir, extratname);
- ZipFile.ExtractToDirectory(path, extratdirpath, true);
- var zipusers = Path.Combine(extratdirpath, "users");
- var ziplawyersvcs = Path.Combine(extratdirpath, "lawyerservices");
- var zipjson = Path.Combine(extratdirpath, "data");
- if (System.IO.File.Exists(zipjson) == false)
- {
- result.Message = "文件丢失";
- result.IsSucceed = false;
- return result;
- }
- var json = System.IO.File.ReadAllText(zipjson);
-
- var jsonstr = Encoding.UTF8.GetString(Convert.FromBase64String(json));
-
- var importdata = jsonstr.ConvertToAnonymousType(new
- {
- lawyerservices = default(List),
- users = default(List)
- });
- foreach (var userim in importdata.users)
+ try
{
- var user = await _db.Queryable()
- .Where(x => x.cardId == userim.cardId)
- .Where(x => x.IsDeleted == 0)
- .Where(x => x.isdeactivate == 0)
- .Where(x => x.identity == "律师")
- .FirstAsync();
- var identityphotopath = Path.Combine(zipusers, userim.cardId, "identityphotos");
- var files = new DirectoryInfo(identityphotopath)
- .GetFiles()
- .Select(x => "/CaseFile/imports/" + Path.GetRelativePath(dir, x.FullName)
- .Replace(@"\", @"/"))
- .ToList()
- .ConvertToJsonStr();
-
- var departmentPhotos = Path.Combine(zipusers, userim.cardId, "departmentPhotos");
- var departments = new DirectoryInfo(departmentPhotos)
- .GetFiles()
- .Select(x => "/CaseFile/imports/" + Path.GetRelativePath(dir, x.FullName)
- .Replace(@"\", @"/"))
- .ToList()
- .ConvertToJsonStr();
-
- var cardidphotos = Path.Combine(zipusers, userim.cardId, "cardids");
- var cardids = new DirectoryInfo(cardidphotos)
- .GetFiles()
- .Select(x => "/CaseFile/imports/" + Path.GetRelativePath(dir, x.FullName)
- .Replace(@"\", @"/"))
- .ToList()
- .ConvertToJsonStr();
-
- if (user == null)
+ if (System.IO.File.Exists(path) == false)
{
- userim.cardIdphoto = cardids;
- userim.identityphoto = files;
- userim.departmentPhoto = departments;
-
- _db.BeginTran();
- var num = await _db.Insertable(userim).ExecuteCommandAsync();
- _db.CommitTran();
+ result.Message = "文件丢失";
+ result.IsSucceed = false;
+ return result;
}
- else
+ var dir = Path.Combine(Environment.CurrentDirectory, "wwwroot", "CaseFile", "imports");
+ var userdir = Path.Combine(dir, "users");
+ var lawyersvcs = Path.Combine(dir, "lawyersvcs");
+
+ var extratname = Path.GetFileNameWithoutExtension(path);
+ var extratdirpath = Path.Combine(dir, extratname);
+ ZipFile.ExtractToDirectory(path, extratdirpath, true);
+ var zipusers = Path.Combine(extratdirpath, "users");
+ var ziplawyersvcs = Path.Combine(extratdirpath, "lawyerservices");
+ var zipjson = Path.Combine(extratdirpath, "data");
+ if (System.IO.File.Exists(zipjson) == false)
{
- user.cardIdphoto = cardids;
- user.identityphoto = files;
- user.departmentPhoto = departments;
- _db.BeginTran();
- var num = await _db.Updateable(user)
- .UpdateColumns(x => new
- {
- x.cardIdphoto,
- x.identityphoto,
- x.departmentPhoto
- })
- .IgnoreColumns(ignoreAllNullColumns: true)
- .ExecuteCommandAsync();
- _db.CommitTran();
+ result.Message = "文件丢失";
+ result.IsSucceed = false;
+ return result;
}
- }
- foreach (var lawyersvc in importdata.lawyerservices)
- {
- var svc = await _db.Queryable()
- .Where(x => x.Id == lawyersvc.Id).FirstAsync();
-
- var annexphoto = Path.Combine(ziplawyersvcs, lawyersvc.Id, "annexs");
- var annexs = new DirectoryInfo(annexphoto)
- .GetFiles()
- .Select(x => "/CaseFile/imports/" + Path.GetRelativePath(dir, x.FullName)
- .Replace(@"\", @"/"))
- .ToList()
- .ConvertToJsonStr();
-
-
- var legalAidPhoto = Path.Combine(ziplawyersvcs, lawyersvc.Id, "legalAidPhoto");
- var legalAidPhotos = new DirectoryInfo(legalAidPhoto)
- .GetFiles()
- .Select(x => "/CaseFile/imports/" + Path.GetRelativePath(dir, x.FullName)
- .Replace(@"\", @"/"))
- .ToList()
- .ConvertToJsonStr();
-
- var relationshipProofPhoto = Path.Combine(ziplawyersvcs, lawyersvc.Id, "relationshipProofPhoto");
- var relationshipProofPhotos = new DirectoryInfo(relationshipProofPhoto)
- .GetFiles()
- .Select(x => "/CaseFile/imports/" + Path.GetRelativePath(dir, x.FullName)
- .Replace(@"\", @"/"))
- .ToList()
- .ConvertToJsonStr();
-
- var otherPhoto = Path.Combine(ziplawyersvcs, lawyersvc.Id, "otherPhoto");
- var otherPhotos = new DirectoryInfo(otherPhoto)
- .GetFiles()
- .Select(x => "/CaseFile/imports/" + Path.GetRelativePath(dir, x.FullName)
- .Replace(@"\", @"/"))
- .ToList()
- .ConvertToJsonStr();
-
- if (svc == null)
- {
- var lawyer = await _db.Queryable()
- .Where(x => x.cardId == lawyersvc.createuserId)
- .Where(x => x.IsDeleted == 0)
- .Where(x => x.isdeactivate == 0)
- .Where(x => x.identity == "律师")
- .FirstAsync();
+ var json = System.IO.File.ReadAllText(zipjson);
- lawyersvc.createuserId = lawyer.Id;
- lawyersvc.annex = annexs;
- lawyersvc.legalAidPhoto = legalAidPhotos;
- lawyersvc.relationshipProofPhoto = relationshipProofPhotos;
- lawyersvc.otherPhoto = otherPhotos;
+ var jsonstr = Encoding.UTF8.GetString(Convert.FromBase64String(json));
- _db.BeginTran();
- var num = await _db.Insertable(lawyersvc).ExecuteCommandAsync();
- _db.CommitTran();
+ var importdata = jsonstr.ConvertToAnonymousType(new
+ {
+ lawyerservices = default(List),
+ users = default(List)
+ });
+ foreach (var userim in importdata.users)
+ {
+ var user = await _db.Queryable()
+ .Where(x => x.cardId == userim.cardId)
+ .Where(x => x.IsDeleted == 0)
+ .Where(x => x.isdeactivate == 0)
+ .Where(x => x.identity == "律师")
+ .FirstAsync();
+ var identityphotopath = Path.Combine(zipusers, userim.cardId, "identityphotos");
+ var files = new DirectoryInfo(identityphotopath)
+ .GetFiles()
+ .Select(x => "/CaseFile/imports/" + Path.GetRelativePath(dir, x.FullName)
+ .Replace(@"\", @"/"))
+ .ToList()
+ .ConvertToJsonStr();
+
+ var departmentPhotos = Path.Combine(zipusers, userim.cardId, "departmentPhotos");
+ var departments = new DirectoryInfo(departmentPhotos)
+ .GetFiles()
+ .Select(x => "/CaseFile/imports/" + Path.GetRelativePath(dir, x.FullName)
+ .Replace(@"\", @"/"))
+ .ToList()
+ .ConvertToJsonStr();
+
+ var cardidphotos = Path.Combine(zipusers, userim.cardId, "cardids");
+ var cardids = new DirectoryInfo(cardidphotos)
+ .GetFiles()
+ .Select(x => "/CaseFile/imports/" + Path.GetRelativePath(dir, x.FullName)
+ .Replace(@"\", @"/"))
+ .ToList()
+ .ConvertToJsonStr();
+
+ if (user == null)
+ {
+ userim.cardIdphoto = cardids;
+ userim.identityphoto = files;
+ userim.departmentPhoto = departments;
+
+ _db.BeginTran();
+ var num = await _db.Insertable(userim).ExecuteCommandAsync();
+ _db.CommitTran();
+ }
+ else
+ {
+ user.cardIdphoto = cardids;
+ user.identityphoto = files;
+ user.departmentPhoto = departments;
+ _db.BeginTran();
+ var num = await _db.Updateable(user)
+ .UpdateColumns(x => new
+ {
+ x.cardIdphoto,
+ x.identityphoto,
+ x.departmentPhoto
+ })
+ .IgnoreColumns(ignoreAllNullColumns: true)
+ .ExecuteCommandAsync();
+ _db.CommitTran();
+ }
}
- else
+ foreach (var lawyersvc in importdata.lawyerservices)
{
- var lawyer = await _db.Queryable()
- .Where(x => x.cardId == lawyersvc.createuserId)
- .Where(x => x.IsDeleted == 0)
- .Where(x => x.isdeactivate == 0)
- .Where(x => x.identity == "律师")
- .FirstAsync();
-
- svc.createuserId = lawyer.Id;
- svc.annex = annexs;
- svc.legalAidPhoto = legalAidPhotos;
- svc.relationshipProofPhoto = relationshipProofPhotos;
- svc.otherPhoto = otherPhotos;
- _db.BeginTran();
- var num = await _db.Updateable(svc)
- .UpdateColumns(x => new
- {
- x.annex,
- x.createuserId,
- x.relationshipProofPhoto,
- x.otherPhoto,
- x.legalAidPhoto
- })
- .IgnoreColumns(ignoreAllNullColumns: true)
- .ExecuteCommandAsync();
- _db.CommitTran();
+ var svc = await _db.Queryable()
+ .Where(x => x.Id == lawyersvc.Id).FirstAsync();
+
+ var annexphoto = Path.Combine(ziplawyersvcs, lawyersvc.Id, "annexs");
+ var annexs = new DirectoryInfo(annexphoto)
+ .GetFiles()
+ .Select(x => "/CaseFile/imports/" + Path.GetRelativePath(dir, x.FullName)
+ .Replace(@"\", @"/"))
+ .ToList()
+ .ConvertToJsonStr();
+
+
+ var legalAidPhoto = Path.Combine(ziplawyersvcs, lawyersvc.Id, "legalAidPhoto");
+ var legalAidPhotos = new DirectoryInfo(legalAidPhoto)
+ .GetFiles()
+ .Select(x => "/CaseFile/imports/" + Path.GetRelativePath(dir, x.FullName)
+ .Replace(@"\", @"/"))
+ .ToList()
+ .ConvertToJsonStr();
+
+ var relationshipProofPhoto = Path.Combine(ziplawyersvcs, lawyersvc.Id, "relationshipProofPhoto");
+ var relationshipProofPhotos = new DirectoryInfo(relationshipProofPhoto)
+ .GetFiles()
+ .Select(x => "/CaseFile/imports/" + Path.GetRelativePath(dir, x.FullName)
+ .Replace(@"\", @"/"))
+ .ToList()
+ .ConvertToJsonStr();
+
+ var otherPhoto = Path.Combine(ziplawyersvcs, lawyersvc.Id, "otherPhoto");
+ var otherPhotos = new DirectoryInfo(otherPhoto)
+ .GetFiles()
+ .Select(x => "/CaseFile/imports/" + Path.GetRelativePath(dir, x.FullName)
+ .Replace(@"\", @"/"))
+ .ToList()
+ .ConvertToJsonStr();
+
+ if (svc == null)
+ {
+ var lawyer = await _db.Queryable()
+ .Where(x => x.cardId == lawyersvc.createuserId)
+ .Where(x => x.IsDeleted == 0)
+ .Where(x => x.isdeactivate == 0)
+ .Where(x => x.identity == "律师")
+ .FirstAsync();
+
+ lawyersvc.createuserId = lawyer.Id;
+ lawyersvc.annex = annexs;
+ lawyersvc.legalAidPhoto = legalAidPhotos;
+ lawyersvc.relationshipProofPhoto = relationshipProofPhotos;
+ lawyersvc.otherPhoto = otherPhotos;
+
+ _db.BeginTran();
+ var num = await _db.Insertable(lawyersvc).ExecuteCommandAsync();
+ _db.CommitTran();
+ }
+ else
+ {
+ var lawyer = await _db.Queryable()
+ .Where(x => x.cardId == lawyersvc.createuserId)
+ .Where(x => x.IsDeleted == 0)
+ .Where(x => x.isdeactivate == 0)
+ .Where(x => x.identity == "律师")
+ .FirstAsync();
+
+ svc.createuserId = lawyer.Id;
+ svc.annex = annexs;
+ svc.legalAidPhoto = legalAidPhotos;
+ svc.relationshipProofPhoto = relationshipProofPhotos;
+ svc.otherPhoto = otherPhotos;
+ _db.BeginTran();
+ var num = await _db.Updateable(svc)
+ .UpdateColumns(x => new
+ {
+ x.annex,
+ x.createuserId,
+ x.relationshipProofPhoto,
+ x.otherPhoto,
+ x.legalAidPhoto
+ })
+ .IgnoreColumns(ignoreAllNullColumns: true)
+ .ExecuteCommandAsync();
+ _db.CommitTran();
+ }
}
}
-
+ catch(Exception ex)
+ {
+ result.Message = ex.Message;
+ result.IsSucceed = false;
+ return result;
+ }
result.IsSucceed = true;
return result;
}
-
[HttpPost]
[Route("ExportLawyerArchivesInfo")]
public async Task ExportLawyerArchivesInfo(List ids)
{
- var lawyerarchives = await _db.Queryable()
- .In(info => info.Id, ids)
- .ToListAsync();
- var userids = lawyerarchives
- .Select(x => x.createuserId)
- .Distinct()
- .ToList();
- var users = await _db.Queryable()
- .In(x => x.Id, userids)
- .ToListAsync();
-
- //把创建人Id变为创建人的身份证
- lawyerarchives.All(x =>
- {
- x.createuserId = users.FirstOrDefault(q => q.Id == x.createuserId).cardId;
- return true;
- });
- var packegdirname = DateTime.Now.Ticks.ToString();
- var dir = Path.Combine(Environment.CurrentDirectory, "wwwroot", "temp");
- var packegdir = Path.Combine(dir, packegdirname);
- var packegzipname = Path.ChangeExtension(packegdir, ".zip");
- if (Directory.Exists(packegdir) == false) Directory.CreateDirectory(packegdir);
- var jsonfilepath = Path.Combine(packegdir, "data");
- var jsonstr = new
- {
- lawyerservices = lawyerarchives,
- users = users
- }.ConvertToJsonStr().ConvertToBase64();
- System.IO.File.WriteAllText(jsonfilepath, jsonstr);
- //存储预约申请的相关附件
- foreach (var item in lawyerarchives)
+ try
{
- var lawyerdir = Path.Combine(packegdir, "lawyerservices", item.Id);
- if (Directory.Exists(lawyerdir) == false) Directory.CreateDirectory(lawyerdir);
-
+ var lawyerarchives = await _db.Queryable()
+ .In(info => info.Id, ids)
+ .ToListAsync();
+ var userids = lawyerarchives
+ .Select(x => x.createuserId)
+ .Distinct()
+ .ToList();
+ var users = await _db.Queryable()
+ .In(x => x.Id, userids)
+ .ToListAsync();
- var files = item.annex.ConvertToModel>();
- var annecdir = Path.Combine(lawyerdir, "annexs");
- if (Directory.Exists(annecdir) == false) Directory.CreateDirectory(annecdir);
- foreach (var file in files)
+ //把创建人Id变为创建人的身份证
+ lawyerarchives.All(x =>
+ {
+ x.createuserId = users.FirstOrDefault(q => q.Id == x.createuserId).cardId;
+ return true;
+ });
+ var packegdirname = DateTime.Now.Ticks.ToString();
+ var dir = Path.Combine(Environment.CurrentDirectory, "wwwroot", "temp");
+ var packegdir = Path.Combine(dir, packegdirname);
+ var packegzipname = Path.ChangeExtension(packegdir, ".zip");
+ if (Directory.Exists(packegdir) == false) Directory.CreateDirectory(packegdir);
+ var jsonfilepath = Path.Combine(packegdir, "data");
+ var jsonstr = new
{
- var filepath = Path.Combine(Environment.CurrentDirectory, "wwwroot") + file.Replace("/", @"\");
- if (System.IO.File.Exists(filepath))
+ lawyerservices = lawyerarchives,
+ users = users
+ }.ConvertToJsonStr().ConvertToBase64();
+ System.IO.File.WriteAllText(jsonfilepath, jsonstr);
+ //存储预约申请的相关附件
+ foreach (var item in lawyerarchives)
+ {
+ var lawyerdir = Path.Combine(packegdir, "lawyerservices", item.Id);
+ if (Directory.Exists(lawyerdir) == false) Directory.CreateDirectory(lawyerdir);
+
+
+ var files = item.annex.ConvertToModel>() ?? new List();
+ var annecdir = Path.Combine(lawyerdir, "annexs");
+ if (Directory.Exists(annecdir) == false) Directory.CreateDirectory(annecdir);
+ foreach (var file in files)
{
- var targetfile = Path.Combine(annecdir, Path.GetFileName(filepath));
- System.IO.File.Copy(filepath, targetfile);
+ var filepath = Path.Combine(Environment.CurrentDirectory, "wwwroot") + file.Replace("/", @"\");
+ if (System.IO.File.Exists(filepath))
+ {
+ var targetfile = Path.Combine(annecdir, Path.GetFileName(filepath));
+ System.IO.File.Copy(filepath, targetfile);
+ }
}
- }
- var legalphotots = item.legalAidPhoto.ConvertToModel>();
- var legalAidPhotoDir = Path.Combine(lawyerdir, "legalAidPhoto");
- if (Directory.Exists(legalAidPhotoDir) == false) Directory.CreateDirectory(legalAidPhotoDir);
- foreach (var legalphotot in legalphotots)
- {
- var filepath = Path.Combine(Environment.CurrentDirectory, "wwwroot") + legalphotot.Replace("/", @"\");
- if (System.IO.File.Exists(filepath))
+ var legalphotots = item.legalAidPhoto.ConvertToModel>() ?? new List();
+ var legalAidPhotoDir = Path.Combine(lawyerdir, "legalAidPhoto");
+ if (Directory.Exists(legalAidPhotoDir) == false) Directory.CreateDirectory(legalAidPhotoDir);
+
+ foreach (var legalphotot in legalphotots)
{
- var targetfile = Path.Combine(legalAidPhotoDir, Path.GetFileName(filepath));
- System.IO.File.Copy(filepath, targetfile);
+ var filepath = Path.Combine(Environment.CurrentDirectory, "wwwroot") + legalphotot.Replace("/", @"\");
+ if (System.IO.File.Exists(filepath))
+ {
+ var targetfile = Path.Combine(legalAidPhotoDir, Path.GetFileName(filepath));
+ System.IO.File.Copy(filepath, targetfile);
+ }
}
- }
- var relationshipProofPhotos = item.relationshipProofPhoto.ConvertToModel>();
- var relationshipProofPhotoDir = Path.Combine(lawyerdir, "relationshipProofPhoto");
- if (Directory.Exists(relationshipProofPhotoDir) == false) Directory.CreateDirectory(relationshipProofPhotoDir);
- foreach (var relationshipProofPhoto in relationshipProofPhotos)
- {
- var filepath = Path.Combine(Environment.CurrentDirectory, "wwwroot") + relationshipProofPhoto.Replace("/", @"\");
- if (System.IO.File.Exists(filepath))
+
+ var relationshipProofPhotos = item.relationshipProofPhoto.ConvertToModel>() ?? new List();
+ var relationshipProofPhotoDir = Path.Combine(lawyerdir, "relationshipProofPhoto");
+ if (Directory.Exists(relationshipProofPhotoDir) == false) Directory.CreateDirectory(relationshipProofPhotoDir);
+
+ foreach (var relationshipProofPhoto in relationshipProofPhotos)
{
- var targetfile = Path.Combine(legalAidPhotoDir, Path.GetFileName(filepath));
- System.IO.File.Copy(filepath, targetfile);
+ var filepath = Path.Combine(Environment.CurrentDirectory, "wwwroot") + relationshipProofPhoto.Replace("/", @"\");
+ if (System.IO.File.Exists(filepath))
+ {
+ var targetfile = Path.Combine(legalAidPhotoDir, Path.GetFileName(filepath));
+ System.IO.File.Copy(filepath, targetfile);
+ }
}
- }
- var otherPhotos = item.otherPhoto.ConvertToModel>();
- var otherPhotoDir = Path.Combine(lawyerdir, "otherPhoto");
- if (Directory.Exists(otherPhotoDir) == false) Directory.CreateDirectory(otherPhotoDir);
- foreach (var otherPhoto in otherPhotos)
- {
- var filepath = Path.Combine(Environment.CurrentDirectory, "wwwroot") + otherPhoto.Replace("/", @"\");
- if (System.IO.File.Exists(filepath))
+ var otherPhotos = item.otherPhoto.ConvertToModel>() ?? new List();
+ var otherPhotoDir = Path.Combine(lawyerdir, "otherPhoto");
+ if (Directory.Exists(otherPhotoDir) == false) Directory.CreateDirectory(otherPhotoDir);
+ foreach (var otherPhoto in otherPhotos)
{
- var targetfile = Path.Combine(legalAidPhotoDir, Path.GetFileName(filepath));
- System.IO.File.Copy(filepath, targetfile);
+ var filepath = Path.Combine(Environment.CurrentDirectory, "wwwroot") + otherPhoto.Replace("/", @"\");
+ if (System.IO.File.Exists(filepath))
+ {
+ var targetfile = Path.Combine(legalAidPhotoDir, Path.GetFileName(filepath));
+ System.IO.File.Copy(filepath, targetfile);
+ }
}
- }
- }
- //存储用户的相关附件
- foreach (var item in users)
- {
- //["/CaseFile/card/2023-11-21/20231121200659497.jpg"]
- var userdir = Path.Combine(packegdir, "users", item.cardId);
-
- //保存身份证图片
- var cardids = item.cardIdphoto.ConvertToModel>();
- var cardidDir = Path.Combine(userdir, "cardids");
- if (Directory.Exists(cardidDir) == false) Directory.CreateDirectory(cardidDir);
- foreach (var file in cardids)
+ }
+ //存储用户的相关附件
+ foreach (var item in users)
{
- var filepath = Path.Combine(Environment.CurrentDirectory, "wwwroot") + file.Replace("/", @"\");
- if (System.IO.File.Exists(filepath))
+ //["/CaseFile/card/2023-11-21/20231121200659497.jpg"]
+ var userdir = Path.Combine(packegdir, "users", item.cardId);
+
+ //保存身份证图片
+ var cardids = item.cardIdphoto.ConvertToModel>();
+ var cardidDir = Path.Combine(userdir, "cardids");
+ if (Directory.Exists(cardidDir) == false) Directory.CreateDirectory(cardidDir);
+ foreach (var file in cardids)
{
- System.IO.File.Copy(filepath, Path.Combine(cardidDir, Path.GetFileName(filepath)));
+ var filepath = Path.Combine(Environment.CurrentDirectory, "wwwroot") + file.Replace("/", @"\");
+ if (System.IO.File.Exists(filepath))
+ {
+ System.IO.File.Copy(filepath, Path.Combine(cardidDir, Path.GetFileName(filepath)));
+ }
}
- }
- //保存工作证图片 律师职业证书
- var identityphotos = item.identityphoto.ConvertToModel>();
- var identityphotosDir = Path.Combine(userdir, "identityphotos");
- if (Directory.Exists(identityphotosDir) == false) Directory.CreateDirectory(identityphotosDir);
- foreach (var file in identityphotos)
- {
- var filepath = Path.Combine(Environment.CurrentDirectory, "wwwroot") + file.Replace("/", @"\");
- if (System.IO.File.Exists(filepath))
+ //保存工作证图片 律师职业证书
+ var identityphotos = item.identityphoto.ConvertToModel>();
+ var identityphotosDir = Path.Combine(userdir, "identityphotos");
+ if (Directory.Exists(identityphotosDir) == false) Directory.CreateDirectory(identityphotosDir);
+ foreach (var file in identityphotos)
{
- System.IO.File.Copy(filepath, Path.Combine(identityphotosDir, Path.GetFileName(filepath)));
+ var filepath = Path.Combine(Environment.CurrentDirectory, "wwwroot") + file.Replace("/", @"\");
+ if (System.IO.File.Exists(filepath))
+ {
+ System.IO.File.Copy(filepath, Path.Combine(identityphotosDir, Path.GetFileName(filepath)));
+ }
}
- }
- var departmentPhotos = item.departmentPhoto.ConvertToModel>();
- var departmentPhotosDir = Path.Combine(userdir, "departmentPhotos");
- if (Directory.Exists(departmentPhotosDir) == false) Directory.CreateDirectory(departmentPhotosDir);
- foreach (var file in departmentPhotos)
- {
- var filepath = Path.Combine(Environment.CurrentDirectory, "wwwroot") + file.Replace("/", @"\");
- if (System.IO.File.Exists(filepath))
+ var departmentPhotos = item.departmentPhoto.ConvertToModel>();
+ var departmentPhotosDir = Path.Combine(userdir, "departmentPhotos");
+ if (Directory.Exists(departmentPhotosDir) == false) Directory.CreateDirectory(departmentPhotosDir);
+ foreach (var file in departmentPhotos)
{
- System.IO.File.Copy(filepath, Path.Combine(departmentPhotosDir, Path.GetFileName(filepath)));
+ var filepath = Path.Combine(Environment.CurrentDirectory, "wwwroot") + file.Replace("/", @"\");
+ if (System.IO.File.Exists(filepath))
+ {
+ System.IO.File.Copy(filepath, Path.Combine(departmentPhotosDir, Path.GetFileName(filepath)));
+ }
}
}
- }
- ZipFile.CreateFromDirectory(packegdir, packegzipname);
- Directory.Delete(packegdir, true);
+ ZipFile.CreateFromDirectory(packegdir, packegzipname);
+ Directory.Delete(packegdir, true);
- result.result = $"/temp/{packegdirname}.zip";
- result.IsSucceed = true;
- return result;
+ result.result = $"/temp/{packegdirname}.zip";
+ result.IsSucceed = true;
+ return result;
+ }
+ catch(Exception ex)
+ {
+ result.IsSucceed = false;
+ result.Message = ex.Message;
+ return result;
+ }
}
-
[HttpPost]
[Route("UploadSignImage")]
///
diff --git a/24Hour/TwentySystemProxyClient.cs b/24Hour/TwentySystemProxyClient.cs
index 74a6009..cff895b 100644
--- a/24Hour/TwentySystemProxyClient.cs
+++ b/24Hour/TwentySystemProxyClient.cs
@@ -1,9 +1,11 @@
using com.sun.xml.@internal.xsom;
+using Dto;
using Elight.Entity.APPDto.Lawyer;
using Elight.Utility;
using Elight.Utility.Code;
using Elight.Utility.Extensions;
using Microsoft.AspNetCore.DataProtection;
+using Microsoft.AspNetCore.Mvc;
namespace _24Hour
{
@@ -20,6 +22,19 @@ namespace _24Hour
httpCliet.DefaultRequestHeaders.Add("User-Agent", "HttpClientFactory-Sample");
httpCliet.DefaultRequestHeaders.ConnectionClose = true;
}
+
+ ///
+ /// 申请人资格资料
+ ///
+ ///
+ [HttpPost("UploadImage")]
+ public async Task UploadImage(UploadDto dto)
+ {
+ var request = await httpCliet.PostAsJsonAsync($"/TwentySystem/UploadImage", dto);
+ var response = await request.EnsureSuccessStatusCode().Content.ReadAsStringAsync();
+ return response.ConvertToModel();
+ }
+
public async Task>> GetCaseList(string? casename, string? bmsah, string? dwbm, DateTime? starttime, DateTime? endtime, int page, int size)
{
Result> Result = new();
@@ -91,7 +106,6 @@ namespace _24Hour
}
return Result;
}
-
public async Task> GetArchivesInfo(string bmsah, string dwbm)
{
var result = new Result();
@@ -200,5 +214,28 @@ namespace _24Hour
public string? sfkcz { get; set; }
public string? qlzt { get; set; }
}
+ class MyClass
+ {
+ ///
+ /// 部门受案号
+ ///
+ public string bmsah { get; set; }
+
+ ///
+ /// base64字符串
+ ///
+ public string ImageStr { get; set; }
+
+ ///
+ /// 1423000000100-律师执业证书,
+ /// 1423000000200-律师事务所证,
+ /// 1423000000300-授权委托书,
+ /// 1423000000400-法律援助公函,
+ /// 1423000000500-身份证件 ,
+ /// 1423000000600-关系证明材料,
+ /// 1423000000700-其他
+ ///
+ public string Code { get; set; }
+ }
}
}
diff --git a/Dto/obj/Debug/net6.0/Dto.AssemblyInfoInputs.cache b/Dto/obj/Debug/net6.0/Dto.AssemblyInfoInputs.cache
deleted file mode 100644
index 682e218..0000000
--- a/Dto/obj/Debug/net6.0/Dto.AssemblyInfoInputs.cache
+++ /dev/null
@@ -1 +0,0 @@
-24467ac260176f765658abbc64d2580ba42c4bc0
diff --git a/Dto/obj/Debug/net6.0/Dto.GeneratedMSBuildEditorConfig.editorconfig b/Dto/obj/Debug/net6.0/Dto.GeneratedMSBuildEditorConfig.editorconfig
deleted file mode 100644
index df431c4..0000000
--- a/Dto/obj/Debug/net6.0/Dto.GeneratedMSBuildEditorConfig.editorconfig
+++ /dev/null
@@ -1,11 +0,0 @@
-is_global = true
-build_property.TargetFramework = net6.0
-build_property.TargetPlatformMinVersion =
-build_property.UsingMicrosoftNETSdkWeb =
-build_property.ProjectTypeGuids =
-build_property.InvariantGlobalization =
-build_property.PlatformNeutralAssembly =
-build_property.EnforceExtendedAnalyzerRules =
-build_property._SupportedPlatformList = Linux,macOS,Windows
-build_property.RootNamespace = Dto
-build_property.ProjectDir = C:\core\24Hour.Service\Dto\
diff --git a/Dto/obj/Debug/net6.0/Dto.assets.cache b/Dto/obj/Debug/net6.0/Dto.assets.cache
deleted file mode 100644
index ad3f561..0000000
Binary files a/Dto/obj/Debug/net6.0/Dto.assets.cache and /dev/null differ
diff --git a/Dto/obj/Debug/net6.0/Dto.csproj.AssemblyReference.cache b/Dto/obj/Debug/net6.0/Dto.csproj.AssemblyReference.cache
deleted file mode 100644
index f0352d1..0000000
Binary files a/Dto/obj/Debug/net6.0/Dto.csproj.AssemblyReference.cache and /dev/null differ
diff --git a/Dto/obj/Dto.csproj.nuget.dgspec.json b/Dto/obj/Dto.csproj.nuget.dgspec.json
deleted file mode 100644
index 7917001..0000000
--- a/Dto/obj/Dto.csproj.nuget.dgspec.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
- "format": 1,
- "restore": {
- "C:\\core\\24Hour.Service\\Dto\\Dto.csproj": {}
- },
- "projects": {
- "C:\\core\\24Hour.Service\\Dto\\Dto.csproj": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "C:\\core\\24Hour.Service\\Dto\\Dto.csproj",
- "projectName": "Dto",
- "projectPath": "C:\\core\\24Hour.Service\\Dto\\Dto.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "C:\\core\\24Hour.Service\\Dto\\obj\\",
- "projectStyle": "PackageReference",
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "C:\\游戏文件夹\\Dll": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {}
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48",
- "net481"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "frameworkReferences": {
- "Microsoft.NETCore.App": {
- "privateAssets": "all"
- }
- },
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/Dto/obj/Dto.csproj.nuget.g.props b/Dto/obj/Dto.csproj.nuget.g.props
deleted file mode 100644
index 1781920..0000000
--- a/Dto/obj/Dto.csproj.nuget.g.props
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
- True
- NuGet
- $(MSBuildThisFileDirectory)project.assets.json
- $(UserProfile)\.nuget\packages\
- C:\Users\Administrator\.nuget\packages\
- PackageReference
- 6.6.0
-
-
-
-
-
\ No newline at end of file
diff --git a/Dto/obj/project.assets.json b/Dto/obj/project.assets.json
deleted file mode 100644
index 40de25d..0000000
--- a/Dto/obj/project.assets.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
- "version": 3,
- "targets": {
- "net6.0": {}
- },
- "libraries": {},
- "projectFileDependencyGroups": {
- "net6.0": []
- },
- "packageFolders": {
- "C:\\Users\\Administrator\\.nuget\\packages\\": {}
- },
- "project": {
- "version": "1.0.0",
- "restore": {
- "projectUniqueName": "C:\\core\\24Hour.Service\\Dto\\Dto.csproj",
- "projectName": "Dto",
- "projectPath": "C:\\core\\24Hour.Service\\Dto\\Dto.csproj",
- "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
- "outputPath": "C:\\core\\24Hour.Service\\Dto\\obj\\",
- "projectStyle": "PackageReference",
- "configFilePaths": [
- "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
- ],
- "originalTargetFrameworks": [
- "net6.0"
- ],
- "sources": {
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "C:\\游戏文件夹\\Dll": {},
- "https://api.nuget.org/v3/index.json": {}
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "projectReferences": {}
- }
- },
- "warningProperties": {
- "warnAsError": [
- "NU1605"
- ]
- }
- },
- "frameworks": {
- "net6.0": {
- "targetAlias": "net6.0",
- "imports": [
- "net461",
- "net462",
- "net47",
- "net471",
- "net472",
- "net48",
- "net481"
- ],
- "assetTargetFallback": true,
- "warn": true,
- "frameworkReferences": {
- "Microsoft.NETCore.App": {
- "privateAssets": "all"
- }
- },
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
- }
- }
- }
-}
\ No newline at end of file
diff --git a/Dto/obj/project.nuget.cache b/Dto/obj/project.nuget.cache
deleted file mode 100644
index de8b953..0000000
--- a/Dto/obj/project.nuget.cache
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "version": 2,
- "dgSpecHash": "aBP4DpXaMgoARxZa7jC+2/OpB8f0apQvutUjpKvCZq5BqhIvN/WzLcvuunyUhHgo503i8NiV6jJvit7a9mkSCQ==",
- "success": true,
- "projectFilePath": "C:\\core\\24Hour.Service\\Dto\\Dto.csproj",
- "expectedPackageFiles": [],
- "logs": []
-}
\ No newline at end of file