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

调整同步信息,文书签收和云柜信息调整

master
liujiaqiang 2 years ago
parent
94a41088cc
commit
59a7c02af9
5 changed files with 41 additions and 37 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. 7
      24Hour/Controllers/Common/CloudCabinetController.cs
  2. 12
      24Hour/Controllers/Common/CommonController.cs
  3. 2
      Elight.Entity/AppMode/App_CloudCabinetModel.cs
  4. 16
      Elight.Logic/Job/WsJob.cs
  5. 9
      Elight.Logic/Job/YgJob.cs

7
24Hour/Controllers/Common/CloudCabinetController.cs
Unescape View File

@ -66,7 +66,7 @@ namespace _24Hour.Controllers.Common
var da = _Unitdata.Where(x => x.unitCode == q.dwbm).FirstOrDefault(); var da = _Unitdata.Where(x => x.unitCode == q.dwbm).FirstOrDefault();
q.dwbm = da?.unitname; q.dwbm = da?.unitname;
}); });
var data = new QueryResult<App_CloudCabinetModel>(cabinetdata, list.OrderByDescending(q => q.cjsj).ToList()); var data = new QueryResult<App_CloudCabinetModel>(cabinetdata, list.OrderByDescending(q => long.Parse(q.cjsj)).ToList());
result.IsSucceed = true; result.IsSucceed = true;
result.result = data; result.result = data;
return result; return result;
@ -87,8 +87,9 @@ namespace _24Hour.Controllers.Common
.WhereIF(cabinetdata.xm.NotNull(), q => q.xm.Contains(cabinetdata.xm)) .WhereIF(cabinetdata.xm.NotNull(), q => q.xm.Contains(cabinetdata.xm))
.WhereIF(cabinetdata.lxhm.NotNull(), q => q.lxhm.Contains(cabinetdata.lxhm)) .WhereIF(cabinetdata.lxhm.NotNull(), q => q.lxhm.Contains(cabinetdata.lxhm))
.WhereIF(cabinetdata.zt.NotNull(), q => q.zt.Contains(cabinetdata.zt)) .WhereIF(cabinetdata.zt.NotNull(), q => q.zt.Contains(cabinetdata.zt))
.WhereIF(cabinetdata.StartTime != null && cabinetdata.EndTime != null, q => q.cjsj>= q.cjsj && q.cjsj <Convert.ToDateTime(cabinetdata.EndTime).AddDays(1)).ToPageListAsync(cabinetdata.PageIndex, cabinetdata.PageSize); .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))
var data = new QueryResult<App_CloudCabinetModel>(cabinetdata, list.OrderByDescending(q => q.cjsj).ToList()); .ToPageListAsync(cabinetdata.PageIndex, cabinetdata.PageSize);
var data = new QueryResult<App_CloudCabinetModel>(cabinetdata, list.OrderByDescending(q => long.Parse(q.cjsj)).ToList());
result.IsSucceed = true; result.IsSucceed = true;
result.result = data; result.result = data;
return result; return result;

12
24Hour/Controllers/Common/CommonController.cs
Unescape View File

@ -836,9 +836,9 @@ namespace _24Hour.Controllers.Common
Code = "", Code = "",
state = q.zt,//状态 state = q.zt,//状态
reason = "", 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"),//取件时间 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 = "", receptionuser = "",
username = "", username = "",
receive = "", receive = "",
@ -1185,9 +1185,9 @@ namespace _24Hour.Controllers.Common
Code = "", Code = "",
state = q.zt,//状态 state = q.zt,//状态
reason = "", 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"),//取件时间 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 = "", receptionuser = "",
username = "", username = "",
receive = "", receive = "",
@ -1607,7 +1607,7 @@ namespace _24Hour.Controllers.Common
sttime = "", sttime = "",
ettime = "", ettime = "",
state = q.zt, 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 = "", sttime = "",
ettime = "", ettime = "",
state = q.zt, state = q.zt,
creationtime = q.cjsj,//创建时间 creationtime = q.cjsj == null ? "" : unixStartTime.AddMilliseconds(long.Parse(q.cjsj)).ToString("yyyy-MM-dd HH:mm"),//创建时间
}); });
}); });
//查询 //查询

2
Elight.Entity/AppMode/App_CloudCabinetModel.cs
Unescape View File

@ -76,7 +76,7 @@ namespace Elight.Entity
/// 创建时间 /// 创建时间
/// </summary> /// </summary>
[DataMember] [DataMember]
public DateTime? cjsj { get; set; }=DateTime.Now; public string? cjsj { get; set; }
/// <summary> /// <summary>
/// 取件时间 /// 取件时间

16
Elight.Logic/Job/WsJob.cs
Unescape View File

@ -44,11 +44,14 @@ namespace Elight.Logic.Job
Console.WriteLine("文书签收定时任务执行中..."); Console.WriteLine("文书签收定时任务执行中...");
//获取文书最新跟新时间 //获取文书最新跟新时间
var Document = _db.Queryable<App_DocumentModel>().OrderByDescending(q => long.Parse(q.zhxgsj)).Select(q => new { q.zhxgsj }).ToList().FirstOrDefault(); var Document = _db.Queryable<App_DocumentModel>().OrderByDescending(q => long.Parse(q.zhxgsj)).Select(q => new { q.zhxgsj }).ToList().FirstOrDefault();
var start = "";
var end = "";
if (Document != null) if (Document != null)
{ {
var start = DateTime.Parse(unixStartTime.AddMilliseconds(long.Parse(Document.zhxgsj)).AddDays(-1).ToString("yyyy-MM-dd")); start = unixStartTime.AddMilliseconds(long.Parse(Document.zhxgsj)).AddDays(-1).ToString("yyyy-MM-dd");
var end = DateTime.Parse(DateTime.Now.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\":\"02\",\"zjhm\":\"\",\"zrrxm\":\"\",\"zrrlshm\":\"\",\"account\":\"\",\"dhhm\":\"\",\"start\":\"" + start + "\",\"end\":\"" + end + "\"}" }; }
var daa = new { data = "{\"token\":\"www.archives.net.cn\",\"dwbm\":\"\",\"zt\":\"\",\"zjhm\":\"\",\"zrrxm\":\"\",\"zrrlshm\":\"\",\"account\":\"\",\"dhhm\":\"\",\"start\":\"" + start + "\",\"end\":\"" + end + "\"}" };
var msg = ""; var msg = "";
try try
{ {
@ -61,15 +64,14 @@ namespace Elight.Logic.Job
{ {
await AddDocument(Documentlist); await AddDocument(Documentlist);
_db.Dispose(); _db.Dispose();
}
Console.WriteLine($"文书签收成功..{DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss")}"); Console.WriteLine($"文书签收成功..{DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss")}");
} }
} }
}
catch (Exception ex) catch (Exception ex)
{ {
Console.WriteLine($"文书签收错误...{ex.Message + "___" + ex.InnerException}"); Console.WriteLine($"文书签收错误...{ex.Message + "___" + ex.InnerException}");
} }
}
Console.WriteLine("文书签收定时任务完成..."); Console.WriteLine("文书签收定时任务完成...");
} }
@ -92,7 +94,7 @@ namespace Elight.Logic.Job
//获取文书Id,文书编号 //获取文书Id,文书编号
var Documentlist = _db.Queryable<App_DocumentModel>().Select(q => new { q.wsslbh, q.Id }).ToList(); var Documentlist = _db.Queryable<App_DocumentModel>().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(); Documentdata = Documentdata.Where(q => usercardIds.Contains(q.zjhm)).ToList();
//筛选数据库包含文书 //筛选数据库包含文书
@ -120,7 +122,7 @@ namespace Elight.Logic.Job
catch (System.Exception ex) catch (System.Exception ex)
{ {
_db.RollbackTran(); _db.RollbackTran();
LogService.WriteLog(ex, "添加文书签收"); //LogService.WriteLog(ex, "添加文书签收");
} }
} }
} }

9
Elight.Logic/Job/YgJob.cs
Unescape View File

@ -46,7 +46,7 @@ namespace Elight.Logic.Job
var msg = ""; var msg = "";
try 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<RequestResults>(data); var Results = JsonConvert.DeserializeObject<RequestResults>(data);
if (Results != null && Results.code == "200") if (Results != null && Results.code == "200")
{ {
@ -81,13 +81,13 @@ namespace Elight.Logic.Job
//获取app平台所有用户电话号码 //获取app平台所有用户电话号码
var userphone = _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.usertype == 1).Select(q => q.phone).ToList(); var userphone = _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.usertype == 1).Select(q => q.phone).ToList();
//获取云柜最新创建时间 //获取云柜最新创建时间
var Document = _db.Queryable<App_CloudCabinetModel>().OrderByDescending(q => q.cjsj).ToList().FirstOrDefault(); var Document = _db.Queryable<App_CloudCabinetModel>().OrderByDescending(q => long.Parse(q.cjsj)).ToList().FirstOrDefault();
//获取云柜编号 //获取云柜编号
var Documentwsslbh = _db.Queryable<App_CloudCabinetModel>().Select(q => q.bh).ToList(); var Documentwsslbh = _db.Queryable<App_CloudCabinetModel>().Select(q => q.bh).ToList();
//获取云柜Id,云柜编号 //获取云柜Id,云柜编号
var CloudCabinetdatalist = _db.Queryable<App_CloudCabinetModel>().Select(q => new { q.bh, q.Id }).ToList(); var CloudCabinetdatalist = _db.Queryable<App_CloudCabinetModel>().Select(q => new { q.bh, q.Id }).ToList();
//根据数据库最新时间戳筛选文书数据 //根据数据库最新时间戳筛选文书数据
CloudCabinetdata.Where(q => q.cjsj >= Document.cjsj); 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(); 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(); var data = CloudCabinetdatalist.Where(x => x.bh == q.bh).FirstOrDefault();
q.Id = data.Id; q.Id = data.Id;
q.reservationId = "0e23db19-0439-11ee-ab29-0242ac110004"; q.reservationId = "0e23db19-0439-11ee-ab29-0242ac110004";
//q.cjsj=unixStartTime.AddMilliseconds(long.Parse(q.cjsj))
// q.cjsj=DateTime.Now; // q.cjsj=DateTime.Now;
}); });
//循环生成唯一Id //循环生成唯一Id
@ -117,7 +118,7 @@ namespace Elight.Logic.Job
catch (System.Exception ex) catch (System.Exception ex)
{ {
_db.RollbackTran(); _db.RollbackTran();
LogService.WriteLog(ex, "添加文书签收"); //LogService.WriteLog(ex, "添加文书签收");
} }
} }
} }

Write Preview
Loading…
Cancel
Save