linyang
/
24Hour.Service
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

dto设置可空，处理2.0无法上传的bug

develop
胡超1 2 years ago
parent
78be337c66
commit
b4b153d438
5 changed files with 131 additions and 109 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. 30
      Dto/ApplyMarKingDto.cs
  2. 1
      Dto/UploadDto.cs
  3. 7
      Dto/obj/Debug/net6.0/Dto.AssemblyInfo.cs
  4. 2
      Dto/obj/Debug/net6.0/Dto.csproj.CoreCompileInputs.cache
  5. 200
      WebApplication1/Controllers/TwentySystemController.cs

30
Dto/ApplyMarKingDto.cs
Unescape View File

@ -11,54 +11,54 @@ namespace Dto
/// <summary> /// <summary>
/// 必要 /// 必要
/// </summary> /// </summary>
public string bhdlbh { get; set; } public string? bhdlbh { get; set; }
/// <summary> /// <summary>
/// 部门受案号 /// 部门受案号
/// </summary> /// </summary>
public string bmsah { get; set; } public string? bmsah { get; set; }
public string clqkbm { get; set; } public string? clqkbm { get; set; }
public string clqkmc { get; set; } public string? clqkmc { get; set; }
/// <summary> /// <summary>
/// 承办人 /// 承办人
/// </summary> /// </summary>
public string czr { get; set; } public string? czr { get; set; }
/// <summary> /// <summary>
/// 承办人编码 /// 承办人编码
/// </summary> /// </summary>
public string czrybm { get; set; } public string? czrybm { get; set; }
/// <summary> /// <summary>
/// 单位编号 /// 单位编号
/// </summary> /// </summary>
public string dwbm { get; set; } public string? dwbm { get; set; }
public string jwgksxid { get; set; } public string? jwgksxid { get; set; }
/// <summary> /// <summary>
/// 申请人类型代码 /// 申请人类型代码
/// </summary> /// </summary>
public string sqrlxdm { get; set; } public string? sqrlxdm { get; set; }
/// <summary> /// <summary>
/// 申请人名称 /// 申请人名称
/// </summary> /// </summary>
public string sqrmc { get; set; } public string? sqrmc { get; set; }
/// <summary> /// <summary>
/// 申请日期 /// 申请日期
/// </summary> /// </summary>
public string sqrq { get; set; } public string? sqrq { get; set; }
/// <summary> /// <summary>
/// 申请人身份代码 /// 申请人身份代码
/// </summary> /// </summary>
public string sqrsfdm { get; set; } public string? sqrsfdm { get; set; }
/// <summary> /// <summary>
/// 事项类型代码 /// 事项类型代码
/// </summary> /// </summary>
public string sxlxdm { get; set; } public string? sxlxdm { get; set; }
/// <summary> /// <summary>
/// 事项类型名称 /// 事项类型名称
/// </summary> /// </summary>
public string sxlxmc { get; set; } public string? sxlxmc { get; set; }
/// <summary> /// <summary>
/// 当事人 /// 当事人
/// </summary> /// </summary>
public string zrrmc { get; set; } public string? zrrmc { get; set; }
} }

1
Dto/UploadDto.cs
Unescape View File

@ -11,6 +11,7 @@
/// base64字符串 /// base64字符串
/// </summary> /// </summary>
public string ImageStr { get; set; } public string ImageStr { get; set; }
public string Bhdlbm { get; set; }
/// <summary> /// <summary>
/// 1423000000100-律师执业证书,1423000000200-律师事务所证, 1423000000300- 授权委托书, 1423000000400- 法律援助公函,1423000000500-身份证件 ,1423000000600-关系证明材料, 1423000000700- 其他 /// 1423000000100-律师执业证书,1423000000200-律师事务所证, 1423000000300- 授权委托书, 1423000000400- 法律援助公函,1423000000500-身份证件 ,1423000000600-关系证明材料, 1423000000700- 其他

7
Dto/obj/Debug/net6.0/Dto.AssemblyInfo.cs
Unescape View File

@ -1,9 +1,10 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // 此代码由工具生成。
// 运行时版本:4.0.30319.42000
// //
// Changes to this file may cause incorrect behavior and will be lost if // 对此文件的更改可能会导致不正确的行为，并且如果
// the code is regenerated. // 重新生成代码，这些更改将会丢失。
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------

2
Dto/obj/Debug/net6.0/Dto.csproj.CoreCompileInputs.cache
Unescape View File

@ -1 +1 @@
cc7e514c4ce4ef06a7f82aece20a70c7d8114bfe 6045bad44ea6ca22bfa9bf856af27786e542aa85

200
WebApplication1/Controllers/TwentySystemController.cs
Unescape View File

@ -387,101 +387,102 @@ namespace WebApplication1.Controllers
result.Message = "Êý¾Ý²»´æÔÚ"; result.Message = "Êý¾Ý²»´æÔÚ";
return result; return result;
} }
if (resultGzbl.data != null && resultGzbl.data.coumment != null && resultGzbl.data.coumment.Count > 0) if (resultGzbl.data != null && resultGzbl.data.coumment != null)
{ {
foreach (var item in resultGzbl.data.coumment) //文件名称
string fileName = dto.FileName.Split('.')[0];
//后缀
string suffix = dto.FileName.Split('.')[1];
string id = Guid.NewGuid().ToString().Replace("-", null);
//重要参数
//item.bhdlbh
string dir = "yxsj/" + dto.UnitCode + "/bhdl-service/cl/" + dto.Bmsah + "/" + dto.Bhdlbm;
///解码
// var base64Iamge = HttpUtility.UrlDecode(dto.ImageStr);
byte[] DocBytes = Convert.FromBase64String(dto.ImageStr);
var memoryStream = new MemoryStream(DocBytes);
System.IO.File.WriteAllBytes(id + "." + suffix, DocBytes);
var content = new MultipartFormDataContent();
var fileContent = new StreamContent(memoryStream);
content.Add(fileContent, "file", id + "." + suffix);
content.Add(new StringContent(dir), "dir");
content.Add(new StringContent(id + "." + suffix), "name");
content.Add(new StringContent("true"), "overrideOnExists");
var responses = await httpClient.PostAsync("/wjfw-service/raw/file/save", content);
var sresponse = await responses.Content.ReadAsStringAsync();
if (!string.IsNullOrEmpty(sresponse))
{ {
//文件名称 var fileResultDto = JsonConvert.DeserializeObject<FileResultDto>(sresponse);
string fileName = dto.FileName.Split('.')[0]; if (fileResultDto.success == true && fileResultDto.code == "0")
//后缀
string suffix = dto.FileName.Split('.')[1];
string id = Guid.NewGuid().ToString().Replace("-", null);
//重要参数
//item.bhdlbh
string dir = "yxsj/" + dto.UnitCode + "/bhdl-service/cl/" + dto.Bmsah + "/" + item.bhdlbh;
///解码
// var base64Iamge = HttpUtility.UrlDecode(dto.ImageStr);
byte[] DocBytes = Convert.FromBase64String(dto.ImageStr);
var memoryStream = new MemoryStream(DocBytes);
System.IO.File.WriteAllBytes(id + "." + suffix, DocBytes);
var content = new MultipartFormDataContent();
var fileContent = new StreamContent(memoryStream);
content.Add(fileContent, "file", id + "." + suffix);
content.Add(new StringContent(dir), "dir");
content.Add(new StringContent(id + "." + suffix), "name");
content.Add(new StringContent("true"), "overrideOnExists");
var responses = await httpClient.PostAsync("/wjfw-service/raw/file/save", content);
var sresponse = await responses.Content.ReadAsStringAsync();
if (!string.IsNullOrEmpty(sresponse))
{ {
var fileResultDto = JsonConvert.DeserializeObject<FileResultDto>(sresponse); SaveBhdlclxxDto saveBhdlclxxDto = new SaveBhdlclxxDto()
if (fileResultDto.success == true && fileResultDto.code == "0")
{ {
SaveBhdlclxxDto saveBhdlclxxDto = new SaveBhdlclxxDto()
{
bhdlbh = item.bhdlbh, bhdlbh = dto.Bhdlbm,
bmsah = dto.Bmsah, bmsah = dto.Bmsah,
dwbm = dto.UnitCode, dwbm = dto.UnitCode,
dwmc = dto.UnitName, dwmc = dto.UnitName,
sxbh = "", sxbh = "",
}; };
if (dto.Code == "1423000000100") if (dto.Code == "1423000000100")
{ {
saveBhdlclxxDto.cllxdm = "1423000000100"; saveBhdlclxxDto.cllxdm = "1423000000100";
saveBhdlclxxDto.cllxmc = "律师执业证书"; saveBhdlclxxDto.cllxmc = "律师执业证书";
} }
else if (dto.Code == "1423000000200") else if (dto.Code == "1423000000200")
{ {
saveBhdlclxxDto.cllxdm = "1423000000200"; saveBhdlclxxDto.cllxdm = "1423000000200";
saveBhdlclxxDto.cllxmc = "律师事务所证"; saveBhdlclxxDto.cllxmc = "律师事务所证";
} }
else if (dto.Code == "1423000000300") else if (dto.Code == "1423000000300")
{ {
saveBhdlclxxDto.cllxdm = "1423000000300"; saveBhdlclxxDto.cllxdm = "1423000000300";
saveBhdlclxxDto.cllxmc = "授权委托书"; saveBhdlclxxDto.cllxmc = "授权委托书";
} }
else if (dto.Code == "1423000000400") else if (dto.Code == "1423000000400")
{ {
saveBhdlclxxDto.cllxdm = "1423000000400"; saveBhdlclxxDto.cllxdm = "1423000000400";
saveBhdlclxxDto.cllxmc = "法律援助公函"; saveBhdlclxxDto.cllxmc = "法律援助公函";
} }
else if (dto.Code == "1423000000500") else if (dto.Code == "1423000000500")
{ {
saveBhdlclxxDto.cllxdm = "1423000000500"; saveBhdlclxxDto.cllxdm = "1423000000500";
saveBhdlclxxDto.cllxmc = "身份证件"; saveBhdlclxxDto.cllxmc = "身份证件";
} }
else if (dto.Code == "1423000000600") else if (dto.Code == "1423000000600")
{ {
saveBhdlclxxDto.cllxdm = "1423000000600"; saveBhdlclxxDto.cllxdm = "1423000000600";
saveBhdlclxxDto.cllxmc = "关系证明材料"; saveBhdlclxxDto.cllxmc = "关系证明材料";
} }
else if (dto.Code == "1423000000700") else if (dto.Code == "1423000000700")
{ {
saveBhdlclxxDto.cllxdm = "1423000000700"; saveBhdlclxxDto.cllxdm = "1423000000700";
saveBhdlclxxDto.cllxmc = "其他"; saveBhdlclxxDto.cllxmc = "其他";
} }
List<BhdlClxxInputDTOList> bhdlClxxInputDTOLists = new List<BhdlClxxInputDTOList>(); List<BhdlClxxInputDTOList> bhdlClxxInputDTOLists = new List<BhdlClxxInputDTOList>();
bhdlClxxInputDTOLists.Add(new BhdlClxxInputDTOList() bhdlClxxInputDTOLists.Add(new BhdlClxxInputDTOList()
{ {
clbh = id, clbh = id,
fwqwjmc = id + "." + suffix,// dto.FileName, fwqwjmc = id + "." + suffix,// dto.FileName,
md5 = fileResultDto.data.storageResult.md5, md5 = fileResultDto.data.storageResult.md5,
wjkzm = suffix, wjkzm = suffix,
wjlj = dir, wjlj = dir,
wjmc = fileName, wjmc = fileName,
wjzjs = fileResultDto.data.size wjzjs = fileResultDto.data.size
}); });
saveBhdlclxxDto.bhdlClxxInputDTOList = bhdlClxxInputDTOLists; saveBhdlclxxDto.bhdlClxxInputDTOList = bhdlClxxInputDTOLists;
var httpResponse = await httpClient.PostAsJsonAsync("/bhdl-service/api/bhdlCl/saveBhdlclxx", saveBhdlclxxDto); var httpResponse = await httpClient.PostAsJsonAsync("/bhdl-service/api/bhdlCl/saveBhdlclxx", saveBhdlclxxDto);
try
{
var resultDataDto = await httpResponse.EnsureSuccessStatusCode().Content.ReadAsStringAsync(); var resultDataDto = await httpResponse.EnsureSuccessStatusCode().Content.ReadAsStringAsync();
var dataDto = JsonConvert.DeserializeObject<ResultDataDto<AjgldsrxxDto>>(resultDataDto); var dataDto = JsonConvert.DeserializeObject<ResultDataDto<List<string>>>(resultDataDto);
if (dataDto.success == true && dataDto.code == "0") if (dataDto.success == true && dataDto.code == "0")
{ {
result.IsSucceed = true; result.IsSucceed = true;
@ -493,8 +494,18 @@ namespace WebApplication1.Controllers
result.Message = dataDto.message; result.Message = dataDto.message;
} }
}
catch (Exception ex)
{
result.IsSucceed = false;
result.Message = ex.Message;
} }
var filenam = id + "." + suffix;
if (System.IO.File.Exists(filenam))
{
System.IO.File.Delete(filenam);
}
} }
} }
} }
@ -503,6 +514,7 @@ namespace WebApplication1.Controllers
result.IsSucceed = false; result.IsSucceed = false;
result.Message = resultGzbl.message; result.Message = resultGzbl.message;
} }
return result; return result;
} }
@ -819,10 +831,15 @@ namespace WebApplication1.Controllers
var resultStringDto = JsonConvert.DeserializeObject<ResultStringDto>(addRuslt); var resultStringDto = JsonConvert.DeserializeObject<ResultStringDto>(addRuslt);
if (resultStringDto.success == false || resultStringDto.code != "0") if (resultStringDto.success == false || resultStringDto.code != "0")
{ {
result.IsSucceed = false; result.IsSucceed = false;
result.Message = resultStringDto.message; result.Message = resultStringDto.message;
return result; return result;
} }
if (string.IsNullOrEmpty(saveBhdlDjxxDto.bhdlbh))
{
saveBhdlDjxxDto.bhdlbh = resultStringDto.data;
}
result.IsSucceed = true; result.IsSucceed = true;
result.result = saveBhdlDjxxDto; result.result = saveBhdlDjxxDto;
return result; return result;
@ -942,8 +959,11 @@ namespace WebApplication1.Controllers
result.Message = "Êý¾Ý²»´æÔÚ"; result.Message = "Êý¾Ý²»´æÔÚ";
return result; return result;
} }
if (resultGzbl.data.coumment.Count>0)
{
dto.bhdlbh = resultGzbl.data.coumment.FirstOrDefault()?.bhdlbh;
}
dto.bhdlbh = resultGzbl.data.coumment.FirstOrDefault()?.bhdlbh;
dto.clqkbm = ""; dto.clqkbm = "";
dto.clqkmc = ""; dto.clqkmc = "";
dto.jwgksxid = ""; dto.jwgksxid = "";

Write Preview
Loading…
Cancel
Save