|
@@ -62,7 +62,7 @@ namespace Hotline.Api.Controllers
|
|
|
kn.Code = Convert.ToInt64((DateTime.Now - new DateTime(1970, 1, 1, 0, 0, 0, 0)).TotalSeconds).ToString();
|
|
|
kn.PageView = 0;
|
|
|
kn.CreationTime = DateTime.Now;
|
|
|
- return await _knowledgeTempRepository.AddAsync(kn);
|
|
|
+ return await _knowledgeTempRepository.AddAsync(kn, HttpContext.RequestAborted);
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
@@ -75,7 +75,7 @@ namespace Hotline.Api.Controllers
|
|
|
public async Task KnowledgeTempUpdate([FromBody] UpdateKnowledgeDto dto)
|
|
|
{
|
|
|
var kn = _mapper.Map<KnowledgeTemp>(dto);
|
|
|
- await _knowledgeTempRepository.UpdateAsync(kn);
|
|
|
+ await _knowledgeTempRepository.UpdateAsync(kn, HttpContext.RequestAborted);
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
@@ -86,7 +86,7 @@ namespace Hotline.Api.Controllers
|
|
|
[HttpGet("knowledgetemp-info")]
|
|
|
public async Task<KnowledgeTemp> KnowledgeTempInfo(string Id)
|
|
|
{
|
|
|
- var temp = await _knowledgeTempRepository.GetAsync(Id);
|
|
|
+ var temp = await _knowledgeTempRepository.GetAsync(Id, HttpContext.RequestAborted);
|
|
|
if (temp is null)
|
|
|
throw UserFriendlyException.SameMessage("知识草稿查询失败!");
|
|
|
return temp;
|
|
@@ -104,7 +104,7 @@ namespace Hotline.Api.Controllers
|
|
|
if (string.IsNullOrEmpty(Id))
|
|
|
throw UserFriendlyException.SameMessage("Id不能为空!");
|
|
|
|
|
|
- await _knowledgeTempRepository.RemoveAsync(p => p.Id == Id);
|
|
|
+ await _knowledgeTempRepository.RemoveAsync(p => p.Id == Id,false, HttpContext.RequestAborted);
|
|
|
}
|
|
|
|
|
|
#endregion
|
|
@@ -118,11 +118,11 @@ namespace Hotline.Api.Controllers
|
|
|
[HttpGet("knowledge-updateinfo")]
|
|
|
public async Task<Knowledge> KnowledgeUpdateInfo(string Id)
|
|
|
{
|
|
|
- var know = await _knowledgeRepository.GetAsync(Id);
|
|
|
+ var know = await _knowledgeRepository.GetAsync(Id, HttpContext.RequestAborted);
|
|
|
if (know is null)
|
|
|
{
|
|
|
//再次查询草稿箱数据
|
|
|
- var tempKnow = await _knowledgeTempRepository.GetAsync(Id);
|
|
|
+ var tempKnow = await _knowledgeTempRepository.GetAsync(Id, HttpContext.RequestAborted);
|
|
|
if (tempKnow is null)
|
|
|
throw UserFriendlyException.SameMessage("知识查询失败!");
|
|
|
know = new Knowledge();
|
|
@@ -139,7 +139,7 @@ namespace Hotline.Api.Controllers
|
|
|
[HttpGet("knowledge-info")]
|
|
|
public async Task<Knowledge> KnowledgeInfo(string Id)
|
|
|
{
|
|
|
- var know = await _knowledgeRepository.GetAsync(Id);
|
|
|
+ var know = await _knowledgeRepository.GetAsync(Id, HttpContext.RequestAborted);
|
|
|
if (know is null)
|
|
|
throw UserFriendlyException.SameMessage("知识查询失败!");
|
|
|
//写入浏览记录
|
|
@@ -148,11 +148,11 @@ namespace Hotline.Api.Controllers
|
|
|
CreationTime = DateTime.Now,
|
|
|
KnowledgeId = know.Id
|
|
|
};
|
|
|
- await _knowledgePVRepository.AddAsync(knowledgePv);
|
|
|
+ await _knowledgePVRepository.AddAsync(knowledgePv, HttpContext.RequestAborted);
|
|
|
|
|
|
//修改浏览量
|
|
|
know.PageView++;
|
|
|
- await _knowledgeRepository.UpdateAsync(know);
|
|
|
+ await _knowledgeRepository.UpdateAsync(know, HttpContext.RequestAborted);
|
|
|
return know;
|
|
|
}
|
|
|
|
|
@@ -179,7 +179,7 @@ namespace Hotline.Api.Controllers
|
|
|
kn.CreationTime = DateTime.Now;
|
|
|
kn.Status = EKnowledgeStatus.Auditing;
|
|
|
|
|
|
- return await _knowledgeRepository.AddAsync(kn);
|
|
|
+ return await _knowledgeRepository.AddAsync(kn, HttpContext.RequestAborted);
|
|
|
//调用流程创建
|
|
|
|
|
|
|
|
@@ -199,7 +199,7 @@ namespace Hotline.Api.Controllers
|
|
|
//知识修改逻辑
|
|
|
//如果可以修改,此条数据不动,重新写入一条新数据,知识编号不变,版本号+1
|
|
|
|
|
|
- var know = await _knowledgeRepository.GetAsync(dto.Id);
|
|
|
+ var know = await _knowledgeRepository.GetAsync(dto.Id, HttpContext.RequestAborted);
|
|
|
if (know is null || know.IsDeleted)
|
|
|
throw UserFriendlyException.SameMessage("无效知识");
|
|
|
if (know.Status == EKnowledgeStatus.Auditing)
|
|
@@ -213,7 +213,7 @@ namespace Hotline.Api.Controllers
|
|
|
knowledge.Version = know.Version + 1;
|
|
|
//新增一条数据
|
|
|
|
|
|
- await _knowledgeRepository.AddAsync(knowledge);
|
|
|
+ await _knowledgeRepository.AddAsync(knowledge, HttpContext.RequestAborted);
|
|
|
|
|
|
//调用流程创建
|
|
|
|
|
@@ -231,11 +231,11 @@ namespace Hotline.Api.Controllers
|
|
|
[HttpGet("knowledge-delete")]
|
|
|
public async Task KnowledgeDelete(string Id)
|
|
|
{
|
|
|
- var know = await _knowledgeRepository.GetAsync(Id);
|
|
|
+ var know = await _knowledgeRepository.GetAsync(Id, HttpContext.RequestAborted);
|
|
|
if (know != null && know.IsDeleted == false)
|
|
|
{
|
|
|
know.DeletionTime = DateTime.Now;
|
|
|
- await _knowledgeRepository.RemoveAsync(know, true);
|
|
|
+ await _knowledgeRepository.RemoveAsync(know, false, HttpContext.RequestAborted);
|
|
|
}
|
|
|
else
|
|
|
{
|
|
@@ -258,7 +258,7 @@ namespace Hotline.Api.Controllers
|
|
|
//审批操作
|
|
|
foreach (var item in Ids)
|
|
|
{
|
|
|
- var know = await _knowledgeRepository.GetAsync(item);
|
|
|
+ var know = await _knowledgeRepository.GetAsync(item, HttpContext.RequestAborted);
|
|
|
if (know != null)
|
|
|
{
|
|
|
//调用流程审批接口
|
|
@@ -275,7 +275,7 @@ namespace Hotline.Api.Controllers
|
|
|
{
|
|
|
know.Status = EKnowledgeStatus.Failed;
|
|
|
}
|
|
|
- await _knowledgeRepository.UpdateAsync(know);
|
|
|
+ await _knowledgeRepository.UpdateAsync(know, HttpContext.RequestAborted);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -289,13 +289,13 @@ namespace Hotline.Api.Controllers
|
|
|
[HttpGet("knowledge-offshelf")]
|
|
|
public async Task KnowledgeOffShelf(string Id)
|
|
|
{
|
|
|
- var know = await _knowledgeRepository.GetAsync(Id);
|
|
|
+ var know = await _knowledgeRepository.GetAsync(Id, HttpContext.RequestAborted);
|
|
|
if (know != null && know.IsOnShelf == true)
|
|
|
{
|
|
|
know.IsOnShelf = false;
|
|
|
know.OnShelfTime = null;
|
|
|
know.OffShelfTime = DateTime.Now;
|
|
|
- await _knowledgeRepository.AddAsync(know);
|
|
|
+ await _knowledgeRepository.UpdateAsync(know, HttpContext.RequestAborted);
|
|
|
}
|
|
|
else
|
|
|
{
|
|
@@ -312,13 +312,13 @@ namespace Hotline.Api.Controllers
|
|
|
[HttpGet("knowledge-ontheshelf")]
|
|
|
public async Task KnowledgeOnTheShelf(string Id)
|
|
|
{
|
|
|
- var know = await _knowledgeRepository.GetAsync(Id);
|
|
|
+ var know = await _knowledgeRepository.GetAsync(Id, HttpContext.RequestAborted);
|
|
|
if (know != null && know.IsOnShelf == false)
|
|
|
{
|
|
|
know.IsOnShelf = true;
|
|
|
know.OnShelfTime = DateTime.Now;
|
|
|
know.OffShelfTime = null;
|
|
|
- await _knowledgeRepository.AddAsync(know);
|
|
|
+ await _knowledgeRepository.UpdateAsync(know, HttpContext.RequestAborted);
|
|
|
}
|
|
|
else
|
|
|
{
|
|
@@ -348,7 +348,7 @@ namespace Hotline.Api.Controllers
|
|
|
.WhereIF(pagedDto.StartTime != null, d => d.CreationTime >= pagedDto.StartTime)
|
|
|
.WhereIF(pagedDto.EndTime != null, d => d.CreationTime <= pagedDto.EndTime)
|
|
|
.OrderByDescending(p => p.CreationTime)
|
|
|
- .ToPagedListAsync(pagedDto.PageIndex, pagedDto.PageSize);
|
|
|
+ .ToPagedListAsync(pagedDto.PageIndex, pagedDto.PageSize, HttpContext.RequestAborted);
|
|
|
|
|
|
return new PagedDto<KnowledgeDataDto>(total, _mapper.Map<IReadOnlyList<KnowledgeDataDto>>(items));
|
|
|
}
|
|
@@ -611,7 +611,7 @@ namespace Hotline.Api.Controllers
|
|
|
.WhereIF(pagedDto.StartTime != null, d => d.CreationTime >= pagedDto.StartTime)
|
|
|
.WhereIF(pagedDto.EndTime != null, d => d.CreationTime <= pagedDto.EndTime)
|
|
|
.OrderByDescending(p => p.CreationTime)
|
|
|
- .ToPagedListAsync(pagedDto.PageIndex, pagedDto.PageSize);
|
|
|
+ .ToPagedListAsync(pagedDto.PageIndex, pagedDto.PageSize, HttpContext.RequestAborted);
|
|
|
|
|
|
return new PagedDto<KnowledgeDataDto>(total, _mapper.Map<IReadOnlyList<KnowledgeDataDto>>(items));
|
|
|
}
|
|
@@ -643,7 +643,7 @@ namespace Hotline.Api.Controllers
|
|
|
.WhereIF(pagedDto.StartTime != null, d => d.CreationTime >= pagedDto.StartTime)
|
|
|
.WhereIF(pagedDto.EndTime != null, d => d.CreationTime <= pagedDto.EndTime)
|
|
|
.OrderByDescending(p => p.CreationTime)
|
|
|
- .ToPagedListAsync(pagedDto.PageIndex, pagedDto.PageSize);
|
|
|
+ .ToPagedListAsync(pagedDto.PageIndex, pagedDto.PageSize, HttpContext.RequestAborted);
|
|
|
|
|
|
return new PagedDto<KnowledgeDataDto>(total, _mapper.Map<IReadOnlyList<KnowledgeDataDto>>(items));
|
|
|
}
|
|
@@ -675,7 +675,7 @@ namespace Hotline.Api.Controllers
|
|
|
.WhereIF(pagedDto.StartTime != null, d => d.CreationTime >= pagedDto.StartTime)
|
|
|
.WhereIF(pagedDto.EndTime != null, d => d.CreationTime <= pagedDto.EndTime)
|
|
|
.OrderByDescending(p => p.CreationTime)
|
|
|
- .ToPagedListAsync(pagedDto.PageIndex, pagedDto.PageSize);
|
|
|
+ .ToPagedListAsync(pagedDto.PageIndex, pagedDto.PageSize, HttpContext.RequestAborted);
|
|
|
|
|
|
return new PagedDto<KnowledgeDataDto>(total, _mapper.Map<IReadOnlyList<KnowledgeDataDto>>(items));
|
|
|
}
|
|
@@ -751,7 +751,7 @@ namespace Hotline.Api.Controllers
|
|
|
.WhereIF(!string.IsNullOrEmpty(pagedDto.Title), d => d.Title.Contains(pagedDto.Title!))
|
|
|
|
|
|
.OrderByDescending(p => p.CreationTime)
|
|
|
- .ToPagedListAsync(pagedDto.PageIndex, pagedDto.PageSize);
|
|
|
+ .ToPagedListAsync(pagedDto.PageIndex, pagedDto.PageSize, HttpContext.RequestAborted);
|
|
|
|
|
|
return new PagedDto<KnowledgeApprovalDataDto>(total, _mapper.Map<IReadOnlyList<KnowledgeApprovalDataDto>>(items));
|
|
|
}
|
|
@@ -780,7 +780,7 @@ namespace Hotline.Api.Controllers
|
|
|
.WhereIF(!string.IsNullOrEmpty(pagedDto.Title), d => d.Title.Contains(pagedDto.Title!))
|
|
|
|
|
|
.OrderByDescending(p => p.CreationTime)
|
|
|
- .ToPagedListAsync(pagedDto.PageIndex, pagedDto.PageSize);
|
|
|
+ .ToPagedListAsync(pagedDto.PageIndex, pagedDto.PageSize, HttpContext.RequestAborted);
|
|
|
|
|
|
return new PagedDto<KnowledgeApprovalDataDto>(total, _mapper.Map<IReadOnlyList<KnowledgeApprovalDataDto>>(items));
|
|
|
}
|
|
@@ -807,7 +807,7 @@ namespace Hotline.Api.Controllers
|
|
|
.WhereIF(!string.IsNullOrEmpty(pagedDto.Title), d => d.Title.Contains(pagedDto.Title!))
|
|
|
|
|
|
.OrderByDescending(p => p.CreationTime)
|
|
|
- .ToPagedListAsync(pagedDto.PageIndex, pagedDto.PageSize);
|
|
|
+ .ToPagedListAsync(pagedDto.PageIndex, pagedDto.PageSize, HttpContext.RequestAborted);
|
|
|
|
|
|
return new PagedDto<KnowledgeApprovalDataDto>(total, _mapper.Map<IReadOnlyList<KnowledgeApprovalDataDto>>(items));
|
|
|
}
|
|
@@ -832,7 +832,7 @@ namespace Hotline.Api.Controllers
|
|
|
.WhereIF(!string.IsNullOrEmpty(pagedDto.Title), d => d.Title.Contains(pagedDto.Title!))
|
|
|
|
|
|
.OrderByDescending(p => p.CreationTime)
|
|
|
- .ToPagedListAsync(pagedDto.PageIndex, pagedDto.PageSize);
|
|
|
+ .ToPagedListAsync(pagedDto.PageIndex, pagedDto.PageSize, HttpContext.RequestAborted);
|
|
|
|
|
|
return new PagedDto<KnowledgeApprovalDataDto>(total, _mapper.Map<IReadOnlyList<KnowledgeApprovalDataDto>>(items));
|
|
|
}
|