From 6b91056206682e0f736dbb98a1aec1f0351115c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Mon, 23 Oct 2023 19:32:45 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=87=BD=E6=95=B0?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Common/LawyerArchivesController.cs | 290 ++++++++++-------- 1 file changed, 155 insertions(+), 135 deletions(-) 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 } } From ea1d2bfb3bccf22d53fa2001cbdd019d2264f34f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Tue, 24 Oct 2023 00:35:43 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E9=80=9A=E8=BF=87=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=8E=BB=E7=A1=AE=E5=AE=9A=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=BC=80=E5=90=AF=E5=AE=9A=E6=97=B6=E4=BB=8E?= =?UTF-8?q?=E6=9E=81=E5=85=89=E7=9A=84api=E8=8E=B7=E5=8F=96=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=EF=BC=8C=E5=B9=B6=E6=B7=BB=E5=8A=A0=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E7=9A=84=E9=85=8D=E7=BD=AE=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 24Hour/appsettings.json | 6 ++++++ Elight.Logic/Job/QuartzHostedService.cs | 21 ++++++++++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/24Hour/appsettings.json b/24Hour/appsettings.json index 120c84b..ecad3e6 100644 --- a/24Hour/appsettings.json +++ b/24Hour/appsettings.json @@ -50,5 +50,11 @@ "secret": "e752e4fba67526eca21313a18c96a58f", "secid": "e752e4fba67526eca21313a18c96a58f", "miniprogram_state": "trial" + }, + "CaseTwenty": { + "SysAddress": "http://127.0.0.1" + }, + "SyncDataFromJiguang": { + "enable": "false" } } diff --git a/Elight.Logic/Job/QuartzHostedService.cs b/Elight.Logic/Job/QuartzHostedService.cs index ee9a9fc..3895dfd 100644 --- a/Elight.Logic/Job/QuartzHostedService.cs +++ b/Elight.Logic/Job/QuartzHostedService.cs @@ -2,6 +2,7 @@ using Elight.Utility.logs; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; +using Microsoft.Extensions.Logging; using Quartz; using Quartz.Spi; using SqlSugar; @@ -19,16 +20,30 @@ namespace Elight.Logic.Job private readonly ISchedulerFactory _schedulerFactory; private readonly IJobFactory _jobFactory; private readonly WsJob _myJob; + private readonly IConfiguration configuration; + private readonly ILogger logger; - public QuartzHostedService(ISchedulerFactory schedulerFactory, IJobFactory jobFactory, WsJob myJob, IConfiguration configuration) + public QuartzHostedService(ISchedulerFactory schedulerFactory, IJobFactory jobFactory, WsJob myJob, IConfiguration _configuration, ILogger _logger) { _schedulerFactory = schedulerFactory; _jobFactory = jobFactory; _myJob = myJob; + this.configuration = _configuration; + this.logger = _logger; } public async Task StartAsync(CancellationToken cancellationToken) - { + { + if (configuration.GetSection("SyncDataFromJiguang:enable").Value == "false") + { + logger.LogInformation("disabled data sync from jiguang api"); + return; + } + else + { + logger.LogInformation("enable data sync from jiguang api "); + } + try { IScheduler scheduler = await _schedulerFactory.GetScheduler(cancellationToken); @@ -63,7 +78,7 @@ namespace Elight.Logic.Job } catch (Exception ex) { - LogService.WriteLog(ex.Message+"___"+ex.InnerException, "同步程序错误"); + LogService.WriteLog(ex.Message + "___" + ex.InnerException, "同步程序错误"); } #endregion } From 0d0513da483ef3741bab3da26336be0316baedb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Tue, 24 Oct 2023 00:36:11 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=8F=8A=E7=88=B6=E7=BA=A7=E8=8A=82=E7=82=B9?= =?UTF-8?q?id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Elight.Entity/AppMode/Lawyer/JZJBXX.cs | 5 +++++ Elight.Entity/AppMode/Lawyer/JZML.cs | 12 +++++++++++- Elight.Entity/AppMode/Lawyer/JZWJItem.cs | 6 +++++- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/Elight.Entity/AppMode/Lawyer/JZJBXX.cs b/Elight.Entity/AppMode/Lawyer/JZJBXX.cs index 3e0ec19..76dce64 100644 --- a/Elight.Entity/AppMode/Lawyer/JZJBXX.cs +++ b/Elight.Entity/AppMode/Lawyer/JZJBXX.cs @@ -56,5 +56,10 @@ namespace Elight.Entity.AppMode.Lawyer /// 案件类别名称 /// public string ajlbmc { get; set; } + /// + /// 导航 + /// + [Navigate(NavigateType.OneToMany, nameof(JZML.jzId))]//BookA表中的studenId + public List jzml { get; set; }//注意禁止给books手动赋值 } } diff --git a/Elight.Entity/AppMode/Lawyer/JZML.cs b/Elight.Entity/AppMode/Lawyer/JZML.cs index 43d6cc1..beeef6a 100644 --- a/Elight.Entity/AppMode/Lawyer/JZML.cs +++ b/Elight.Entity/AppMode/Lawyer/JZML.cs @@ -22,6 +22,10 @@ namespace Elight.Entity.AppMode.Lawyer [SugarColumn(IsPrimaryKey = true)] public string Id { get; set; } /// + /// 卷宗Id + /// + public string? jzId { get; set; } + /// /// /// public string taskid { get; set; } @@ -65,8 +69,14 @@ namespace Elight.Entity.AppMode.Lawyer /// 单位编码 /// public string dwbm { get; set; } + + /// + /// 导航 + /// + [Navigate(NavigateType.OneToMany, nameof(JZWJItem.jzmlId))]//BookA表中的studenId + public List jzwj { get; set; }//注意禁止给books手动赋值 } - + } diff --git a/Elight.Entity/AppMode/Lawyer/JZWJItem.cs b/Elight.Entity/AppMode/Lawyer/JZWJItem.cs index 3f00d78..a78f4ee 100644 --- a/Elight.Entity/AppMode/Lawyer/JZWJItem.cs +++ b/Elight.Entity/AppMode/Lawyer/JZWJItem.cs @@ -23,6 +23,10 @@ namespace Elight.Entity.AppMode.Lawyer [DataMember] [SugarColumn(IsPrimaryKey = true)] public string Id { get; set; } + /// + /// 卷宗目录Id + /// + public string? jzmlId { get; set; } [DataMember] public string wjxh { get; set; } [DataMember] @@ -69,7 +73,7 @@ namespace Elight.Entity.AppMode.Lawyer /// /// 文件顺序号 排序 /// - public int wjsxh { get; set; } + public string wjsxh { get; set; } [DataMember] /// /// 文件显示名称 第二页 From 110a4e9d95603e854f4498c83d6d694dd9554688 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Tue, 24 Oct 2023 00:36:44 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=88=B6=E7=BA=A7?= =?UTF-8?q?=E8=8A=82=E7=82=B9id=E5=8F=8A=E5=AF=B9=E5=BA=94=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Elight.Entity/APPDto/Lawyer/JZMLDto.cs | 4 ++ Elight.Entity/APPDto/Lawyer/JZWJItemDto.cs | 6 +++ .../APPDto/Lawyer/LawyerArchivesDto.cs | 46 ++++--------------- 3 files changed, 18 insertions(+), 38 deletions(-) diff --git a/Elight.Entity/APPDto/Lawyer/JZMLDto.cs b/Elight.Entity/APPDto/Lawyer/JZMLDto.cs index 5e71099..cea6a37 100644 --- a/Elight.Entity/APPDto/Lawyer/JZMLDto.cs +++ b/Elight.Entity/APPDto/Lawyer/JZMLDto.cs @@ -17,6 +17,10 @@ namespace Elight.Entity.APPDto.Lawyer { public string? Id { get; set; } /// + /// 卷宗Id + /// + public string? jzId { get; set; } + /// /// /// public string? taskid { get; set; } diff --git a/Elight.Entity/APPDto/Lawyer/JZWJItemDto.cs b/Elight.Entity/APPDto/Lawyer/JZWJItemDto.cs index cf88e0a..16d9f96 100644 --- a/Elight.Entity/APPDto/Lawyer/JZWJItemDto.cs +++ b/Elight.Entity/APPDto/Lawyer/JZWJItemDto.cs @@ -18,6 +18,12 @@ namespace Elight.Entity.APPDto.Lawyer /// 文件唯一标识 /// public string? Id { get; set; } + /// + /// 卷宗目录Id + /// + + public string? jzmlId { get; set; } + public string? wjxh { get; set; } /// diff --git a/Elight.Entity/APPDto/Lawyer/LawyerArchivesDto.cs b/Elight.Entity/APPDto/Lawyer/LawyerArchivesDto.cs index fdcb489..0972330 100644 --- a/Elight.Entity/APPDto/Lawyer/LawyerArchivesDto.cs +++ b/Elight.Entity/APPDto/Lawyer/LawyerArchivesDto.cs @@ -12,70 +12,40 @@ namespace Elight.Entity.APPDto.Lawyer { [DataMember] public string? Id { get; set; } - /// - /// 预约记录Id - /// [DataMember] public string? lawyerservicesId { get; set; } - /// - /// 卷宗id - /// [DataMember] public string? jzlbxxId { get; set; } - /// - /// 部门受案号 - /// [DataMember] public string? bmsah { get; set; } - /// - /// 律师Id - /// [DataMember] public string? lawyerId { get; set; } - /// - /// 律师名字 - /// [DataMember] public string? lawyerName { get; set; } - /// - /// 授权开始查阅时间 - /// [DataMember] public DateTime? permissibleStartTime { get; set; } - /// - /// 授权截至查阅时间 - /// [DataMember] public DateTime? permissibleEndTime { get; set; } - /// - /// 实际开始查阅时间 - /// [DataMember] public DateTime? actualStartTime { get; set; } - /// - /// 实际截至查阅时间 - /// [DataMember] public DateTime? actualEndTime { get; set; } - /// - /// 0 待查阅 1查阅中 2 已查阅 - /// [DataMember] public ushort? status { get; set; } - /// - /// 0 未复制 1打印 2刻录 3 both - /// [DataMember] public ushort? copyStatus { get; set; } - /// - /// 0 不限制 1限制打印 2 限制刻录 3全部禁止 - /// [DataMember] public ushort? copyLimit { get; set; } + [DataMember] + public string? remake { get; set; } + [DataMember] + public DateTime? createTime { get; set; } + [DataMember] + public string? createrId { get; set; } /// - /// 备注 + /// 是否删除：0：未删除、1：删除 /// [DataMember] - public string? remake { get; set; } + public int? IsDeleted { get; set; } = 0; } } From b81c9b149744f9a8c8282c8cc3e5c90a69718f5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Tue, 24 Oct 2023 00:37:22 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E7=BB=99=E4=B8=80=E4=BD=93=E6=9C=BA?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=A4=E4=B8=AA=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Common/LawyerArchivesController.cs | 63 ++++++++++++++++--- 1 file changed, 55 insertions(+), 8 deletions(-) diff --git a/24Hour/Controllers/Common/LawyerArchivesController.cs b/24Hour/Controllers/Common/LawyerArchivesController.cs index 3cb2be6..39b68a6 100644 --- a/24Hour/Controllers/Common/LawyerArchivesController.cs +++ b/24Hour/Controllers/Common/LawyerArchivesController.cs @@ -34,19 +34,19 @@ namespace _24Hour.Controllers.Common private readonly SqlSugarClient _db;//数据库 private readonly WriteSysLog _logs;//操作日志 App_Sys_UserModel _userdata = new App_Sys_UserModel();//当前用户 - private readonly ILogger _logger;//日志 + 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,CaseServiceTwentyClient _twentyClient) + public LawyerArchivesController(ILogger _logger, SqlSugarClient db, WriteSysLog logs, User user, IMapper _mapper, CaseServiceTwentyClient _twentyClient) { - this._logger = logger; + this.logger = _logger; _db = db; _logs = logs; - _userdata = user.Userdata(); this.mapper = _mapper; this.twentyClient = _twentyClient; + _userdata = user.Userdata(); } #endregion #region 律师阅卷 @@ -106,14 +106,13 @@ namespace _24Hour.Controllers.Common /// [HttpGet] [Route("QueryLawyerArchives")] - public async Task QueryLawyerArchives(LawyerArchivesInput input) + public async Task QueryLawyerArchives([FromQuery] LawyerArchivesInput input) { RefAsync totalNumber = 0;//总数据 //查询律师服务 var list = await _db.Queryable().LeftJoin((archives, services) => archives.lawyerservicesId == services.Id) .WhereIF(input.bmsah != null, (archives, services) => archives.bmsah == input.bmsah) .WhereIF(input.lawyerId != null, (archives, services) => archives.lawyerId == input.lawyerId) - .WhereIF(input.lawyerservicesId != null, (archives, services) => archives.lawyerservicesId == input.lawyerservicesId) .WhereIF(input.Id != null, (archives, services) => archives.Id == input.Id) .WhereIF(input.unitCode != null, (archives, services) => services.unitCode == input.unitCode) .WhereIF(input.receptionuserId != null, (archives, services) => services.receptionuser == input.receptionuserId) @@ -325,15 +324,63 @@ namespace _24Hour.Controllers.Common var insert = await AddArchivesInfo(dto); result.result = insert.result.Id; } - catch(Exception ex) + catch (Exception ex) { result.IsSucceed = false; result.Message = ex.Message; } return result; } + /// + /// 一体机 根据卷宗id获取详细的卷宗信息 + /// + /// + /// + [HttpGet("QueryArchiveById")] + public async Task QueryArchiveById(string jzid) + { + try + { + var list = await _db.Queryable() + .Includes(x => x.jzml, q => q.jzwj) + .FirstAsync(x => x.Id == jzid); + + var data = mapper.Map(list); + result.result = data; + result.IsSucceed = true; + } + catch (Exception ex) + { + + } + return result; + } + /// + /// 一体机查询当前用户已有的 被同意的 预约阅卷信息 + /// + /// + [HttpGet("QueryReservedInfo")] + public async Task QueryReservedInfo() + { + try + { + logger.LogInformation("12312312312"); + var list = await _db.Queryable() + .Where(x => x.lawyerId == _userdata.Id) + .Where(x => x.status == 0) + .Where(x => x.permissibleStartTime <= DateTime.Now && x.permissibleEndTime >= DateTime.Now) + .ToListAsync(); + var data = mapper.Map>(list); + result.result = data; + result.IsSucceed = true; + } + catch (Exception ex) + { + } + return result; + } #endregion #region HiddenApi @@ -467,7 +514,7 @@ namespace _24Hour.Controllers.Common result.IsSucceed = false; } return Task.FromResult(result); - } + } #endregion } } From 944197ff7de66e76b10f9e81045d2181eb1645d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Tue, 24 Oct 2023 00:37:38 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E6=8A=BD=E8=B1=A1=E5=8C=96=E5=AF=B92.0?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=9A=84=E5=AF=B9=E6=8E=A5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 24Hour/CaseServiceTwentyClient.cs | 43 +++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 24Hour/CaseServiceTwentyClient.cs diff --git a/24Hour/CaseServiceTwentyClient.cs b/24Hour/CaseServiceTwentyClient.cs new file mode 100644 index 0000000..946bca6 --- /dev/null +++ b/24Hour/CaseServiceTwentyClient.cs @@ -0,0 +1,43 @@ +using com.sun.xml.@internal.xsom; +using Elight.Entity.APPDto.Lawyer; +using Elight.Utility.Extensions; +using Microsoft.AspNetCore.DataProtection; + +namespace _24Hour +{ + public class CaseServiceTwentyClient + { + private readonly HttpClient httpCliet; + public CaseServiceTwentyClient(HttpClient _httpCliet) + { + this.httpCliet = _httpCliet; + + httpCliet.DefaultRequestHeaders.Add("Accept", "application/json"); + httpCliet.DefaultRequestHeaders.Add("User-Agent", "HttpClientFactory-Sample"); + httpCliet.DefaultRequestHeaders.ConnectionClose = true; + } + public object GetCaseList() + { + return null; + } + public async Task GetArchivesInfo(string bmsah) + { + var path = Path.Combine(Environment.CurrentDirectory, "datajson.txt"); + var json = await System.IO.File.ReadAllTextAsync(path); + var convert = json.ConvertToModel(); + convert.Id = Guid.NewGuid().ToString(); + foreach (var ml in convert.jzml) + { + ml.Id = Guid.NewGuid().ToString(); + ml.jzId = convert.Id; + foreach (var item in ml.jzwj) + { + item.jzmlId = ml.Id; + item.Id = Guid.NewGuid().ToString(); + } + } + return convert; + } + + } +} From 5110c390d8dde24f3843fd43128640ae0ca6bad8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Tue, 24 Oct 2023 00:38:10 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A02=E3=80=820=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E7=9A=84=E9=80=9A=E4=BF=A1=E4=B8=BB=E6=9C=BA=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0http=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 24Hour/Program.cs | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/24Hour/Program.cs b/24Hour/Program.cs index deb7a70..17c60fc 100644 --- a/24Hour/Program.cs +++ b/24Hour/Program.cs @@ -20,6 +20,7 @@ using AutoMapper; using System.Reflection; using Elight.Entity; using _24Hour; +using Microsoft.Extensions.DependencyInjection; #region builder @@ -177,7 +178,10 @@ builder.Services.AddHttpClient(opt => { opt.BaseAddress = new Uri("https://api.weixin.qq.com/sns"); }); - +builder.Services.AddHttpClient(opt => +{ + opt.BaseAddress = new Uri(Configuration.GetSection("CaseTwenty:SysAddress").Value); +}); //builder.Services.AddAuthorization(); builder.Services.AddHttpContextAccessor(); builder.Services.AddScoped(); @@ -195,6 +199,11 @@ builder.Services.AddScoped(sp => }); return db; }); +//httpclient ־¼ +builder.Services.AddHttpLogging(logging => +{ + logging.LoggingFields = Microsoft.AspNetCore.HttpLogging.HttpLoggingFields.All; +}); #region ʱ // Quartz.NET @@ -244,6 +253,9 @@ app.UseWebSockets(new WebSocketOptions app.UseStaticFiles(); //app.UseHttpsRedirection(); //· + +//ʹhttpclient־¼ UseStaticFiles +app.UseHttpLogging(); app.UseRouting(); app.UseAuthentication(); // ֤м app.UseAuthorization(); // Ȩм @@ -257,8 +269,8 @@ app.UseSwagger();// app.UseSwaggerUI(c => { c.SwaggerEndpoint("/swagger/v1/swagger.json", "24Сʱһ API V1"); - c.RoutePrefix = string.Empty; - + c.RoutePrefix = string.Empty; + }); #endregion From 98d5bd3ff8bb3503241a8b91498710bca7fd0532 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Tue, 24 Oct 2023 00:38:24 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9dto=E6=98=A0=E5=B0=84?= =?UTF-8?q?=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Elight.Entity/AuthManageProfile.cs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Elight.Entity/AuthManageProfile.cs b/Elight.Entity/AuthManageProfile.cs index ea74648..3758a81 100644 --- a/Elight.Entity/AuthManageProfile.cs +++ b/Elight.Entity/AuthManageProfile.cs @@ -17,11 +17,7 @@ namespace Elight.Entity CreateMap().ReverseMap(); CreateMap().ReverseMap(); - CreateMap().ReverseMap().ForAllMembers(opt => - { - opt.UseDestinationValue(); - opt.Condition((src, dest, srcm, destm) => srcm != null); - }); + CreateMap().ReverseMap(); CreateMap().ReverseMap(); CreateMap().ReverseMap(); From 938bc477a7d4dc6b6e15a0dc1e21d5cc3c94ec5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Tue, 24 Oct 2023 00:38:51 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A1=A3=E6=A1=88?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=97=B6=E4=B8=8D=E9=9C=80=E8=A6=81=E9=A2=84?= =?UTF-8?q?=E7=BA=A6id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Elight.Logic/Model/Lawyer/AddArchivesInfoInput.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Elight.Logic/Model/Lawyer/AddArchivesInfoInput.cs b/Elight.Logic/Model/Lawyer/AddArchivesInfoInput.cs index 02775e0..26290e0 100644 --- a/Elight.Logic/Model/Lawyer/AddArchivesInfoInput.cs +++ b/Elight.Logic/Model/Lawyer/AddArchivesInfoInput.cs @@ -13,10 +13,6 @@ namespace Elight.Logic.Model.Lawyer /// public string Bmsah { get; set; } /// - /// 预约记录Id - /// - public string ServiceId { get; set; } - /// /// 被选中的三级id /// public List Ids { get; set; } From a3b1164fac99beb08b3c0718819fd96048613110 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Tue, 24 Oct 2023 00:39:07 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E6=9F=A5=E8=AF=A2id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Elight.Logic/Model/Lawyer/LawyerArchivesInput.cs | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Elight.Logic/Model/Lawyer/LawyerArchivesInput.cs b/Elight.Logic/Model/Lawyer/LawyerArchivesInput.cs index 4c4cbd1..d279a41 100644 --- a/Elight.Logic/Model/Lawyer/LawyerArchivesInput.cs +++ b/Elight.Logic/Model/Lawyer/LawyerArchivesInput.cs @@ -17,11 +17,6 @@ namespace Elight.Logic.Model.Lawyer [DataMember] public string? Id { get; set; } /// - /// 预约Id - /// - [DataMember] - public string? lawyerservicesId { get; set; } - /// /// 部门受案号 /// [DataMember] @@ -37,11 +32,6 @@ namespace Elight.Logic.Model.Lawyer [DataMember] public string? unitCode { get; set; } /// - /// 预约类型 - /// - [DataMember] - public string? reservationId { get; set; } - /// /// 接待人Id /// [DataMember]