From 5a3346568e624142aa77735e67031118b942b7db Mon Sep 17 00:00:00 2001
From: wet <1034391973@qq.com>
Date: Mon, 27 Jun 2022 16:45:34 +0800
Subject: [PATCH] ams
---
ams/Djy.Common/Common.xml | 8 ++
ams/Djy.Common/Extentions/JsonExtensions.cs | 131 +++++++++++++++++-
ams/djy.Model/IsfDto/ISFDto.cs | 13 ++
ams/djy.Service/Ams/AmsService.cs | 83 +++++------
ams/djy.Service/ISF/IsfService.cs | 95 +++++++++++--
.../Controllers/AMS/AmsController.cs | 82 +++++------
.../Controllers/ISF/IsfController.cs | 46 +++---
.../PublishProfiles/FolderProfile.pubxml.user | 2 +-
8 files changed, 341 insertions(+), 119 deletions(-)
diff --git a/ams/Djy.Common/Common.xml b/ams/Djy.Common/Common.xml
index 5753387..2c77e68 100644
--- a/ams/Djy.Common/Common.xml
+++ b/ams/Djy.Common/Common.xml
@@ -3136,6 +3136,14 @@
+
+
+ JSON格式化重新排序
+
+ 原始JSON JToken.Parse(string json);
+ 初始值Null
+
+
分页查询
diff --git a/ams/Djy.Common/Extentions/JsonExtensions.cs b/ams/Djy.Common/Extentions/JsonExtensions.cs
index 356fc0b..9932593 100644
--- a/ams/Djy.Common/Extentions/JsonExtensions.cs
+++ b/ams/Djy.Common/Extentions/JsonExtensions.cs
@@ -1,5 +1,7 @@
-using System;
+using Newtonsoft.Json.Linq;
+using System;
using System.Collections.Generic;
+using System.Linq;
using System.Text;
using System.Text.Json;
using System.Xml;
@@ -84,9 +86,132 @@ namespace Common.Extensions
return null;
}
}
-
-
+ ///
+ /// JSON格式化重新排序
+ ///
+ /// 原始JSON JToken.Parse(string json);
+ /// 初始值Null
+ ///
+ public static string SortJson(JToken jobj, JToken obj)
+ {
+ if (obj == null)
+ {
+ obj = new JObject();
+ }
+ List list = jobj.ToList();
+ if (jobj.Type == JTokenType.Object)//非数组
+ {
+ List listsort = new List();
+ foreach (var item in list)
+ {
+ string name = JProperty.Load(item.CreateReader()).Name;
+ listsort.Add(name);
+ }
+ listsort.Sort();
+ List listTemp = new List();
+ foreach (var item in listsort)
+ {
+ listTemp.Add(list.Where(p => JProperty.Load(p.CreateReader()).Name == item).FirstOrDefault());
+ }
+ list = listTemp;
+ //list.Sort((p1, p2) => JProperty.Load(p1.CreateReader()).Name.GetAnsi() - JProperty.Load(p2.CreateReader()).Name.GetAnsi());
+
+ foreach (var item in list)
+ {
+ JProperty jp = JProperty.Load(item.CreateReader());
+ if (item.First.Type == JTokenType.Object)
+ {
+ JObject sub = new JObject();
+ (obj as JObject).Add(jp.Name, sub);
+ SortJson(item.First, sub);
+ }
+ else if (item.First.Type == JTokenType.Array)
+ {
+ JArray arr = new JArray();
+ if (obj.Type == JTokenType.Object)
+ {
+ (obj as JObject).Add(jp.Name, arr);
+ }
+ else if (obj.Type == JTokenType.Array)
+ {
+ (obj as JArray).Add(arr);
+ }
+ SortJson(item.First, arr);
+ }
+ else if (item.First.Type != JTokenType.Object && item.First.Type != JTokenType.Array)
+ {
+ (obj as JObject).Add(jp.Name, item.First);
+ }
+ }
+ }
+ else if (jobj.Type == JTokenType.Array)//数组
+ {
+ foreach (var item in list)
+ {
+ List listToken = item.ToList();
+ List listsort = new List();
+ foreach (var im in listToken)
+ {
+ string name = JProperty.Load(im.CreateReader()).Name;
+ listsort.Add(name);
+ }
+ listsort.Sort();
+ List listTemp = new List();
+ foreach (var im2 in listsort)
+ {
+ listTemp.Add(listToken.Where(p => JProperty.Load(p.CreateReader()).Name == im2).FirstOrDefault());
+ }
+ list = listTemp;
+
+ listToken = list;
+ // listToken.Sort((p1, p2) => JProperty.Load(p1.CreateReader()).Name.GetAnsi() - JProperty.Load(p2.CreateReader()).Name.GetAnsi());
+ JObject item_obj = new JObject();
+ foreach (var token in listToken)
+ {
+ JProperty jp = JProperty.Load(token.CreateReader());
+ if (token.First.Type == JTokenType.Object)
+ {
+ JObject sub = new JObject();
+ (obj as JObject).Add(jp.Name, sub);
+ SortJson(token.First, sub);
+ }
+ else if (token.First.Type == JTokenType.Array)
+ {
+ JArray arr = new JArray();
+ if (obj.Type == JTokenType.Object)
+ {
+ (obj as JObject).Add(jp.Name, arr);
+ }
+ else if (obj.Type == JTokenType.Array)
+ {
+ (obj as JArray).Add(arr);
+ }
+ SortJson(token.First, arr);
+ }
+ else if (item.First.Type != JTokenType.Object && item.First.Type != JTokenType.Array)
+ {
+ if (obj.Type == JTokenType.Object)
+ {
+ (obj as JObject).Add(jp.Name, token.First);
+ }
+ else if (obj.Type == JTokenType.Array)
+ {
+ item_obj.Add(jp.Name, token.First);
+ }
+ }
+ }
+ if (obj.Type == JTokenType.Array)
+ {
+ (obj as JArray).Add(item_obj);
+ }
+
+ }
+ }
+ string ret = obj.ToString();
+ return ret;
+ }
+
}
}
diff --git a/ams/djy.Model/IsfDto/ISFDto.cs b/ams/djy.Model/IsfDto/ISFDto.cs
index 571728f..cfde64d 100644
--- a/ams/djy.Model/IsfDto/ISFDto.cs
+++ b/ams/djy.Model/IsfDto/ISFDto.cs
@@ -85,6 +85,19 @@ namespace djy.Model.IsfDto
public bool? IsDel { get; set; }
+
+ ///
+ /// 申报状态
+ ///
+ public string ReportState { get; set; }
+ ///
+ /// 匹配状态
+ ///
+ public string MateState { get; set; }
+ ///
+ /// 最新通知
+ ///
+ public string NewNotice { get; set; }
public List companyList { get; set; }
public List HistoryDto { get; set; }
diff --git a/ams/djy.Service/Ams/AmsService.cs b/ams/djy.Service/Ams/AmsService.cs
index 0060b63..8157219 100644
--- a/ams/djy.Service/Ams/AmsService.cs
+++ b/ams/djy.Service/Ams/AmsService.cs
@@ -48,11 +48,11 @@ namespace djy.Service.Ams
}
var dto = DbBus.Get(DbList.AMSCenter).Select()
.Where(x => (x.IsDel == false || x.IsDel == null) && x.CompID == user.CompId)
- .WhereIf(req.MBLNO != null, x => x.MBLNO == req.MBLNO)
+ .WhereIf(req.MBLNO != null, x => req.MBLNO.Contains(x.MBLNO))
.WhereIf(req.ReportState != null, x =>ReportStates.Contains(x.ReportState))
.WhereIf(req.PORTDISCHARGECode!=null,x=>x.PORTDISCHARGECode==req.PORTDISCHARGECode)
.WhereIf(req.LoadingPortCode != null, x => x.LoadingPortCode == req.LoadingPortCode)
- .WhereIf(req.UserName!=null,x=>x.UserName==req.UserName)
+ .WhereIf(req.UserName!=null,x=> req.UserName.Contains(x.UserName) )
.WhereIf(req.CARRIERID != null, x =>req.CARRIERID==x.CARRIERID)
.WhereIf(req.BDate!=null,x=>x.CreateTime>=req.BDate)
.WhereIf(req.EDate!=null,x=>x.CreateTime<=req.EDate);
@@ -252,31 +252,30 @@ namespace djy.Service.Ams
return req;
}
- if (docType == "AMSAR" || docType == "AMSDOC")
- {
- var getfinrs = fin.Expend(new CustFee
- {
- SENDUSERID = userid,
- LURURENID = userid,
- CtnrCount = 1,
- CtnrInfo = string.Empty,
- BSTYPE = 15,
- SENDTYPE = 0,
- BSNO = oid.ToString(),
- MBLNO = master.MBLNO.ToString(),
- }
- , 0);
- if (!getfinrs.Status)
- {
- req.Code = 200;
- req.Message = getfinrs.Message;
- return req;
- }
- }
+ //if (docType == "AMSAR" || docType == "AMSDOC")
+ //{
+ // var getfinrs = fin.Expend(new CustFee
+ // {
+ // SENDUSERID = userid,
+ // LURURENID = userid,
+ // CtnrCount = 1,
+ // CtnrInfo = string.Empty,
+ // BSTYPE = 15,
+ // SENDTYPE = 0,
+ // BSNO = oid.ToString(),
+ // MBLNO = master.MBLNO.ToString(),
+ // }
+ // , 0);
+ // if (!getfinrs.Status)
+ // {
+ // req.Code = 200;
+ // req.Message = getfinrs.Message;
+ // return req;
+ // }
+ //}
var cARRIERIDList = DbBus.Get(DbList.Common).Select().Where(map => map.Module == "AMS").ToList();
var portList = DbBus.Get(DbList.Common).Select().ToList();
- var CodePortLoadList = DbBus.Get(DbList.Common).Select().ToList();
var containerTypeList = DbBus.Get(DbList.Common).Select().Where(map => map.Module == "AMS").ToList();
var packageList = DbBus.Get(DbList.Common).Select().Where(map => map.Module == "AMS").ToList();
MasterBillInfoDto dto = new MasterBillInfoDto();
@@ -408,14 +407,16 @@ namespace djy.Service.Ams
dic.Add("sign", sign);
dic.Add("docLength", docContent.ToString().Length.ToString());
#region 接口调用
- _LogsAdd("SendDE", "post", $"AMS接口调用发送:{dic}");
- _LogsAdd("SendDE", "post", $"AMS接口调用地址:{url.PARAMVALUE}");
+ _LogsAdd("SendDE", "post", $"timestamp:{timestamp}");
+ _LogsAdd("SendDE", "post", $"AMS接口调用发送{oid}:{ JsonConvert.SerializeObject(dic)}");
+ _LogsAdd("SendDE", "post", $"AMS接口调用地址{oid}:{url.PARAMVALUE}");
string gethtml = await HttpHelp.Post(dic, url.PARAMVALUE, PsotType.Urlencoded);
- _LogsAdd("SendDE", "post", $"AMS接口调用返回:{gethtml}");
+ _LogsAdd("SendDE", "post", $"AMS接口调用返回{oid}:{gethtml}");
if (gethtml != null)
{
JObject rlt = JObject.Parse(gethtml);
var code = rlt.GetValue("code").ToString();
+ var msg = rlt.GetValue("msg").ToString();
if (code == "F")
{
@@ -445,8 +446,11 @@ namespace djy.Service.Ams
}
history.Operator = user.SHOWNAME;
- history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "发送了单据";
+ history.Remark = user.SHOWNAME + "于" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "发送单据失败,失败原因:"+ msg;
DbBus.Get(DbList.AMSCenter).Insert(history).ExecuteAffrows();
+ req.Code = 200;
+ req.Message = "操作失败,"+ msg;
+ return req;
}
if (code == "T")
{
@@ -541,9 +545,6 @@ namespace djy.Service.Ams
}
-
-
-
public Response SaveReceipt(string msg)
{
Response req = new Response();
@@ -615,8 +616,6 @@ namespace djy.Service.Ams
}
-
-
///
/// 根据日期生成14位随机数
///
@@ -822,7 +821,9 @@ namespace djy.Service.Ams
{
Document document = new Document(PageSize.A4);
//指定字体文件,IDENTITY_H:支持中文
- BaseFont customfont = BaseFont.CreateFont(@"C:\Windows\Fonts\MSYH.TTC,0", BaseFont.IDENTITY_H, BaseFont.NOT_EMBEDDED);
+ var path = Path.Combine( AppDomain.CurrentDomain.BaseDirectory, "msyh.ttc,0");
+ _LogsAdd("PDF", "Get", $"PDF字体路径:{path }");
+ BaseFont customfont = BaseFont.CreateFont(path, BaseFont.IDENTITY_H, BaseFont.NOT_EMBEDDED);
var Fonttable = new Font(customfont, 12);
Font font = new Font(customfont, 14);
Font datefont = new Font(customfont, 9);
@@ -845,7 +846,7 @@ namespace djy.Service.Ams
document.Add(new Paragraph("\r"));//换行
PdfPTable table = new PdfPTable(2); //生成只有2列的行数据
table.DefaultCell.Border = Rectangle.NO_BORDER; //无边框
- table.DefaultCell.MinimumHeight = 40f; //高度
+ table.DefaultCell.MinimumHeight = 50f; //高度
float[] widths = new float[] { 100f,200f }; //宽度
table.SetWidths(widths);
@@ -903,8 +904,8 @@ namespace djy.Service.Ams
document.Add(new Paragraph("\r"));//换行
-
- Image image = Image.GetInstance(@"F:\DJY.Ams\djyweb_ams\ams\djy.WebApi\logo.png");
+ var imgpath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "logo.png");
+ Image image = Image.GetInstance(imgpath);
image.ScalePercent(10f);
//设置图片的宽高
image.ScaleAbsolute(180f, 66f);
@@ -965,11 +966,11 @@ namespace djy.Service.Ams
{
try
{
- var List = DbBus.Get(DbList.Common).Select().
+ var List = DbBus.Get(DbList.AMSCenter).Select().
Where(x => x.IsDel == false || x.IsDel == null).
- WhereIf(companyid != "", x => x.CompID == companyid).
- WhereIf(type != "", x => x.Type == type).
- WhereIf(TemPlateName != "", x => TemPlateName.Contains(x.TemPlateName)).
+ WhereIf(companyid != null, x => x.CompID == companyid).
+ WhereIf(type != null, x => x.Type == type).
+ WhereIf(TemPlateName != null, x => TemPlateName.Contains(x.TemPlateName)).
ToList();
return List;
}
diff --git a/ams/djy.Service/ISF/IsfService.cs b/ams/djy.Service/ISF/IsfService.cs
index 2c76f4a..f7da5b7 100644
--- a/ams/djy.Service/ISF/IsfService.cs
+++ b/ams/djy.Service/ISF/IsfService.cs
@@ -28,8 +28,10 @@ namespace djy.Service.ISF
ReportStates = req.ReportState.Split(',');
}
- var dto = DbBus.Get(DbList.AMSCenter).Select().Where(x => (x.IsDel == false || x.IsDel == null) && x.CompID == user.CompId)
- .WhereIf(req.MBLNO != null, x => x.MBLNO == req.MBLNO).WhereIf(req.InFoType != null, x => x.InFoType==req.InFoType).
+ var dto = DbBus.Get(DbList.AMSCenter).Select().
+ Where(x => (x.IsDel == false || x.IsDel == null) && x.CompID == user.CompId).
+ WhereIf(req.MBLNO != null,x=> req.MBLNO.Contains(x.MBLNO)).
+ WhereIf(req.InFoType != null, x => x.InFoType==req.InFoType).
WhereIf(req.ReportState != null, x => ReportStates.Contains(x.ReportState)); ;
result.count = dto.ToList().Count();
var list = dto.Page(req.Page, req.Limit).ToList();
@@ -46,7 +48,6 @@ namespace djy.Service.ISF
result.data = list;
return result;
}
- #endregion
#region 新增编辑
@@ -171,12 +172,12 @@ namespace djy.Service.ISF
{
try
{
- var List = DbBus.Get(DbList.Common).Select().
+ var List = DbBus.Get(DbList.AMSCenter).Select().
Where(x=> x.IsDel == false || x.IsDel == null).
- WhereIf(companyid != "", x => x.CompID==companyid).
- WhereIf(CompanyType != "", x => x.CompanyType == CompanyType).
- WhereIf(InFoType != "", x => x.InFoType == InFoType).
- WhereIf(TemPlateName != "", x => TemPlateName.Contains(x.TemPlateName)).
+ WhereIf(companyid !=null, x => x.CompID==companyid).
+ WhereIf(CompanyType != null, x => x.CompanyType == CompanyType).
+ WhereIf(InFoType != null, x => x.InFoType == InFoType).
+ WhereIf(TemPlateName != null, x => TemPlateName.Contains(x.TemPlateName)).
ToList();
return List;
}
@@ -212,17 +213,83 @@ namespace djy.Service.ISF
return guid;
}
-
+ #endregion
-
+ #region 第三方接口
- public Task SendDE(string Gid, string userid, string msgType)
+ public async Task SendDE(string Gid, string userid, string msgType)
{
- throw new NotImplementedException();
- }
+ Response req = new Response();
+
+ try
+ {
+ string[] id = Gid.Split(',');
+ var user = DbBus.Get(DbList.djydb).Select().Where(w => w.GID == userid).ToOne();
+ foreach (string oid in id)
+ {
+ if (oid != "")
+ {
+
+ var fin = new FinanceService();
+ var master = DbBus.Get(DbList.AMSCenter).Select().Where(x => (x.IsDel == false || x.IsDel == null) && x.CompID == user.CompId && x.GID == oid).ToOne();
+ if (msgType != "3")
+ {
+
+ if (msgType == "4" && !(master.ReportState == "已删除" || master.MateState == "匹配失败"))
+ {
+ req.Code = 200;
+ req.Message = "当前状态不能重发!如有疑问,请联系相关客服!";
+ return req;
+ }
+ if (msgType == "1" || msgType == "4")
+ {
+ ///扣费接口
+ var getfinrs = fin.Expend(new CustFee
+ {
+ SENDUSERID = userid,
+ LURURENID = userid,
+ CtnrCount = 1,
+ CtnrInfo = string.Empty,
+ BSTYPE = 16,
+ SENDTYPE = 0,
+ BSNO = oid.ToString(),
+ MBLNO = master.MBLNO.ToString(),
+ }
+ , 0);
+ if (!getfinrs.Status)
+ {
+ req.Code = 200;
+ req.Message = getfinrs.Message;
+ return req;
+ }
+ }
+ var portList = DbBus.Get(DbList.Common).Select().ToList();
+ var CodePortLoadList = DbBus.Get(DbList.Common).Select().ToList();
+ Info info = new Info();
+ info.masterBillNo = master.MBLNO;
+ info.infoType = master.InFoType;
+ info.dischargeHarbourCode = portList.Where(x => x.Code == master.DischargeHarbourCode).Select(x => x.EdiCode).FirstOrDefault();
+ info.deliveryHarbourCode = portList.Where(x => x.Code == master.DeliveryHarbourCode).Select(x => x.EdiCode).FirstOrDefault();
+
+
+ }
+ }
+ }
+ return req;
+ }
+ catch (Exception ex)
+ {
+ req.Code = 500;
+ req.Message = ex.InnerException?.Message ?? ex.Message;
+ _LogsAdd("SendDE", "post", $"ISF_SendDE接口:{req.Message }");
+
+ return req;
+ }
+ }
+
#endregion
}
-}
+}
\ No newline at end of file
diff --git a/ams/djy.WebApi/Controllers/AMS/AmsController.cs b/ams/djy.WebApi/Controllers/AMS/AmsController.cs
index b823c4f..a3d8020 100644
--- a/ams/djy.WebApi/Controllers/AMS/AmsController.cs
+++ b/ams/djy.WebApi/Controllers/AMS/AmsController.cs
@@ -22,42 +22,46 @@ namespace djy_AmsApi.Controllers
{
AmsService ser =new AmsService();
+
+
+ #region 查询接口
+ [HttpGet("Load")]
+ public object Load([FromQuery] AMSQuery request)
+ {
+ if (GetLoginId == null)
+ {
+ var result = new Response();
+ result.Code = 401;
+ result.Message = "登录过期,请重新登录!";
+ return result;
+ }
+
+ return ser.Load(request, GetLoginId.ToString());
+ }
+ #endregion
+
+
#region 新增/编辑
[HttpPost("AddOrUpdate")]
public Response AddOrUpdate(AMSDto Dto)
{
var result = new Response();
- //if (GetLoginId == null)
- //{
- // result.Code = 401;
- // result.Message = "登录过期,请重新登录!";
- //}
+ if (GetLoginId == null)
+ {
+ result.Code = 401;
+ result.Message = "登录过期,请重新登录!";
+ }
if (Dto == null)
{
result.Code = 500;
result.Message = "无效数据!";
}
- result.data=ser.SaveInfo(Dto, "d85fd590-d9f6-4410-93a1-f6fac77b606e");
-
- return result;
- }
- #endregion
- #region 查询接口
- [HttpGet("Load")]
- public object Load([FromQuery] AMSQuery request)
- {
- //if (GetLoginId == null)
- //{
- // var result = new Response();
- // result.Code = 401;
- // result.Message = "登录过期,请重新登录!";
- // return result;
- //}
- return ser.Load(request, "d85fd590-d9f6-4410-93a1-f6fac77b606e");
+ result.data = ser.SaveInfo(Dto, GetLoginId.ToString());
+
+ return result;
}
#endregion
-
#region 删除
///
/// 删除接口
@@ -94,14 +98,14 @@ namespace djy_AmsApi.Controllers
public async Task Send(string ids, string docType)
{
Response req = new Response();
- //if (GetLoginId == null)
- //{
- // var result = new Response();
- // result.Code = 401;
- // result.Message = "登录过期,请重新登录!";
- // return result;
- //}
- var result = ser.SendDE(ids, "d85fd590-d9f6-4410-93a1-f6fac77b606e", docType);
+ if (GetLoginId == null)
+ {
+
+ req.Code = 401;
+ req.Message = "登录过期,请重新登录!";
+ return req;
+ }
+ var result = ser.SendDE(ids, GetLoginId.ToString(), docType);
req.Code = result.Result.Code;
req.Message = result.Result.Message;
return req;
@@ -352,33 +356,33 @@ namespace djy_AmsApi.Controllers
result.Message = "登录过期,请重新登录!";
return result;
}
- result.Result = ser.GetTemplate("9f3b3526-4dd4-4997-b974-1f2adb2793c7", type, TemPlateName);
+ result.Result = ser.GetTemplate(GetLoginCompId, type, TemPlateName);
}
catch (Exception ex)
{
result.Code = 500;
result.Message = ex.InnerException?.Message ?? ex.Message;
}
-
return result;
}
#endregion
+
#region 保存模板
[HttpPost("SaveTemplate")]
public Response SaveTemplate(AMS_AddrTemplate Dto)
{
var result = new Response();
- //if (GetLoginId == null)
- //{
- // result.Code = 401;
- // result.Message = "登录过期,请重新登录!";
- //}
+ if (GetLoginId == null)
+ {
+ result.Code = 401;
+ result.Message = "登录过期,请重新登录!";
+ }
if (Dto == null)
{
result.Code = 500;
result.Message = "无效数据!";
}
- result.data = ser.SaveTemplate(Dto, "d85fd590-d9f6-4410-93a1-f6fac77b606e");
+ result.data = ser.SaveTemplate(Dto, GetLoginId.ToString());
return result;
}
diff --git a/ams/djy.WebApi/Controllers/ISF/IsfController.cs b/ams/djy.WebApi/Controllers/ISF/IsfController.cs
index d11bc9b..891db23 100644
--- a/ams/djy.WebApi/Controllers/ISF/IsfController.cs
+++ b/ams/djy.WebApi/Controllers/ISF/IsfController.cs
@@ -20,14 +20,15 @@ namespace djy_AmsApi.Controllers.ISF
[HttpGet("Load")]
public object Load([FromQuery] ISFQuery request)
{
- //if (GetLoginId == null)
- //{
- // var result = new Response();
- // result.Code = 401;
- // result.Message = "登录过期,请重新登录!";
- // return result;
- //}
- return ser.Load(request, "d85fd590-d9f6-4410-93a1-f6fac77b606e");
+ if (GetLoginId == null)
+ {
+ var result = new Response();
+ result.Code = 401;
+ result.Message = "登录过期,请重新登录!";
+ return result;
+ }
+
+ return ser.Load(request, GetLoginId.ToString());
}
#endregion
@@ -36,17 +37,18 @@ namespace djy_AmsApi.Controllers.ISF
public Response AddOrUpdate(ISFDto Dto)
{
var result = new Response();
- //if (GetLoginId == null)
- //{
- // result.Code = 401;
- // result.Message = "登录过期,请重新登录!";
- //}
+ if (GetLoginId == null)
+ {
+ result.Code = 401;
+ result.Message = "登录过期,请重新登录!";
+ }
if (Dto == null)
{
result.Code = 500;
result.Message = "无效数据!";
}
- result.data = ser.SaveInfo(Dto, "d85fd590-d9f6-4410-93a1-f6fac77b606e");
+
+ result.data = ser.SaveInfo(Dto, GetLoginId.ToString());
return result;
}
@@ -70,6 +72,7 @@ namespace djy_AmsApi.Controllers.ISF
result.Message = "登录过期,请重新登录!";
return result;
}
+
ser.Delete(ids, GetLoginId.ToString());
}
@@ -96,7 +99,7 @@ namespace djy_AmsApi.Controllers.ISF
result.Message = "登录过期,请重新登录!";
return result;
}
- result.Result = ser.GetTemplate("9f3b3526-4dd4-4997-b974-1f2adb2793c7", CompanyType, InFoType, TemPlateName);
+ result.Result = ser.GetTemplate(GetLoginCompId, CompanyType, InFoType, TemPlateName);
}
catch (Exception ex)
{
@@ -118,17 +121,18 @@ namespace djy_AmsApi.Controllers.ISF
public Response SaveTemplate(ISF_CompanyTemplate Dto)
{
var result = new Response();
- //if (GetLoginId == null)
- //{
- // result.Code = 401;
- // result.Message = "登录过期,请重新登录!";
- //}
+ if (GetLoginId == null)
+ {
+ result.Code = 401;
+ result.Message = "登录过期,请重新登录!";
+ }
if (Dto == null)
{
result.Code = 500;
result.Message = "无效数据!";
}
- result.data = ser.SaveTemplate(Dto, "d85fd590-d9f6-4410-93a1-f6fac77b606e");
+
+ result.data = ser.SaveTemplate(Dto, GetLoginId.ToString());
return result;
}
diff --git a/ams/djy.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user b/ams/djy.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
index d090f5a..cb57c80 100644
--- a/ams/djy.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/ams/djy.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,6 +5,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<_PublishTargetUrl>F:\DJY.AMS\ams\djy.WebApi\bin\publish\net5
- True|2022-06-24T02:33:51.1549131Z;True|2022-06-24T09:59:03.2881122+08:00;True|2022-06-24T09:15:37.5422200+08:00;True|2022-06-23T15:11:47.3175395+08:00;True|2022-06-17T09:45:32.1714267+08:00;True|2022-06-16T17:03:22.3921843+08:00;True|2022-06-16T15:35:33.2295367+08:00;True|2022-06-16T15:21:17.5490522+08:00;True|2022-06-16T14:53:00.4693599+08:00;True|2022-06-10T14:25:18.7355725+08:00;True|2022-06-09T18:13:39.8032757+08:00;True|2022-06-09T17:57:35.8696074+08:00;True|2022-06-01T17:48:15.4107624+08:00;True|2022-05-31T16:09:22.2674554+08:00;True|2022-05-31T14:15:19.3700456+08:00;True|2022-05-18T09:06:11.5118231+08:00;True|2022-05-17T16:08:22.9679914+08:00;True|2022-02-07T09:32:52.8608715+08:00;True|2022-01-29T15:30:35.5581322+08:00;True|2022-01-29T15:13:03.4191677+08:00;True|2022-01-29T14:52:16.3700211+08:00;True|2022-01-29T14:48:59.8000767+08:00;True|2022-01-29T14:45:14.4545309+08:00;True|2022-01-29T14:38:57.6540259+08:00;True|2022-01-29T13:36:16.2370205+08:00;True|2022-01-29T11:46:45.8432136+08:00;True|2022-01-29T11:20:54.2763765+08:00;True|2022-01-29T11:16:23.0172880+08:00;True|2022-01-29T11:06:15.3648999+08:00;True|2022-01-29T11:00:39.8926536+08:00;True|2022-01-28T14:35:21.7742884+08:00;True|2022-01-28T13:44:47.5005402+08:00;True|2021-12-20T11:12:24.1869686+08:00;True|2021-11-26T12:47:48.5784236+08:00;True|2021-11-25T10:09:49.9433864+08:00;True|2021-11-25T09:37:00.6093292+08:00;True|2021-11-25T09:05:31.9387896+08:00;True|2021-11-24T10:06:36.4353299+08:00;True|2021-11-24T10:05:50.0214052+08:00;True|2021-11-24T10:04:55.3930475+08:00;True|2021-11-24T09:54:45.9711710+08:00;True|2021-11-19T17:28:36.8788911+08:00;True|2021-11-11T11:47:53.2238106+08:00;True|2021-10-25T16:41:53.9980026+08:00;True|2021-10-25T16:30:28.1828641+08:00;True|2021-10-25T16:18:43.4003442+08:00;True|2021-10-25T11:56:15.6402921+08:00;True|2021-10-25T11:40:19.5447536+08:00;True|2021-10-25T10:07:48.9805552+08:00;True|2021-10-25T10:04:10.8948265+08:00;True|2021-10-25T09:48:27.3849674+08:00;True|2021-09-29T11:49:51.8683715+08:00;True|2021-09-28T18:32:55.3507925+08:00;True|2021-09-28T18:29:53.9063524+08:00;True|2021-09-28T18:28:36.1979045+08:00;True|2021-09-28T18:27:14.0693618+08:00;True|2021-09-28T12:04:26.3279007+08:00;True|2021-09-28T12:04:10.3945227+08:00;True|2021-09-28T12:03:10.3904100+08:00;True|2021-09-28T11:37:45.0482277+08:00;True|2021-09-28T11:37:12.9467611+08:00;True|2021-09-28T11:35:18.4356807+08:00;True|2021-09-28T11:34:57.5857798+08:00;True|2021-09-28T11:32:07.3952665+08:00;True|2021-09-28T11:31:56.0472675+08:00;True|2021-09-28T11:02:58.7231551+08:00;True|2021-09-28T11:02:24.3314587+08:00;True|2021-09-23T10:33:17.0585227+08:00;True|2021-09-23T10:15:28.5669869+08:00;True|2021-09-22T15:38:36.5949208+08:00;True|2021-09-22T15:37:14.3895150+08:00;True|2021-09-22T15:15:34.1096071+08:00;True|2021-09-22T13:54:04.9092004+08:00;True|2021-09-22T13:51:07.7860433+08:00;True|2021-09-22T13:48:44.1657158+08:00;True|2021-09-22T11:43:23.7675767+08:00;True|2021-09-22T11:39:57.8811307+08:00;True|2021-09-18T17:11:25.8244671+08:00;True|2021-09-18T17:06:57.9615641+08:00;True|2021-09-18T17:06:27.6770090+08:00;True|2021-09-18T15:15:53.6048918+08:00;True|2021-09-18T14:05:32.7398801+08:00;True|2021-09-16T10:50:15.9251386+08:00;True|2021-09-15T14:09:16.0943324+08:00;True|2021-09-15T10:14:47.4423584+08:00;True|2021-09-15T08:59:36.2816348+08:00;True|2021-09-15T08:59:06.0659025+08:00;True|2021-09-14T16:16:01.0927088+08:00;True|2021-09-14T16:05:19.1942230+08:00;True|2021-09-14T15:56:11.9210800+08:00;True|2021-09-14T15:06:22.7913220+08:00;True|2021-09-14T15:02:08.6994309+08:00;True|2021-09-14T13:57:46.5374369+08:00;True|2021-09-03T15:41:55.9346782+08:00;True|2021-09-03T14:42:08.7177144+08:00;True|2021-09-03T14:25:48.3478060+08:00;True|2021-09-01T18:44:04.0108700+08:00;True|2021-09-01T18:29:53.7998254+08:00;True|2021-08-30T18:06:55.0497033+08:00;True|2021-08-30T18:05:30.1878833+08:00;True|2021-08-30T18:01:08.9396673+08:00;True|2021-08-20T16:46:58.8334271+08:00;True|2021-08-20T15:58:15.4685932+08:00;False|2021-08-20T15:57:22.6334777+08:00;True|2021-08-19T09:18:27.4937232+08:00;True|2021-08-18T14:00:51.0789209+08:00;True|2021-08-18T12:49:18.9240148+08:00;True|2021-08-16T19:19:07.4882488+08:00;True|2021-08-16T17:54:03.7980648+08:00;True|2021-08-16T16:42:04.5036000+08:00;True|2021-08-16T16:34:59.3318167+08:00;True|2021-08-16T11:44:06.5450427+08:00;True|2021-08-16T09:39:05.2269990+08:00;True|2021-08-16T09:27:38.2430627+08:00;True|2021-08-16T09:16:32.6871475+08:00;True|2021-08-13T19:05:35.8370416+08:00;True|2021-08-13T17:37:25.5802853+08:00;True|2021-08-13T17:19:17.4059649+08:00;False|2021-08-13T17:15:48.5087232+08:00;True|2021-08-03T16:16:57.5039704+08:00;True|2021-08-03T09:47:15.4422559+08:00;True|2021-08-02T18:03:46.8174207+08:00;True|2021-07-30T18:44:35.7871199+08:00;True|2021-07-30T11:56:15.2793678+08:00;True|2021-07-29T18:16:47.5908488+08:00;True|2021-07-27T19:01:17.3686282+08:00;True|2021-07-27T18:53:15.0096926+08:00;True|2021-07-27T18:21:21.7175389+08:00;True|2021-07-27T18:13:49.7948790+08:00;True|2021-07-27T15:41:28.0096005+08:00;True|2021-07-27T15:17:36.9980637+08:00;True|2021-07-27T15:00:16.3453962+08:00;True|2021-07-27T08:56:31.1152011+08:00;True|2021-07-26T19:39:19.4764644+08:00;True|2021-07-26T16:14:02.0306423+08:00;True|2021-07-26T08:58:05.0743979+08:00;True|2021-07-23T13:52:17.7908297+08:00;True|2021-07-22T15:35:55.8011208+08:00;True|2021-07-22T14:48:57.5607768+08:00;False|2021-07-22T14:46:59.2433604+08:00;True|2021-07-22T11:53:54.1815531+08:00;True|2021-07-22T11:47:55.9402157+08:00;True|2021-07-21T17:07:47.1098636+08:00;False|2021-07-21T17:06:01.8301878+08:00;True|2021-07-21T12:07:33.5528978+08:00;True|2021-07-21T11:58:52.3976494+08:00;True|2021-07-21T11:54:08.4158872+08:00;True|2021-07-21T11:50:06.2472143+08:00;True|2021-07-21T11:36:39.1133844+08:00;True|2021-07-21T11:21:03.0114228+08:00;True|2021-07-21T11:18:17.4408786+08:00;True|2021-07-21T10:36:21.3639256+08:00;True|2021-07-21T10:07:08.7305964+08:00;True|2021-07-21T09:15:25.7452420+08:00;True|2021-07-20T18:30:40.6112889+08:00;True|2021-07-20T18:19:51.3604733+08:00;True|2021-07-20T18:19:32.7342667+08:00;True|2021-07-20T15:49:05.7588163+08:00;True|2021-07-20T11:16:36.9920165+08:00;True|2021-07-20T09:44:44.0514460+08:00;True|2021-07-20T09:38:33.2960380+08:00;True|2021-07-20T09:36:37.6588464+08:00;True|2021-07-19T10:56:12.4079564+08:00;True|2021-07-19T10:54:45.8280558+08:00;True|2021-07-19T09:22:28.3909171+08:00;True|2021-07-16T18:36:35.6023867+08:00;True|2021-07-16T18:16:03.6796336+08:00;True|2021-07-16T18:08:01.0416747+08:00;True|2021-07-16T17:57:30.6066695+08:00;True|2021-07-16T17:53:21.4597207+08:00;True|2021-07-16T16:35:59.3213603+08:00;True|2021-07-16T16:26:27.6700635+08:00;True|2021-07-16T16:14:06.0024712+08:00;True|2021-07-16T15:32:54.4613453+08:00;True|2021-07-16T15:05:27.8158189+08:00;True|2021-07-16T14:24:16.8232207+08:00;True|2021-07-16T14:09:34.4110570+08:00;True|2021-07-16T12:37:38.3718561+08:00;True|2021-07-16T12:34:42.0446442+08:00;True|2021-07-16T12:09:30.6811084+08:00;True|2021-07-16T12:08:25.1323321+08:00;True|2021-07-15T18:21:09.4741333+08:00;True|2021-07-15T16:00:04.2330144+08:00;True|2021-07-15T11:17:10.9557567+08:00;True|2021-07-14T16:23:40.5181594+08:00;True|2021-07-14T16:20:17.1233426+08:00;True|2021-07-14T16:14:59.1470836+08:00;True|2021-07-14T16:04:46.2399479+08:00;True|2021-07-14T16:02:19.2650977+08:00;True|2021-07-13T15:46:35.5148940+08:00;True|2021-07-13T15:19:02.2519981+08:00;True|2021-07-13T15:06:14.1118861+08:00;True|2021-07-13T08:58:19.1590599+08:00;True|2021-07-13T08:58:02.1765233+08:00;True|2021-07-12T19:57:37.5791996+08:00;True|2021-07-12T19:01:26.0226530+08:00;True|2021-07-12T19:00:58.5459964+08:00;True|2021-07-12T18:44:06.2988883+08:00;True|2021-07-12T18:42:53.2208871+08:00;True|2021-07-12T16:20:02.9452975+08:00;True|2021-07-12T16:08:35.4631966+08:00;True|2021-07-12T14:21:19.4579351+08:00;True|2021-07-12T11:59:33.7004439+08:00;True|2021-07-12T10:42:00.9669489+08:00;True|2021-07-09T19:30:48.0460644+08:00;True|2021-07-09T18:56:41.4058881+08:00;True|2021-07-09T18:48:49.6854447+08:00;True|2021-07-09T15:16:44.5457439+08:00;True|2021-07-09T11:42:41.8415232+08:00;False|2021-07-09T11:40:00.5492386+08:00;False|2021-07-09T11:39:47.8261898+08:00;False|2021-07-09T11:39:33.3491518+08:00;True|2021-07-07T18:07:21.3143487+08:00;True|2021-07-07T15:01:52.9270647+08:00;True|2021-07-07T14:57:08.5489994+08:00;True|2021-07-06T15:06:16.9591979+08:00;True|2021-07-06T14:49:44.5144609+08:00;True|2021-07-06T14:41:18.7434877+08:00;True|2021-07-05T18:14:49.0355170+08:00;True|2021-07-05T17:43:08.5712295+08:00;True|2021-07-05T15:47:49.2646754+08:00;True|2021-07-05T11:44:22.5364665+08:00;True|2021-07-05T11:42:03.9579692+08:00;False|2021-07-05T11:41:25.1128083+08:00;True|2021-07-05T11:24:21.1980971+08:00;False|2021-07-05T11:23:17.8024383+08:00;False|2021-07-05T11:22:05.3202914+08:00;False|2021-07-05T11:21:19.3955865+08:00;False|2021-07-05T11:20:46.2006683+08:00;False|2021-07-05T11:12:11.6354737+08:00;True|2021-06-30T16:41:14.2427073+08:00;True|2021-06-30T09:49:43.7585140+08:00;True|2021-06-30T09:38:56.6589900+08:00;True|2021-06-29T15:04:19.4269383+08:00;True|2021-06-29T12:03:02.6003063+08:00;True|2021-06-29T11:59:29.0700912+08:00;True|2021-06-28T19:07:09.6344096+08:00;True|2021-06-28T18:40:56.7729973+08:00;True|2021-06-28T15:07:08.4410491+08:00;True|2021-06-28T15:01:58.1985895+08:00;True|2021-06-28T14:59:46.0509356+08:00;True|2021-06-28T14:53:19.9543052+08:00;True|2021-06-28T14:01:43.2331532+08:00;True|2021-06-25T20:06:38.3250887+08:00;True|2021-06-25T20:05:04.4749130+08:00;True|2021-06-25T20:00:36.7519744+08:00;True|2021-06-25T19:51:29.4909627+08:00;True|2021-06-25T19:49:11.1186471+08:00;True|2021-06-25T19:41:20.5774902+08:00;True|2021-06-25T19:25:44.8011997+08:00;True|2021-06-25T19:12:31.3024305+08:00;True|2021-06-25T19:00:53.4604237+08:00;True|2021-06-25T17:14:22.1867284+08:00;True|2021-06-25T11:51:31.9760987+08:00;True|2021-06-18T15:38:24.8438063+08:00;True|2021-06-17T17:48:16.2507386+08:00;True|2021-06-17T15:27:53.5271385+08:00;True|2021-06-17T14:22:48.1153668+08:00;True|2021-06-16T19:48:54.7395044+08:00;True|2021-06-16T17:46:27.6970936+08:00;True|2021-06-16T17:17:24.5541236+08:00;True|2021-06-12T12:29:11.0670257+08:00;True|2021-06-12T12:13:31.2396353+08:00;True|2021-06-11T20:49:45.8770378+08:00;True|2021-06-11T20:23:35.7345560+08:00;True|2021-06-11T20:10:34.6841746+08:00;True|2021-06-11T20:10:03.8188681+08:00;True|2021-06-11T19:54:05.8278261+08:00;True|2021-06-11T17:54:42.9490044+08:00;True|2021-06-11T17:21:11.7650645+08:00;True|2021-06-11T14:37:24.6531937+08:00;True|2021-06-11T13:42:56.5964775+08:00;True|2021-06-09T12:00:10.0628981+08:00;True|2021-06-09T11:40:36.5754943+08:00;True|2021-06-09T09:14:44.6821751+08:00;True|2021-06-09T09:09:06.9619894+08:00;True|2021-06-07T15:56:56.1351876+08:00;True|2021-06-04T15:14:19.9115059+08:00;True|2021-06-03T17:08:00.6172894+08:00;True|2021-06-03T16:52:05.7356810+08:00;True|2021-06-02T16:13:58.0861859+08:00;True|2021-06-02T16:02:42.0530308+08:00;True|2021-06-02T15:22:59.6255771+08:00;True|2021-06-02T15:13:14.3872212+08:00;True|2021-06-02T13:41:58.0923978+08:00;True|2021-06-02T12:01:40.6200715+08:00;True|2021-06-02T11:55:28.3783673+08:00;True|2021-06-02T11:44:50.4444826+08:00;True|2021-06-02T10:42:05.4504772+08:00;True|2021-06-02T10:40:09.3183688+08:00;True|2021-06-02T10:33:30.9956248+08:00;True|2021-06-01T17:18:04.5340203+08:00;True|2021-06-01T16:01:46.7042467+08:00;True|2021-05-27T15:20:22.1172399+08:00;True|2021-05-27T15:17:25.6282240+08:00;True|2021-05-27T11:23:40.5666700+08:00;True|2021-05-27T11:21:37.4615006+08:00;True|2021-05-26T17:26:09.4150803+08:00;True|2021-05-26T15:56:52.3078548+08:00;True|2021-05-26T12:57:05.6791683+08:00;True|2021-05-26T12:52:55.8456216+08:00;True|2021-05-26T11:52:41.4381234+08:00;True|2021-05-26T10:34:25.1039767+08:00;True|2021-05-25T19:32:45.7536080+08:00;True|2021-05-25T18:57:00.2219334+08:00;True|2021-05-22T19:11:40.6386209+08:00;True|2021-05-22T18:55:54.6950603+08:00;True|2021-05-22T18:52:33.5496260+08:00;True|2021-05-22T18:48:02.8228681+08:00;True|2021-05-22T18:38:35.5427549+08:00;True|2021-05-22T18:29:15.3183375+08:00;True|2021-05-21T16:15:36.2915123+08:00;True|2021-05-20T18:42:10.9502323+08:00;True|2021-05-20T18:29:26.7676948+08:00;True|2021-05-20T12:52:08.9040949+08:00;True|2021-05-18T19:49:14.7589560+08:00;True|2021-05-18T19:45:41.1975778+08:00;True|2021-05-18T17:38:58.7822846+08:00;True|2021-05-18T17:30:55.4408386+08:00;True|2021-05-18T09:59:19.5593712+08:00;True|2021-05-18T09:52:52.2737127+08:00;True|2021-05-18T09:48:53.4093961+08:00;True|2021-05-17T12:45:44.7496366+08:00;True|2021-05-14T15:49:09.7552422+08:00;True|2021-05-12T17:43:57.0007037+08:00;True|2021-05-11T17:56:20.6718351+08:00;True|2021-05-11T09:52:46.7771715+08:00;True|2021-05-11T09:47:59.6677252+08:00;True|2021-05-10T09:20:34.8483836+08:00;True|2021-05-10T09:16:38.9532357+08:00;True|2021-05-08T17:57:58.2859048+08:00;True|2021-05-08T17:42:05.9061123+08:00;True|2021-05-08T15:00:07.8150611+08:00;True|2021-05-08T14:48:31.1810990+08:00;True|2021-05-08T14:44:13.5496714+08:00;True|2021-05-08T14:13:09.0831985+08:00;True|2021-05-08T10:27:05.6731164+08:00;True|2021-05-08T09:40:07.1174765+08:00;True|2021-05-07T17:56:52.4453307+08:00;True|2021-05-07T17:49:29.1426131+08:00;True|2021-05-07T17:48:04.4944047+08:00;True|2021-05-07T11:54:39.3160848+08:00;True|2021-05-07T11:37:44.2078463+08:00;True|2021-05-06T10:15:44.3077632+08:00;False|2021-05-06T09:44:48.6087607+08:00;True|2021-04-30T14:05:04.0635812+08:00;True|2021-04-29T18:12:49.4946496+08:00;True|2021-04-29T18:05:11.3555826+08:00;True|2021-04-29T13:28:14.4016136+08:00;True|2021-04-29T09:49:29.4028858+08:00;True|2021-04-29T09:42:24.9605195+08:00;True|2021-04-29T08:49:42.0809708+08:00;True|2021-04-28T18:20:44.6736811+08:00;True|2021-04-28T16:17:15.1341398+08:00;True|2021-04-28T16:11:29.3588969+08:00;True|2021-04-28T16:07:14.3371000+08:00;True|2021-04-28T15:57:30.5126332+08:00;True|2021-04-28T15:38:50.3339247+08:00;True|2021-04-28T15:34:00.1137165+08:00;True|2021-04-26T18:28:09.2009690+08:00;True|2021-04-26T18:27:09.0671228+08:00;True|2021-04-26T17:37:50.3470017+08:00;True|2021-04-26T16:39:26.1331794+08:00;True|2021-04-26T16:37:55.0874184+08:00;True|2021-04-26T15:00:51.7607134+08:00;True|2021-04-26T13:57:19.6127526+08:00;True|2021-04-26T13:50:31.1704563+08:00;True|2021-04-26T13:26:56.4316438+08:00;True|2021-04-26T13:25:20.3680008+08:00;True|2021-04-26T12:14:01.1219655+08:00;True|2021-04-25T14:17:57.1985553+08:00;True|2021-04-25T09:17:34.5110190+08:00;True|2021-04-23T18:24:24.7539026+08:00;True|2021-04-23T15:11:34.0534044+08:00;True|2021-04-23T15:02:02.8339117+08:00;True|2021-04-23T14:57:30.5567589+08:00;True|2021-04-23T14:06:54.1317500+08:00;True|2021-04-22T17:56:05.1027452+08:00;True|2021-04-22T17:38:24.8160777+08:00;True|2021-04-22T17:04:15.4424275+08:00;True|2021-04-22T14:57:45.6592871+08:00;True|2021-04-22T10:57:56.9824541+08:00;True|2021-04-22T10:10:28.7976942+08:00;True|2021-04-22T09:06:01.1618269+08:00;True|2021-04-22T09:04:39.3001346+08:00;True|2021-04-22T09:03:11.8192098+08:00;True|2021-04-22T09:00:04.8625119+08:00;True|2021-04-21T14:53:13.1270439+08:00;True|2021-04-21T14:22:45.4885992+08:00;True|2021-04-21T12:53:06.1357977+08:00;True|2021-04-21T11:39:19.8279739+08:00;True|2021-04-21T11:27:05.2539879+08:00;True|2021-04-21T11:13:04.9842347+08:00;True|2021-04-21T09:50:20.8545149+08:00;True|2021-04-21T08:57:13.9684906+08:00;True|2021-04-21T08:56:26.6122006+08:00;True|2021-04-20T18:41:54.1939781+08:00;True|2021-04-20T10:42:00.8315845+08:00;True|2021-04-20T10:13:24.3801430+08:00;True|2021-04-20T09:09:27.5545063+08:00;True|2021-04-19T18:14:00.9901563+08:00;True|2021-04-19T16:34:00.7300768+08:00;True|2021-04-19T11:30:55.5776214+08:00;True|2021-04-16T15:35:34.4897823+08:00;True|2021-04-16T15:30:17.9854672+08:00;True|2021-04-16T13:30:55.9691229+08:00;True|2021-04-16T11:41:21.4250764+08:00;True|2021-04-16T10:16:53.9487848+08:00;True|2021-04-15T18:09:42.7678653+08:00;True|2021-04-15T15:32:44.3465906+08:00;True|2021-04-15T15:18:29.9058483+08:00;
+ True|2022-06-27T08:28:43.2026298Z;True|2022-06-27T16:28:18.9494990+08:00;True|2022-06-27T16:27:16.7453474+08:00;True|2022-06-27T16:18:19.4634998+08:00;True|2022-06-27T16:02:41.1823096+08:00;True|2022-06-27T15:43:51.5116456+08:00;True|2022-06-27T15:23:40.6693098+08:00;True|2022-06-27T15:22:19.3671271+08:00;True|2022-06-27T14:41:57.2976612+08:00;True|2022-06-27T14:33:00.0677612+08:00;True|2022-06-27T14:24:08.5216447+08:00;True|2022-06-27T14:02:02.8566739+08:00;True|2022-06-27T09:23:01.1910441+08:00;True|2022-06-24T10:33:51.1549131+08:00;True|2022-06-24T09:59:03.2881122+08:00;True|2022-06-24T09:15:37.5422200+08:00;True|2022-06-23T15:11:47.3175395+08:00;True|2022-06-17T09:45:32.1714267+08:00;True|2022-06-16T17:03:22.3921843+08:00;True|2022-06-16T15:35:33.2295367+08:00;True|2022-06-16T15:21:17.5490522+08:00;True|2022-06-16T14:53:00.4693599+08:00;True|2022-06-10T14:25:18.7355725+08:00;True|2022-06-09T18:13:39.8032757+08:00;True|2022-06-09T17:57:35.8696074+08:00;True|2022-06-01T17:48:15.4107624+08:00;True|2022-05-31T16:09:22.2674554+08:00;True|2022-05-31T14:15:19.3700456+08:00;True|2022-05-18T09:06:11.5118231+08:00;True|2022-05-17T16:08:22.9679914+08:00;True|2022-02-07T09:32:52.8608715+08:00;True|2022-01-29T15:30:35.5581322+08:00;True|2022-01-29T15:13:03.4191677+08:00;True|2022-01-29T14:52:16.3700211+08:00;True|2022-01-29T14:48:59.8000767+08:00;True|2022-01-29T14:45:14.4545309+08:00;True|2022-01-29T14:38:57.6540259+08:00;True|2022-01-29T13:36:16.2370205+08:00;True|2022-01-29T11:46:45.8432136+08:00;True|2022-01-29T11:20:54.2763765+08:00;True|2022-01-29T11:16:23.0172880+08:00;True|2022-01-29T11:06:15.3648999+08:00;True|2022-01-29T11:00:39.8926536+08:00;True|2022-01-28T14:35:21.7742884+08:00;True|2022-01-28T13:44:47.5005402+08:00;True|2021-12-20T11:12:24.1869686+08:00;True|2021-11-26T12:47:48.5784236+08:00;True|2021-11-25T10:09:49.9433864+08:00;True|2021-11-25T09:37:00.6093292+08:00;True|2021-11-25T09:05:31.9387896+08:00;True|2021-11-24T10:06:36.4353299+08:00;True|2021-11-24T10:05:50.0214052+08:00;True|2021-11-24T10:04:55.3930475+08:00;True|2021-11-24T09:54:45.9711710+08:00;True|2021-11-19T17:28:36.8788911+08:00;True|2021-11-11T11:47:53.2238106+08:00;True|2021-10-25T16:41:53.9980026+08:00;True|2021-10-25T16:30:28.1828641+08:00;True|2021-10-25T16:18:43.4003442+08:00;True|2021-10-25T11:56:15.6402921+08:00;True|2021-10-25T11:40:19.5447536+08:00;True|2021-10-25T10:07:48.9805552+08:00;True|2021-10-25T10:04:10.8948265+08:00;True|2021-10-25T09:48:27.3849674+08:00;True|2021-09-29T11:49:51.8683715+08:00;True|2021-09-28T18:32:55.3507925+08:00;True|2021-09-28T18:29:53.9063524+08:00;True|2021-09-28T18:28:36.1979045+08:00;True|2021-09-28T18:27:14.0693618+08:00;True|2021-09-28T12:04:26.3279007+08:00;True|2021-09-28T12:04:10.3945227+08:00;True|2021-09-28T12:03:10.3904100+08:00;True|2021-09-28T11:37:45.0482277+08:00;True|2021-09-28T11:37:12.9467611+08:00;True|2021-09-28T11:35:18.4356807+08:00;True|2021-09-28T11:34:57.5857798+08:00;True|2021-09-28T11:32:07.3952665+08:00;True|2021-09-28T11:31:56.0472675+08:00;True|2021-09-28T11:02:58.7231551+08:00;True|2021-09-28T11:02:24.3314587+08:00;True|2021-09-23T10:33:17.0585227+08:00;True|2021-09-23T10:15:28.5669869+08:00;True|2021-09-22T15:38:36.5949208+08:00;True|2021-09-22T15:37:14.3895150+08:00;True|2021-09-22T15:15:34.1096071+08:00;True|2021-09-22T13:54:04.9092004+08:00;True|2021-09-22T13:51:07.7860433+08:00;True|2021-09-22T13:48:44.1657158+08:00;True|2021-09-22T11:43:23.7675767+08:00;True|2021-09-22T11:39:57.8811307+08:00;True|2021-09-18T17:11:25.8244671+08:00;True|2021-09-18T17:06:57.9615641+08:00;True|2021-09-18T17:06:27.6770090+08:00;True|2021-09-18T15:15:53.6048918+08:00;True|2021-09-18T14:05:32.7398801+08:00;True|2021-09-16T10:50:15.9251386+08:00;True|2021-09-15T14:09:16.0943324+08:00;True|2021-09-15T10:14:47.4423584+08:00;True|2021-09-15T08:59:36.2816348+08:00;True|2021-09-15T08:59:06.0659025+08:00;True|2021-09-14T16:16:01.0927088+08:00;True|2021-09-14T16:05:19.1942230+08:00;True|2021-09-14T15:56:11.9210800+08:00;True|2021-09-14T15:06:22.7913220+08:00;True|2021-09-14T15:02:08.6994309+08:00;True|2021-09-14T13:57:46.5374369+08:00;True|2021-09-03T15:41:55.9346782+08:00;True|2021-09-03T14:42:08.7177144+08:00;True|2021-09-03T14:25:48.3478060+08:00;True|2021-09-01T18:44:04.0108700+08:00;True|2021-09-01T18:29:53.7998254+08:00;True|2021-08-30T18:06:55.0497033+08:00;True|2021-08-30T18:05:30.1878833+08:00;True|2021-08-30T18:01:08.9396673+08:00;True|2021-08-20T16:46:58.8334271+08:00;True|2021-08-20T15:58:15.4685932+08:00;False|2021-08-20T15:57:22.6334777+08:00;True|2021-08-19T09:18:27.4937232+08:00;True|2021-08-18T14:00:51.0789209+08:00;True|2021-08-18T12:49:18.9240148+08:00;True|2021-08-16T19:19:07.4882488+08:00;True|2021-08-16T17:54:03.7980648+08:00;True|2021-08-16T16:42:04.5036000+08:00;True|2021-08-16T16:34:59.3318167+08:00;True|2021-08-16T11:44:06.5450427+08:00;True|2021-08-16T09:39:05.2269990+08:00;True|2021-08-16T09:27:38.2430627+08:00;True|2021-08-16T09:16:32.6871475+08:00;True|2021-08-13T19:05:35.8370416+08:00;True|2021-08-13T17:37:25.5802853+08:00;True|2021-08-13T17:19:17.4059649+08:00;False|2021-08-13T17:15:48.5087232+08:00;True|2021-08-03T16:16:57.5039704+08:00;True|2021-08-03T09:47:15.4422559+08:00;True|2021-08-02T18:03:46.8174207+08:00;True|2021-07-30T18:44:35.7871199+08:00;True|2021-07-30T11:56:15.2793678+08:00;True|2021-07-29T18:16:47.5908488+08:00;True|2021-07-27T19:01:17.3686282+08:00;True|2021-07-27T18:53:15.0096926+08:00;True|2021-07-27T18:21:21.7175389+08:00;True|2021-07-27T18:13:49.7948790+08:00;True|2021-07-27T15:41:28.0096005+08:00;True|2021-07-27T15:17:36.9980637+08:00;True|2021-07-27T15:00:16.3453962+08:00;True|2021-07-27T08:56:31.1152011+08:00;True|2021-07-26T19:39:19.4764644+08:00;True|2021-07-26T16:14:02.0306423+08:00;True|2021-07-26T08:58:05.0743979+08:00;True|2021-07-23T13:52:17.7908297+08:00;True|2021-07-22T15:35:55.8011208+08:00;True|2021-07-22T14:48:57.5607768+08:00;False|2021-07-22T14:46:59.2433604+08:00;True|2021-07-22T11:53:54.1815531+08:00;True|2021-07-22T11:47:55.9402157+08:00;True|2021-07-21T17:07:47.1098636+08:00;False|2021-07-21T17:06:01.8301878+08:00;True|2021-07-21T12:07:33.5528978+08:00;True|2021-07-21T11:58:52.3976494+08:00;True|2021-07-21T11:54:08.4158872+08:00;True|2021-07-21T11:50:06.2472143+08:00;True|2021-07-21T11:36:39.1133844+08:00;True|2021-07-21T11:21:03.0114228+08:00;True|2021-07-21T11:18:17.4408786+08:00;True|2021-07-21T10:36:21.3639256+08:00;True|2021-07-21T10:07:08.7305964+08:00;True|2021-07-21T09:15:25.7452420+08:00;True|2021-07-20T18:30:40.6112889+08:00;True|2021-07-20T18:19:51.3604733+08:00;True|2021-07-20T18:19:32.7342667+08:00;True|2021-07-20T15:49:05.7588163+08:00;True|2021-07-20T11:16:36.9920165+08:00;True|2021-07-20T09:44:44.0514460+08:00;True|2021-07-20T09:38:33.2960380+08:00;True|2021-07-20T09:36:37.6588464+08:00;True|2021-07-19T10:56:12.4079564+08:00;True|2021-07-19T10:54:45.8280558+08:00;True|2021-07-19T09:22:28.3909171+08:00;True|2021-07-16T18:36:35.6023867+08:00;True|2021-07-16T18:16:03.6796336+08:00;True|2021-07-16T18:08:01.0416747+08:00;True|2021-07-16T17:57:30.6066695+08:00;True|2021-07-16T17:53:21.4597207+08:00;True|2021-07-16T16:35:59.3213603+08:00;True|2021-07-16T16:26:27.6700635+08:00;True|2021-07-16T16:14:06.0024712+08:00;True|2021-07-16T15:32:54.4613453+08:00;True|2021-07-16T15:05:27.8158189+08:00;True|2021-07-16T14:24:16.8232207+08:00;True|2021-07-16T14:09:34.4110570+08:00;True|2021-07-16T12:37:38.3718561+08:00;True|2021-07-16T12:34:42.0446442+08:00;True|2021-07-16T12:09:30.6811084+08:00;True|2021-07-16T12:08:25.1323321+08:00;True|2021-07-15T18:21:09.4741333+08:00;True|2021-07-15T16:00:04.2330144+08:00;True|2021-07-15T11:17:10.9557567+08:00;True|2021-07-14T16:23:40.5181594+08:00;True|2021-07-14T16:20:17.1233426+08:00;True|2021-07-14T16:14:59.1470836+08:00;True|2021-07-14T16:04:46.2399479+08:00;True|2021-07-14T16:02:19.2650977+08:00;True|2021-07-13T15:46:35.5148940+08:00;True|2021-07-13T15:19:02.2519981+08:00;True|2021-07-13T15:06:14.1118861+08:00;True|2021-07-13T08:58:19.1590599+08:00;True|2021-07-13T08:58:02.1765233+08:00;True|2021-07-12T19:57:37.5791996+08:00;True|2021-07-12T19:01:26.0226530+08:00;True|2021-07-12T19:00:58.5459964+08:00;True|2021-07-12T18:44:06.2988883+08:00;True|2021-07-12T18:42:53.2208871+08:00;True|2021-07-12T16:20:02.9452975+08:00;True|2021-07-12T16:08:35.4631966+08:00;True|2021-07-12T14:21:19.4579351+08:00;True|2021-07-12T11:59:33.7004439+08:00;True|2021-07-12T10:42:00.9669489+08:00;True|2021-07-09T19:30:48.0460644+08:00;True|2021-07-09T18:56:41.4058881+08:00;True|2021-07-09T18:48:49.6854447+08:00;True|2021-07-09T15:16:44.5457439+08:00;True|2021-07-09T11:42:41.8415232+08:00;False|2021-07-09T11:40:00.5492386+08:00;False|2021-07-09T11:39:47.8261898+08:00;False|2021-07-09T11:39:33.3491518+08:00;True|2021-07-07T18:07:21.3143487+08:00;True|2021-07-07T15:01:52.9270647+08:00;True|2021-07-07T14:57:08.5489994+08:00;True|2021-07-06T15:06:16.9591979+08:00;True|2021-07-06T14:49:44.5144609+08:00;True|2021-07-06T14:41:18.7434877+08:00;True|2021-07-05T18:14:49.0355170+08:00;True|2021-07-05T17:43:08.5712295+08:00;True|2021-07-05T15:47:49.2646754+08:00;True|2021-07-05T11:44:22.5364665+08:00;True|2021-07-05T11:42:03.9579692+08:00;False|2021-07-05T11:41:25.1128083+08:00;True|2021-07-05T11:24:21.1980971+08:00;False|2021-07-05T11:23:17.8024383+08:00;False|2021-07-05T11:22:05.3202914+08:00;False|2021-07-05T11:21:19.3955865+08:00;False|2021-07-05T11:20:46.2006683+08:00;False|2021-07-05T11:12:11.6354737+08:00;True|2021-06-30T16:41:14.2427073+08:00;True|2021-06-30T09:49:43.7585140+08:00;True|2021-06-30T09:38:56.6589900+08:00;True|2021-06-29T15:04:19.4269383+08:00;True|2021-06-29T12:03:02.6003063+08:00;True|2021-06-29T11:59:29.0700912+08:00;True|2021-06-28T19:07:09.6344096+08:00;True|2021-06-28T18:40:56.7729973+08:00;True|2021-06-28T15:07:08.4410491+08:00;True|2021-06-28T15:01:58.1985895+08:00;True|2021-06-28T14:59:46.0509356+08:00;True|2021-06-28T14:53:19.9543052+08:00;True|2021-06-28T14:01:43.2331532+08:00;True|2021-06-25T20:06:38.3250887+08:00;True|2021-06-25T20:05:04.4749130+08:00;True|2021-06-25T20:00:36.7519744+08:00;True|2021-06-25T19:51:29.4909627+08:00;True|2021-06-25T19:49:11.1186471+08:00;True|2021-06-25T19:41:20.5774902+08:00;True|2021-06-25T19:25:44.8011997+08:00;True|2021-06-25T19:12:31.3024305+08:00;True|2021-06-25T19:00:53.4604237+08:00;True|2021-06-25T17:14:22.1867284+08:00;True|2021-06-25T11:51:31.9760987+08:00;True|2021-06-18T15:38:24.8438063+08:00;True|2021-06-17T17:48:16.2507386+08:00;True|2021-06-17T15:27:53.5271385+08:00;True|2021-06-17T14:22:48.1153668+08:00;True|2021-06-16T19:48:54.7395044+08:00;True|2021-06-16T17:46:27.6970936+08:00;True|2021-06-16T17:17:24.5541236+08:00;True|2021-06-12T12:29:11.0670257+08:00;True|2021-06-12T12:13:31.2396353+08:00;True|2021-06-11T20:49:45.8770378+08:00;True|2021-06-11T20:23:35.7345560+08:00;True|2021-06-11T20:10:34.6841746+08:00;True|2021-06-11T20:10:03.8188681+08:00;True|2021-06-11T19:54:05.8278261+08:00;True|2021-06-11T17:54:42.9490044+08:00;True|2021-06-11T17:21:11.7650645+08:00;True|2021-06-11T14:37:24.6531937+08:00;True|2021-06-11T13:42:56.5964775+08:00;True|2021-06-09T12:00:10.0628981+08:00;True|2021-06-09T11:40:36.5754943+08:00;True|2021-06-09T09:14:44.6821751+08:00;True|2021-06-09T09:09:06.9619894+08:00;True|2021-06-07T15:56:56.1351876+08:00;True|2021-06-04T15:14:19.9115059+08:00;True|2021-06-03T17:08:00.6172894+08:00;True|2021-06-03T16:52:05.7356810+08:00;True|2021-06-02T16:13:58.0861859+08:00;True|2021-06-02T16:02:42.0530308+08:00;True|2021-06-02T15:22:59.6255771+08:00;True|2021-06-02T15:13:14.3872212+08:00;True|2021-06-02T13:41:58.0923978+08:00;True|2021-06-02T12:01:40.6200715+08:00;True|2021-06-02T11:55:28.3783673+08:00;True|2021-06-02T11:44:50.4444826+08:00;True|2021-06-02T10:42:05.4504772+08:00;True|2021-06-02T10:40:09.3183688+08:00;True|2021-06-02T10:33:30.9956248+08:00;True|2021-06-01T17:18:04.5340203+08:00;True|2021-06-01T16:01:46.7042467+08:00;True|2021-05-27T15:20:22.1172399+08:00;True|2021-05-27T15:17:25.6282240+08:00;True|2021-05-27T11:23:40.5666700+08:00;True|2021-05-27T11:21:37.4615006+08:00;True|2021-05-26T17:26:09.4150803+08:00;True|2021-05-26T15:56:52.3078548+08:00;True|2021-05-26T12:57:05.6791683+08:00;True|2021-05-26T12:52:55.8456216+08:00;True|2021-05-26T11:52:41.4381234+08:00;True|2021-05-26T10:34:25.1039767+08:00;True|2021-05-25T19:32:45.7536080+08:00;True|2021-05-25T18:57:00.2219334+08:00;True|2021-05-22T19:11:40.6386209+08:00;True|2021-05-22T18:55:54.6950603+08:00;True|2021-05-22T18:52:33.5496260+08:00;True|2021-05-22T18:48:02.8228681+08:00;True|2021-05-22T18:38:35.5427549+08:00;True|2021-05-22T18:29:15.3183375+08:00;True|2021-05-21T16:15:36.2915123+08:00;True|2021-05-20T18:42:10.9502323+08:00;True|2021-05-20T18:29:26.7676948+08:00;True|2021-05-20T12:52:08.9040949+08:00;True|2021-05-18T19:49:14.7589560+08:00;True|2021-05-18T19:45:41.1975778+08:00;True|2021-05-18T17:38:58.7822846+08:00;True|2021-05-18T17:30:55.4408386+08:00;True|2021-05-18T09:59:19.5593712+08:00;True|2021-05-18T09:52:52.2737127+08:00;True|2021-05-18T09:48:53.4093961+08:00;True|2021-05-17T12:45:44.7496366+08:00;True|2021-05-14T15:49:09.7552422+08:00;True|2021-05-12T17:43:57.0007037+08:00;True|2021-05-11T17:56:20.6718351+08:00;True|2021-05-11T09:52:46.7771715+08:00;True|2021-05-11T09:47:59.6677252+08:00;True|2021-05-10T09:20:34.8483836+08:00;True|2021-05-10T09:16:38.9532357+08:00;True|2021-05-08T17:57:58.2859048+08:00;True|2021-05-08T17:42:05.9061123+08:00;True|2021-05-08T15:00:07.8150611+08:00;True|2021-05-08T14:48:31.1810990+08:00;True|2021-05-08T14:44:13.5496714+08:00;True|2021-05-08T14:13:09.0831985+08:00;True|2021-05-08T10:27:05.6731164+08:00;True|2021-05-08T09:40:07.1174765+08:00;True|2021-05-07T17:56:52.4453307+08:00;True|2021-05-07T17:49:29.1426131+08:00;True|2021-05-07T17:48:04.4944047+08:00;True|2021-05-07T11:54:39.3160848+08:00;True|2021-05-07T11:37:44.2078463+08:00;True|2021-05-06T10:15:44.3077632+08:00;False|2021-05-06T09:44:48.6087607+08:00;True|2021-04-30T14:05:04.0635812+08:00;True|2021-04-29T18:12:49.4946496+08:00;True|2021-04-29T18:05:11.3555826+08:00;True|2021-04-29T13:28:14.4016136+08:00;True|2021-04-29T09:49:29.4028858+08:00;True|2021-04-29T09:42:24.9605195+08:00;True|2021-04-29T08:49:42.0809708+08:00;True|2021-04-28T18:20:44.6736811+08:00;True|2021-04-28T16:17:15.1341398+08:00;True|2021-04-28T16:11:29.3588969+08:00;True|2021-04-28T16:07:14.3371000+08:00;True|2021-04-28T15:57:30.5126332+08:00;True|2021-04-28T15:38:50.3339247+08:00;True|2021-04-28T15:34:00.1137165+08:00;True|2021-04-26T18:28:09.2009690+08:00;True|2021-04-26T18:27:09.0671228+08:00;True|2021-04-26T17:37:50.3470017+08:00;True|2021-04-26T16:39:26.1331794+08:00;True|2021-04-26T16:37:55.0874184+08:00;True|2021-04-26T15:00:51.7607134+08:00;True|2021-04-26T13:57:19.6127526+08:00;True|2021-04-26T13:50:31.1704563+08:00;True|2021-04-26T13:26:56.4316438+08:00;True|2021-04-26T13:25:20.3680008+08:00;True|2021-04-26T12:14:01.1219655+08:00;True|2021-04-25T14:17:57.1985553+08:00;True|2021-04-25T09:17:34.5110190+08:00;True|2021-04-23T18:24:24.7539026+08:00;True|2021-04-23T15:11:34.0534044+08:00;True|2021-04-23T15:02:02.8339117+08:00;True|2021-04-23T14:57:30.5567589+08:00;True|2021-04-23T14:06:54.1317500+08:00;True|2021-04-22T17:56:05.1027452+08:00;True|2021-04-22T17:38:24.8160777+08:00;True|2021-04-22T17:04:15.4424275+08:00;True|2021-04-22T14:57:45.6592871+08:00;True|2021-04-22T10:57:56.9824541+08:00;True|2021-04-22T10:10:28.7976942+08:00;True|2021-04-22T09:06:01.1618269+08:00;True|2021-04-22T09:04:39.3001346+08:00;True|2021-04-22T09:03:11.8192098+08:00;True|2021-04-22T09:00:04.8625119+08:00;True|2021-04-21T14:53:13.1270439+08:00;True|2021-04-21T14:22:45.4885992+08:00;True|2021-04-21T12:53:06.1357977+08:00;True|2021-04-21T11:39:19.8279739+08:00;True|2021-04-21T11:27:05.2539879+08:00;True|2021-04-21T11:13:04.9842347+08:00;True|2021-04-21T09:50:20.8545149+08:00;True|2021-04-21T08:57:13.9684906+08:00;True|2021-04-21T08:56:26.6122006+08:00;True|2021-04-20T18:41:54.1939781+08:00;True|2021-04-20T10:42:00.8315845+08:00;True|2021-04-20T10:13:24.3801430+08:00;True|2021-04-20T09:09:27.5545063+08:00;True|2021-04-19T18:14:00.9901563+08:00;True|2021-04-19T16:34:00.7300768+08:00;True|2021-04-19T11:30:55.5776214+08:00;True|2021-04-16T15:35:34.4897823+08:00;True|2021-04-16T15:30:17.9854672+08:00;True|2021-04-16T13:30:55.9691229+08:00;True|2021-04-16T11:41:21.4250764+08:00;True|2021-04-16T10:16:53.9487848+08:00;True|2021-04-15T18:09:42.7678653+08:00;True|2021-04-15T15:32:44.3465906+08:00;True|2021-04-15T15:18:29.9058483+08:00;
\ No newline at end of file