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

调整函数顺序

develop-lawyerExampaper
胡超1 2 years ago
parent
13f6be3b83
commit
6b91056206
1 changed files with 155 additions and 135 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. 268
      24Hour/Controllers/Common/LawyerArchivesController.cs

268
24Hour/Controllers/Common/LawyerArchivesController.cs
Unescape View File

@ -36,78 +36,21 @@ namespace _24Hour.Controllers.Common
App_Sys_UserModel _userdata = new App_Sys_UserModel();//当前用户 App_Sys_UserModel _userdata = new App_Sys_UserModel();//当前用户
private readonly ILogger<LoginController> _logger;//日志 private readonly ILogger<LoginController> _logger;//日志
Result result = new Result(); Result result = new Result();
private readonly CaseServiceTwentyClient twentyClient;
private readonly IMapper mapper; private readonly IMapper mapper;
public LawyerArchivesController(ILogger<LoginController> logger, SqlSugarClient db, WriteSysLog logs, User user, IMapper _mapper) public LawyerArchivesController(ILogger<LoginController> logger, SqlSugarClient db, WriteSysLog logs, User user, IMapper _mapper,CaseServiceTwentyClient _twentyClient)
{ {
this._logger = logger; this._logger = logger;
_db = db; _db = db;
_logs = logs; _logs = logs;
_userdata = user.Userdata(); _userdata = user.Userdata();
this.mapper = _mapper; this.mapper = _mapper;
this.twentyClient = _twentyClient;
} }
#endregion #endregion
#region 律师阅卷 #region 律师阅卷
/// <summary> /// <summary>
/// 加密二维码信息
/// </summary>
/// <returns></returns>
[HttpGet]
[Route("EncodeData")]
public async Task<Result> EncodeData(string id)
{
var data = await _db.Queryable<App_LawyerServicesModel>().LeftJoin<App_Sys_UserModel>((lawyer, user) => lawyer.createuserId == user.Id)
.Where(lawyer => lawyer.Id == id)
.Select((lawyer, user) => new
{
info = lawyer,
user
}).FirstAsync();
if (data != null)
{
var dto = new
{
info = mapper.Map<QRLawyerServiceDto>(data.info),
user = mapper.Map<QRUserDto>(data.user)
};
var encodingdata = Convert.ToBase64String(Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(dto)));
result.IsSucceed = true;
result.result = encodingdata;
}
return result;
}
/// <summary>
/// 解码二维码信息
/// </summary>
/// <returns></returns>
[HttpPost]
[Route("DecodeQRData")]
public Task<Result> DecodeQRData(DecodeData data)
{
try
{
var basestr = Convert.FromBase64String(data.EncodingString);
var str = Encoding.UTF8.GetString(basestr);
var model = str.ConvertToAnonymousType(new
{
info = default(QRLawyerServiceDto),
user = default(QRUserDto)
});
result.IsSucceed = true;
result.result = model;
}
catch (System.Exception ex)
{
result.IsSucceed = false;
}
return Task.FromResult(result);
}
/// <summary>
/// 同步外网律师人员信息(未完成) (根据律师身份证号更新或新增用户信息) /// 同步外网律师人员信息(未完成) (根据律师身份证号更新或新增用户信息)
/// </summary> /// </summary>
/// <param name="user"></param> /// <param name="user"></param>
@ -135,6 +78,7 @@ namespace _24Hour.Controllers.Common
{ {
//insert //insert
_db.BeginTran(); _db.BeginTran();
user.Id = Guid.NewGuid().ToString();
var num = await _db.Insertable(user).ExecuteCommandAsync(); var num = await _db.Insertable(user).ExecuteCommandAsync();
_db.CommitTran(); _db.CommitTran();
if (num > 0) if (num > 0)
@ -156,43 +100,6 @@ namespace _24Hour.Controllers.Common
return result; return result;
} }
/// <summary> /// <summary>
/// 同步外网预约信息（不需要调用此接口）
/// </summary>
/// <param name="info"></param>
/// <returns></returns>
[HttpPost]
[Route("AddLawyerServiceInfo")]
public async Task<Result> AddLawyerServiceInfo(App_LawyerServicesModel info)
{
var data = await _db.Queryable<App_LawyerServicesModel>().FirstAsync(x => x.Id == info.Id);
if (data != null)
{
result.IsSucceed = true;
result.Message = "改数据已同步";
return result;
}
else
{
_db.BeginTran();
var num = await _db.Insertable(info).ExecuteCommandAsync();
_db.CommitTran();
if (num > 0)
{
result.IsSucceed = true;
result.Message = "添加成功";
result.result = mapper.Map<LawyerArchivesDto>(info);
return result;
}
else
{
result.IsSucceed = false;
result.Message = "添加失败";
return result;
}
}
}
/// <summary>
/// 查询律师阅卷信息 /// 查询律师阅卷信息
/// </summary> /// </summary>
/// <param name="input"></param> /// <param name="input"></param>
@ -219,7 +126,6 @@ namespace _24Hour.Controllers.Common
result.result = data; result.result = data;
return result; return result;
} }
public class DecodeData public class DecodeData
{ {
public string EncodingString { get; set; } public string EncodingString { get; set; }
@ -269,7 +175,7 @@ namespace _24Hour.Controllers.Common
/// </summary> /// </summary>
/// <param name="info"></param> /// <param name="info"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpDelete]
[Route("DeleteLawyerArchives")] [Route("DeleteLawyerArchives")]
public async Task<Result> DeleteLawyerArchives(CurrencyDelete Currency) public async Task<Result> DeleteLawyerArchives(CurrencyDelete Currency)
{ {
@ -304,7 +210,7 @@ namespace _24Hour.Controllers.Common
/// </summary> /// </summary>
/// <param name="info"></param> /// <param name="info"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPut]
[Route("UpdateLawyerArchives")] [Route("UpdateLawyerArchives")]
public async Task<Result> UpdateLawyerArchives(LawyerArchivesDto Lawyerdata) public async Task<Result> UpdateLawyerArchives(LawyerArchivesDto Lawyerdata)
{ {
@ -356,13 +262,14 @@ namespace _24Hour.Controllers.Common
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
[Route("QueryFileFromtwenty")] [Route("QueryFileFromtwenty")]
public Task<Result> QueryFileFromtwenty(string bmsah) public async Task<Result> QueryFileFromtwenty(string bmsah)
{ {
if (bmsah == "安北检刑诉受[2023]433333333333号") if (bmsah == "安北检刑诉受[2023]433333333333号")
{ {
var a = GetInfo(); var a = await twentyClient.GetArchivesInfo(bmsah);
var data = new var data = new[]
{ {
new {
id = a.jzbh, id = a.jzbh,
lable = a.jzmc, lable = a.jzmc,
children = a?.jzml?.Select(x => new children = a?.jzml?.Select(x => new
@ -376,6 +283,7 @@ namespace _24Hour.Controllers.Common
filepath = q.jpgwjlj filepath = q.jpgwjlj
}) })
}) })
}
}; };
result.IsSucceed = true; result.IsSucceed = true;
result.result = data; result.result = data;
@ -384,40 +292,57 @@ namespace _24Hour.Controllers.Common
{ {
result.IsSucceed = false; result.IsSucceed = false;
} }
return Task.FromResult(result); return result;
}
private JZJBXXDto GetInfo()
{
var path = Path.Combine(Environment.CurrentDirectory, "datajson.txt");
var json = System.IO.File.ReadAllText(path);
var convert = json.ConvertToModel<JZJBXXDto>();
convert.Id = Guid.NewGuid().ToString();
foreach (var ml in convert.jzml)
{
ml.Id = Guid.NewGuid().ToString();
foreach (var item in ml.jzwj)
{
item.Id = Guid.NewGuid().ToString();
}
}
return convert;
} }
/// <summary> /// <summary>
/// 上传已选中的第三级页码的id /// 上传已选中的第三级页码的id
/// </summary> /// </summary>
/// <param name="bmsah"></param> /// <param name="input"></param>
/// <param name="ids"></param>
/// <returns></returns> /// <returns></returns>
/// <remarks>
/// {
/// "IsSucceed": false,
/// "Message": null,
/// "result": "9f272d7f-2b66-4314-95a3-ca4e0de2b1ec"
/// }
///返回的id 用于在调用 AddLawyerArchives 传入jzlbxxId
/// </remarks>
[HttpPost("AddArchivesInfoByChildId")] [HttpPost("AddArchivesInfoByChildId")]
public Task<Result> AddArchivesInfoByChildId(AddArchivesInfoInput input) public async Task<Result> AddArchivesInfoByChildId(AddArchivesInfoInput input)
{ {
return Task.FromResult(result); try
{
var dto = await twentyClient.GetArchivesInfo(input.Bmsah);
//先将没有被选中的第三级文件排除
foreach (var item in dto.jzml)
{
item.jzwj = item.jzwj.Where(x => input.Ids.Contains(x.wjxh)).ToList();
}
//再排除没有文件的目录信息
//这样筛选后获取的数据就可以保证不会出现空子节点的父节点
dto.jzml = dto.jzml.Where(x => x.jzwj.Any()).ToList();
var insert = await AddArchivesInfo(dto);
result.result = insert.result.Id;
}
catch(Exception ex)
{
result.IsSucceed = false;
result.Message = ex.Message;
} }
return result;
}
#endregion
#region HiddenApi
/// <summary> /// <summary>
/// 添加卷宗信息 /// 添加卷宗信息
/// </summary> /// </summary>
/// <param name="dto"></param> /// <param name="dto"></param>
/// <returns></returns> /// <returns></returns>
[HiddenApi]
[HttpPost] [HttpPost]
[Route("AddArchivesInfo")] [Route("AddArchivesInfo")]
public async Task<Result<JZJBXXDto>> AddArchivesInfo(JZJBXXDto dto) public async Task<Result<JZJBXXDto>> AddArchivesInfo(JZJBXXDto dto)
@ -447,7 +372,102 @@ namespace _24Hour.Controllers.Common
return res; return res;
} }
} }
/// <summary>
/// 同步外网预约信息（不需要调用此接口）
/// </summary>
/// <param name="info"></param>
/// <returns></returns>
[HttpPost]
[HiddenApi]
[Route("AddLawyerServiceInfo")]
public async Task<Result> AddLawyerServiceInfo(App_LawyerServicesModel info)
{
var data = await _db.Queryable<App_LawyerServicesModel>().FirstAsync(x => x.Id == info.Id);
if (data != null)
{
result.IsSucceed = true;
result.Message = "改数据已同步";
return result;
}
else
{
_db.BeginTran();
var num = await _db.Insertable(info).ExecuteCommandAsync();
_db.CommitTran();
if (num > 0)
{
result.IsSucceed = true;
result.Message = "添加成功";
result.result = mapper.Map<LawyerArchivesDto>(info);
return result;
}
else
{
result.IsSucceed = false;
result.Message = "添加失败";
return result;
}
}
}
/// <summary>
/// 加密二维码信息
/// </summary>
/// <returns></returns>
[HttpGet]
[HiddenApi]
[Route("EncodeData")]
public async Task<Result> EncodeData(string id)
{
var data = await _db.Queryable<App_LawyerServicesModel>().LeftJoin<App_Sys_UserModel>((lawyer, user) => lawyer.createuserId == user.Id)
.Where(lawyer => lawyer.Id == id)
.Select((lawyer, user) => new
{
info = lawyer,
user
}).FirstAsync();
if (data != null)
{
var dto = new
{
info = mapper.Map<QRLawyerServiceDto>(data.info),
user = mapper.Map<QRUserDto>(data.user)
};
var encodingdata = Convert.ToBase64String(Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(dto)));
result.IsSucceed = true;
result.result = encodingdata;
}
return result;
}
/// <summary>
/// 解码二维码信息
/// </summary>
/// <returns></returns>
[HttpPost]
[HiddenApi]
[Route("DecodeQRData")]
public Task<Result> DecodeQRData(DecodeData data)
{
try
{
var basestr = Convert.FromBase64String(data.EncodingString);
var str = Encoding.UTF8.GetString(basestr);
var model = str.ConvertToAnonymousType(new
{
info = default(QRLawyerServiceDto),
user = default(QRUserDto)
});
result.IsSucceed = true;
result.result = model;
}
catch (System.Exception ex)
{
result.IsSucceed = false;
}
return Task.FromResult(result);
}
#endregion #endregion
} }
} }

Write Preview
Loading…
Cancel
Save