From 59a7c02af9fa602b17628ecd484472d1b7d45f29 Mon Sep 17 00:00:00 2001 From: liujiaqiang <1448951783@qq.com> Date: Mon, 3 Jul 2023 10:11:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=90=8C=E6=AD=A5=E4=BF=A1?= =?UTF-8?q?=E6=81=AF,=E6=96=87=E4=B9=A6=E7=AD=BE=E6=94=B6=E5=92=8C?= =?UTF-8?q?=E4=BA=91=E6=9F=9C=E4=BF=A1=E6=81=AF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Common/CloudCabinetController.cs | 9 ++-- 24Hour/Controllers/Common/CommonController.cs | 12 +++--- .../AppMode/App_CloudCabinetModel.cs | 2 +- Elight.Logic/Job/WsJob.cs | 42 ++++++++++--------- Elight.Logic/Job/YgJob.cs | 13 +++--- 5 files changed, 41 insertions(+), 37 deletions(-) diff --git a/24Hour/Controllers/Common/CloudCabinetController.cs b/24Hour/Controllers/Common/CloudCabinetController.cs index 4d6efc5..006601c 100644 --- a/24Hour/Controllers/Common/CloudCabinetController.cs +++ b/24Hour/Controllers/Common/CloudCabinetController.cs @@ -66,7 +66,7 @@ namespace _24Hour.Controllers.Common var da = _Unitdata.Where(x => x.unitCode == q.dwbm).FirstOrDefault(); q.dwbm = da?.unitname; }); - var data = new QueryResult(cabinetdata, list.OrderByDescending(q => q.cjsj).ToList()); + var data = new QueryResult(cabinetdata, list.OrderByDescending(q => long.Parse(q.cjsj)).ToList()); result.IsSucceed = true; result.result = data; return result; @@ -86,9 +86,10 @@ namespace _24Hour.Controllers.Common .WhereIF(cabinetdata.sfzh.NotNull(), q => q.sfzh.Contains(cabinetdata.sfzh)) .WhereIF(cabinetdata.xm.NotNull(), q => q.xm.Contains(cabinetdata.xm)) .WhereIF(cabinetdata.lxhm.NotNull(), q => q.lxhm.Contains(cabinetdata.lxhm)) - .WhereIF(cabinetdata.zt.NotNull(), q => q.zt.Contains(cabinetdata.zt)) - .WhereIF(cabinetdata.StartTime != null && cabinetdata.EndTime != null, q => q.cjsj>= q.cjsj && q.cjsj (cabinetdata, list.OrderByDescending(q => q.cjsj).ToList()); + .WhereIF(cabinetdata.zt.NotNull(), q => q.zt.Contains(cabinetdata.zt)) + .WhereIF(cabinetdata.StartTime != null && cabinetdata.EndTime != null, q => unixStartTime.AddMilliseconds(long.Parse(q.cjsj)) >= cabinetdata.StartTime && unixStartTime.AddMilliseconds(long.Parse(q.cjsj)) < cabinetdata.EndTime.Value.AddDays(1)) + .ToPageListAsync(cabinetdata.PageIndex, cabinetdata.PageSize); + var data = new QueryResult(cabinetdata, list.OrderByDescending(q => long.Parse(q.cjsj)).ToList()); result.IsSucceed = true; result.result = data; return result; diff --git a/24Hour/Controllers/Common/CommonController.cs b/24Hour/Controllers/Common/CommonController.cs index c5f354b..bcb71ae 100644 --- a/24Hour/Controllers/Common/CommonController.cs +++ b/24Hour/Controllers/Common/CommonController.cs @@ -836,9 +836,9 @@ namespace _24Hour.Controllers.Common Code = "", state = q.zt,//状态 reason = "", - sttime = q.cjsj,//创建时间 + sttime = q.cjsj == null ? "" : unixStartTime.AddMilliseconds(long.Parse(q.cjsj)).ToString("yyyy-MM-dd HH:mm"),//创建时间 ettime = q.qjsj == null ? "" : unixStartTime.AddMilliseconds(long.Parse(q.qjsj)).ToString("yyyy-MM-dd HH:mm"),//取件时间 - creationtime = q.cjsj,//创建时间 + creationtime = q.cjsj == null ? "" : unixStartTime.AddMilliseconds(long.Parse(q.cjsj)).ToString("yyyy-MM-dd HH:mm"),//创建时间 receptionuser = "", username = "", receive = "", @@ -1185,9 +1185,9 @@ namespace _24Hour.Controllers.Common Code = "", state = q.zt,//状态 reason = "", - sttime = q.cjsj,//创建时间 + sttime = q.cjsj == null ? "" : unixStartTime.AddMilliseconds(long.Parse(q.cjsj)).ToString("yyyy-MM-dd HH:mm"),//创建时间 ettime = q.qjsj == null ? "" : unixStartTime.AddMilliseconds(long.Parse(q.qjsj)).ToString("yyyy-MM-dd HH:mm"),//取件时间 - creationtime = q.cjsj,//创建时间 + creationtime = q.cjsj == null ? "" : unixStartTime.AddMilliseconds(long.Parse(q.cjsj)).ToString("yyyy-MM-dd HH:mm"),//创建时间 receptionuser = "", username = "", receive = "", @@ -1607,7 +1607,7 @@ namespace _24Hour.Controllers.Common sttime = "", ettime = "", state = q.zt, - creationtime = q.cjsj,//创建时间 + creationtime = q.cjsj == null ? "" : unixStartTime.AddMilliseconds(long.Parse(q.cjsj)).ToString("yyyy-MM-dd HH:mm"),//创建时间 }); }); //查询 @@ -1824,7 +1824,7 @@ namespace _24Hour.Controllers.Common sttime = "", ettime = "", state = q.zt, - creationtime = q.cjsj,//创建时间 + creationtime = q.cjsj == null ? "" : unixStartTime.AddMilliseconds(long.Parse(q.cjsj)).ToString("yyyy-MM-dd HH:mm"),//创建时间 }); }); //查询 diff --git a/Elight.Entity/AppMode/App_CloudCabinetModel.cs b/Elight.Entity/AppMode/App_CloudCabinetModel.cs index 75b5428..e194146 100644 --- a/Elight.Entity/AppMode/App_CloudCabinetModel.cs +++ b/Elight.Entity/AppMode/App_CloudCabinetModel.cs @@ -76,7 +76,7 @@ namespace Elight.Entity /// 创建时间 /// [DataMember] - public DateTime? cjsj { get; set; }=DateTime.Now; + public string? cjsj { get; set; } /// /// 取件时间 diff --git a/Elight.Logic/Job/WsJob.cs b/Elight.Logic/Job/WsJob.cs index cd370e5..e30bf98 100644 --- a/Elight.Logic/Job/WsJob.cs +++ b/Elight.Logic/Job/WsJob.cs @@ -44,31 +44,33 @@ namespace Elight.Logic.Job Console.WriteLine("文书签收定时任务执行中..."); //获取文书最新跟新时间 var Document = _db.Queryable().OrderByDescending(q => long.Parse(q.zhxgsj)).Select(q => new { q.zhxgsj }).ToList().FirstOrDefault(); + var start = ""; + var end = ""; if (Document != null) { - 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 + start = unixStartTime.AddMilliseconds(long.Parse(Document.zhxgsj)).AddDays(-1).ToString("yyyy-MM-dd"); + end = DateTime.Now.AddDays(1).ToString("yyyy-MM-dd"); + } + var daa = new { data = "{\"token\":\"www.archives.net.cn\",\"dwbm\":\"\",\"zt\":\"\",\"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 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) { - var Documentlist = JsonConvert.DeserializeObject>(Results.data); - if (Documentlist.Count() > 0) - { - await AddDocument(Documentlist); - _db.Dispose(); - } + 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}"); - } + } + catch (Exception ex) + { + Console.WriteLine($"文书签收错误...{ex.Message + "___" + ex.InnerException}"); } Console.WriteLine("文书签收定时任务完成..."); } @@ -92,7 +94,7 @@ namespace Elight.Logic.Job //获取文书Id,文书编号 var Documentlist = _db.Queryable().Select(q => new { q.wsslbh, q.Id }).ToList(); //根据数据库最新时间戳筛选文书数据 - Documentdata.Where(q => long.Parse(q.zhxgsj) >= long.Parse(Document.zhxgsj)); + Documentdata.WhereIF(Document != null, q => long.Parse(q.zhxgsj) >= long.Parse(Document.zhxgsj)); //获取系统存在的用户文书数据 Documentdata = Documentdata.Where(q => usercardIds.Contains(q.zjhm)).ToList(); //筛选数据库包含文书 @@ -120,7 +122,7 @@ namespace Elight.Logic.Job catch (System.Exception ex) { _db.RollbackTran(); - LogService.WriteLog(ex, "添加文书签收"); + //LogService.WriteLog(ex, "添加文书签收"); } } } diff --git a/Elight.Logic/Job/YgJob.cs b/Elight.Logic/Job/YgJob.cs index 1a8d059..aad513b 100644 --- a/Elight.Logic/Job/YgJob.cs +++ b/Elight.Logic/Job/YgJob.cs @@ -46,7 +46,7 @@ namespace Elight.Logic.Job var msg = ""; try { - var data = HttpHelper.Post("http://jhg.ahjiguang.cn:80/jhg/api/user/command/jhglistapi/getjhglist", daa, out msg); + var data = HttpHelper.Post("http://jhg.ahjiguang.cn:80/jhg/api/user/command/jhgwbsclapi/getjhgywlist", daa, out msg); var Results = JsonConvert.DeserializeObject(data); if (Results != null && Results.code == "200") { @@ -81,13 +81,13 @@ namespace Elight.Logic.Job //获取app平台所有用户电话号码 var userphone = _db.Queryable().Where(q => q.IsDeleted == 0 && q.usertype == 1).Select(q => q.phone).ToList(); //获取云柜最新创建时间 - var Document = _db.Queryable().OrderByDescending(q => q.cjsj).ToList().FirstOrDefault(); + var Document = _db.Queryable().OrderByDescending(q => long.Parse(q.cjsj)).ToList().FirstOrDefault(); //获取云柜编号 var Documentwsslbh = _db.Queryable().Select(q => q.bh).ToList(); //获取云柜Id,云柜编号 - var CloudCabinetdatalist = _db.Queryable().Select(q => new { q.bh, q.Id }).ToList(); - //根据数据库最新时间戳筛选文书数据 - CloudCabinetdata.Where(q => q.cjsj >= Document.cjsj); + var CloudCabinetdatalist = _db.Queryable().Select(q => new { q.bh, q.Id }).ToList(); + //根据数据库最新时间戳筛选文书数据 + CloudCabinetdata.WhereIF(Document != null, q => long.Parse(q.cjsj) >= long.Parse(Document.cjsj)); //获取系统存在的用户云柜数据 CloudCabinetdata = CloudCabinetdata.Where(q => usercardIds.Contains(q.sfzh) || userphone.Contains(q.lxhm)).ToList(); //筛选数据库包含云柜 @@ -100,6 +100,7 @@ namespace Elight.Logic.Job var data = CloudCabinetdatalist.Where(x => x.bh == q.bh).FirstOrDefault(); q.Id = data.Id; q.reservationId = "0e23db19-0439-11ee-ab29-0242ac110004"; + //q.cjsj=unixStartTime.AddMilliseconds(long.Parse(q.cjsj)) // q.cjsj=DateTime.Now; }); //循环生成唯一Id @@ -117,7 +118,7 @@ namespace Elight.Logic.Job catch (System.Exception ex) { _db.RollbackTran(); - LogService.WriteLog(ex, "添加文书签收"); + //LogService.WriteLog(ex, "添加文书签收"); } } }