diff --git a/24Hour/Controllers/Common/LawyerArchivesController.cs b/24Hour/Controllers/Common/LawyerArchivesController.cs index 587109a..3cb2be6 100644 --- a/24Hour/Controllers/Common/LawyerArchivesController.cs +++ b/24Hour/Controllers/Common/LawyerArchivesController.cs @@ -36,78 +36,21 @@ namespace _24Hour.Controllers.Common App_Sys_UserModel _userdata = new App_Sys_UserModel();//当前用户 private readonly ILogger _logger;//日志 Result result = new Result(); + private readonly CaseServiceTwentyClient twentyClient; private readonly IMapper mapper; - public LawyerArchivesController(ILogger logger, SqlSugarClient db, WriteSysLog logs, User user, IMapper _mapper) + public LawyerArchivesController(ILogger logger, SqlSugarClient db, WriteSysLog logs, User user, IMapper _mapper,CaseServiceTwentyClient _twentyClient) { this._logger = logger; _db = db; _logs = logs; _userdata = user.Userdata(); this.mapper = _mapper; + this.twentyClient = _twentyClient; } #endregion - - - #region 律师阅卷 /// - /// 加密二维码信息 - /// - /// - [HttpGet] - [Route("EncodeData")] - public async Task EncodeData(string id) - { - var data = await _db.Queryable().LeftJoin((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(data.info), - user = mapper.Map(data.user) - }; - var encodingdata = Convert.ToBase64String(Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(dto))); - result.IsSucceed = true; - result.result = encodingdata; - } - return result; - } - - /// - /// 解码二维码信息 - /// - /// - [HttpPost] - [Route("DecodeQRData")] - public Task 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); - } - /// /// 同步外网律师人员信息(未完成) (根据律师身份证号更新或新增用户信息) /// /// @@ -135,6 +78,7 @@ namespace _24Hour.Controllers.Common { //insert _db.BeginTran(); + user.Id = Guid.NewGuid().ToString(); var num = await _db.Insertable(user).ExecuteCommandAsync(); _db.CommitTran(); if (num > 0) @@ -156,43 +100,6 @@ namespace _24Hour.Controllers.Common return result; } /// - /// 同步外网预约信息（不需要调用此接口） - /// - /// - /// - [HttpPost] - [Route("AddLawyerServiceInfo")] - public async Task AddLawyerServiceInfo(App_LawyerServicesModel info) - { - var data = await _db.Queryable().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(info); - return result; - } - else - { - result.IsSucceed = false; - result.Message = "添加失败"; - return result; - } - - } - } - /// /// 查询律师阅卷信息 /// /// @@ -219,7 +126,6 @@ namespace _24Hour.Controllers.Common result.result = data; return result; } - public class DecodeData { public string EncodingString { get; set; } @@ -269,7 +175,7 @@ namespace _24Hour.Controllers.Common /// /// /// - [HttpPost] + [HttpDelete] [Route("DeleteLawyerArchives")] public async Task DeleteLawyerArchives(CurrencyDelete Currency) { @@ -304,7 +210,7 @@ namespace _24Hour.Controllers.Common /// /// /// - [HttpPost] + [HttpPut] [Route("UpdateLawyerArchives")] public async Task UpdateLawyerArchives(LawyerArchivesDto Lawyerdata) { @@ -356,26 +262,28 @@ namespace _24Hour.Controllers.Common /// [HttpGet] [Route("QueryFileFromtwenty")] - public Task QueryFileFromtwenty(string bmsah) + public async Task QueryFileFromtwenty(string bmsah) { if (bmsah == "安北检刑诉受[2023]433333333333号") { - var a = GetInfo(); - var data = new + var a = await twentyClient.GetArchivesInfo(bmsah); + var data = new[] { - id = a.jzbh, - lable = a.jzmc, - children = a?.jzml?.Select(x => new - { - id = x.mlbh, - lable = x.mlxsmc, - children = x.jzwj.Select(q => new + new { + id = a.jzbh, + lable = a.jzmc, + children = a?.jzml?.Select(x => new { - id = q.wjxh, - lable = q.wjxsmc, - filepath = q.jpgwjlj + id = x.mlbh, + lable = x.mlxsmc, + children = x.jzwj.Select(q => new + { + id = q.wjxh, + lable = q.wjxsmc, + filepath = q.jpgwjlj + }) }) - }) + } }; result.IsSucceed = true; result.result = data; @@ -384,40 +292,57 @@ namespace _24Hour.Controllers.Common { result.IsSucceed = false; } - return Task.FromResult(result); - } - private JZJBXXDto GetInfo() - { - var path = Path.Combine(Environment.CurrentDirectory, "datajson.txt"); - var json = System.IO.File.ReadAllText(path); - var convert = json.ConvertToModel(); - 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; + return result; } /// /// 上传已选中的第三级页码的id /// - /// - /// + /// /// + /// + /// { + /// "IsSucceed": false, + /// "Message": null, + /// "result": "9f272d7f-2b66-4314-95a3-ca4e0de2b1ec" + /// } + ///返回的id 用于在调用 AddLawyerArchives 传入jzlbxxId + /// [HttpPost("AddArchivesInfoByChildId")] - public Task AddArchivesInfoByChildId(AddArchivesInfoInput input) + public async Task 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 /// /// 添加卷宗信息 /// /// /// + [HiddenApi] [HttpPost] [Route("AddArchivesInfo")] public async Task> AddArchivesInfo(JZJBXXDto dto) @@ -447,7 +372,102 @@ namespace _24Hour.Controllers.Common return res; } } + /// + /// 同步外网预约信息（不需要调用此接口） + /// + /// + /// + [HttpPost] + [HiddenApi] + [Route("AddLawyerServiceInfo")] + public async Task AddLawyerServiceInfo(App_LawyerServicesModel info) + { + var data = await _db.Queryable().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(info); + return result; + } + else + { + result.IsSucceed = false; + result.Message = "添加失败"; + return result; + } + + } + } + /// + /// 加密二维码信息 + /// + /// + [HttpGet] + [HiddenApi] + [Route("EncodeData")] + public async Task EncodeData(string id) + { + var data = await _db.Queryable().LeftJoin((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(data.info), + user = mapper.Map(data.user) + }; + var encodingdata = Convert.ToBase64String(Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(dto))); + result.IsSucceed = true; + result.result = encodingdata; + } + return result; + } + + /// + /// 解码二维码信息 + /// + /// + [HttpPost] + [HiddenApi] + [Route("DecodeQRData")] + public Task 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 } }