diff --git a/24Hour/24Hour.csproj.user b/24Hour/24Hour.csproj.user index 7e26453..f79da0b 100644 --- a/24Hour/24Hour.csproj.user +++ b/24Hour/24Hour.csproj.user @@ -3,6 +3,6 @@ MvcControllerEmptyScaffolder root/Common/MVC/Controller - E:\24Hour.Service\24Hour\Properties\PublishProfiles\FolderProfile.pubxml + E:\Code\24Hour.Service\24Hour\Properties\PublishProfiles\FolderProfile.pubxml \ No newline at end of file diff --git a/24Hour/Properties/PublishProfiles/FolderProfile.pubxml.user b/24Hour/Properties/PublishProfiles/FolderProfile.pubxml.user index d2fb2c6..c5b07c2 100644 --- a/24Hour/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/24Hour/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>D:\24小时发布 - True|2023-06-29T08:07:09.3334291Z;True|2023-06-29T15:56:52.9510718+08:00;True|2023-06-29T15:49:16.8161173+08:00;True|2023-06-27T18:06:12.3724487+08:00;True|2023-06-27T17:22:11.4211972+08:00;True|2023-06-27T15:48:34.1728433+08:00;True|2023-06-13T18:05:11.2568840+08:00;False|2023-06-13T18:04:56.9546003+08:00; + True|2023-06-30T02:20:34.2470363Z;True|2023-06-30T09:51:41.3251931+08:00;True|2023-06-29T16:07:09.3334291+08:00;True|2023-06-29T15:56:52.9510718+08:00;True|2023-06-29T15:49:16.8161173+08:00;True|2023-06-27T18:06:12.3724487+08:00;True|2023-06-27T17:22:11.4211972+08:00;True|2023-06-27T15:48:34.1728433+08:00;True|2023-06-13T18:05:11.2568840+08:00;False|2023-06-13T18:04:56.9546003+08:00; \ No newline at end of file diff --git a/Elight.Logic/Job/WsJob.cs b/Elight.Logic/Job/WsJob.cs index 318f5fc..cd370e5 100644 --- a/Elight.Logic/Job/WsJob.cs +++ b/Elight.Logic/Job/WsJob.cs @@ -39,28 +39,38 @@ namespace Elight.Logic.Job } public async Task Execute(IJobExecutionContext context) { - Console.WriteLine("定时任务执行中..."); - Console.WriteLine("定时任务执行中..."); JobDataMap datas = context.JobDetail.JobDataMap; // 定时任务执行的代码 - Console.WriteLine("定时任务执行中..."); + Console.WriteLine("文书签收定时任务执行中..."); //获取文书最新跟新时间 - var Document = _db.Queryable().OrderByDescending(q => long.Parse(q.zhxgsj)).Select(q=>new { q.zhxgsj}).ToList().FirstOrDefault(); - var start = DateTime.Parse(unixStartTime.AddMilliseconds(long.Parse(Document.zhxgsj)).AddDays(-1).ToString("yyyy-MM-dd")); - var end = DateTime.Parse(DateTime.Now.AddDays(1).ToString("yyyy-MM-dd")); - var daa = new { data = "{\"token\":\"www.archives.net.cn\",\"dwbm\":\"\",\"zt\":\"02\",\"zjhm\":\"\",\"zrrxm\":\"\",\"zrrlshm\":\"\",\"account\":\"\",\"dhhm\":\"\",\"start\":\"" + start + "\",\"end\":\"" + end + "\"}" }; - var msg = ""; - var data = HttpHelper.Post("http://jhg.ahjiguang.cn:80/agyw/api/user/command/wssdapi/getwssdlist", daa, out msg); - var Results = JsonConvert.DeserializeObject(data); - var Documentlist = JsonConvert.DeserializeObject>(Results.data); - if (Documentlist.Count() > 0) + var Document = _db.Queryable().OrderByDescending(q => long.Parse(q.zhxgsj)).Select(q => new { q.zhxgsj }).ToList().FirstOrDefault(); + if (Document != null) { - await AddDocument(Documentlist); - _db.Dispose(); + var start = DateTime.Parse(unixStartTime.AddMilliseconds(long.Parse(Document.zhxgsj)).AddDays(-1).ToString("yyyy-MM-dd")); + var end = DateTime.Parse(DateTime.Now.AddDays(1).ToString("yyyy-MM-dd")); + var daa = new { data = "{\"token\":\"www.archives.net.cn\",\"dwbm\":\"\",\"zt\":\"02\",\"zjhm\":\"\",\"zrrxm\":\"\",\"zrrlshm\":\"\",\"account\":\"\",\"dhhm\":\"\",\"start\":\"" + start + "\",\"end\":\"" + end + "\"}" }; + var msg = ""; + try + { + var data = HttpHelper.Post("http://jhg.ahjiguang.cn:80/agyw/api/user/command/wssdapi/getwssdlist", daa, out msg); + var Results = JsonConvert.DeserializeObject(data); + if (Results != null && Results.code == "200") + { + var Documentlist = JsonConvert.DeserializeObject>(Results.data); + if (Documentlist.Count() > 0) + { + await AddDocument(Documentlist); + _db.Dispose(); + } + Console.WriteLine($"文书签收成功..{DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss")}"); + } + } + catch (Exception ex) + { + Console.WriteLine($"文书签收错误...{ex.Message + "___" + ex.InnerException}"); + } } - if (!string.IsNullOrEmpty(msg)) - Console.WriteLine($"文书签收错误...{msg}"); - //LogService.WriteLog(msg, "文书签收"); + Console.WriteLine("文书签收定时任务完成..."); } @@ -80,7 +90,7 @@ namespace Elight.Logic.Job //获取文书编号 var Documentwsslbh = _db.Queryable().Select(q => q.wsslbh).ToList(); //获取文书Id,文书编号 - var Documentlist = _db.Queryable().Select(q => new { q.wsslbh,q.Id }).ToList(); + var Documentlist = _db.Queryable().Select(q => new { q.wsslbh, q.Id }).ToList(); //根据数据库最新时间戳筛选文书数据 Documentdata.Where(q => long.Parse(q.zhxgsj) >= long.Parse(Document.zhxgsj)); //获取系统存在的用户文书数据 @@ -104,7 +114,7 @@ namespace Elight.Logic.Job }); _db.BeginTran(); await _db.Insertable(nobhwslist).ExecuteCommandAsync(); - await _db.Updateable(bhwslist).UpdateColumns(it => new { it.zt, it.zhxgsj, it.qmsj,it.sdsj }).ExecuteCommandAsync(); + await _db.Updateable(bhwslist).UpdateColumns(it => new { it.zt, it.zhxgsj, it.qmsj, it.sdsj }).ExecuteCommandAsync(); _db.CommitTran(); } catch (System.Exception ex) diff --git a/Elight.Logic/Job/YgJob.cs b/Elight.Logic/Job/YgJob.cs index 77dfbaf..6c4ab07 100644 --- a/Elight.Logic/Job/YgJob.cs +++ b/Elight.Logic/Job/YgJob.cs @@ -39,24 +39,31 @@ namespace Elight.Logic.Job } public async Task Execute(IJobExecutionContext context) { - Console.WriteLine("定时任务执行中..."); - Console.WriteLine("定时任务执行中..."); JobDataMap datas = context.JobDetail.JobDataMap; // 定时任务执行的代码 - Console.WriteLine("定时任务执行中..."); + Console.WriteLine("云柜同步定时任务执行中..."); var daa = new { data = "{\"token\":\"www.archives.net.cn\",\"dwbm\":\"\",\"zt\":\"\",\"sfzh\":\"\",\"xm\":\"\",\"lxhm\":\"\",\"account\":\"\",\"gjlxhm\":\"\"}" }; var msg = ""; - var data = HttpHelper.Post("http://jhg.ahjiguang.cn:80/jhg/api/user/command/jhglistapi/getjhglist", daa, out msg); - var Results = JsonConvert.DeserializeObject(data); - var CloudCabinetlist = JsonConvert.DeserializeObject>(Results.data); - if (CloudCabinetlist.Count() > 0) + try + { + var data = HttpHelper.Post("http://jhg.ahjiguang.cn:80/jhg/api/user/command/jhglistapi/getjhglist", daa, out msg); + var Results = JsonConvert.DeserializeObject(data); + if (Results != null && Results.code == "200") + { + var CloudCabinetlist = JsonConvert.DeserializeObject>(Results.data); + if (CloudCabinetlist != null && CloudCabinetlist.Count() > 0) + { + await AddDocument(CloudCabinetlist); + _db.Dispose(); + } + Console.WriteLine($"云柜同步成功..{DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss")}"); + } + } + catch (Exception ex) { - await AddDocument(CloudCabinetlist); - _db.Dispose(); + Console.WriteLine($"云柜错误...{ex.Message + ex.InnerException}"); } - if (!string.IsNullOrEmpty(msg)) - Console.WriteLine($"云柜错误...{msg}"); - //LogService.WriteLog(msg, "文书签收"); + Console.WriteLine("云柜同步定时任务完成..."); } @@ -82,7 +89,7 @@ namespace Elight.Logic.Job //根据数据库最新时间戳筛选文书数据 CloudCabinetdata.Where(q => long.Parse(q.cjsj) >= long.Parse(Document.cjsj)); //获取系统存在的用户云柜数据 - CloudCabinetdata = CloudCabinetdata.Where(q => usercardIds.Contains(q.sfzh)|| userphone.Contains(q.lxhm)).ToList(); + CloudCabinetdata = CloudCabinetdata.Where(q => usercardIds.Contains(q.sfzh) || userphone.Contains(q.lxhm)).ToList(); //筛选数据库包含云柜 var bhyglist = CloudCabinetdata.Where(q => Documentwsslbh.Contains(q.bh)).ToList(); //筛选数据库不包含云柜 @@ -102,7 +109,7 @@ namespace Elight.Logic.Job }); _db.BeginTran(); await _db.Insertable(nobhyglist).ExecuteCommandAsync(); - await _db.Updateable(bhyglist).UpdateColumns(it => new { it.zt,it.qjsj}).ExecuteCommandAsync(); + await _db.Updateable(bhyglist).UpdateColumns(it => new { it.zt, it.qjsj }).ExecuteCommandAsync(); _db.CommitTran(); } catch (System.Exception ex) diff --git a/Elight.Logic/WriteSysLog.cs b/Elight.Logic/WriteSysLog.cs index 339a368..04477e7 100644 --- a/Elight.Logic/WriteSysLog.cs +++ b/Elight.Logic/WriteSysLog.cs @@ -37,16 +37,16 @@ namespace Elight.Logic { Func_Dossier_LogRecordModel model = new Func_Dossier_LogRecordModel { - UnitCode = _userdata.unitCode, + UnitCode = _userdata == null ? null: _userdata.unitCode, OperationType = operationType, SerialNumber = Guid.NewGuid().ToString(), NameEntity = "", LogContents = result.IsSucceed ? $"{content}成功" : $"{content}失败：{result.Message}", ParColCreTimTakYeaTri = DateTime.Now.Year.ToString(), OperationIp = "", - Operation = _userdata.name, + Operation = _userdata == null ? null : _userdata.name, OperatingTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), - OperatingManual = _userdata.Id, + OperatingManual = _userdata == null ? null : _userdata.Id, OpeCasDepAccCas = opeCasDepAccCas ?? string.Empty }; var sss = _db.Insertable(model).ExecuteCommand();