TANG JIANG před 2 roky
rodič
revize
a90b510f1b

+ 6 - 6
src/Hotline.Api/Controllers/KnowledgeController.cs

@@ -100,12 +100,12 @@ namespace Hotline.Api.Controllers
         /// <param name="Id"></param>
         /// <returns></returns>
         [HttpGet("draftsinfo/{id}")]
-        public async Task<KnowledgeTemp> KnowledgeDraftsInfo(string Id)
+        public async Task<KnowledgeInfoDto> KnowledgeDraftsInfo(string Id)
         {
             var temp = await _knowledgeTempRepository.GetAsync(Id, HttpContext.RequestAborted);
             if (temp is null)
                 throw UserFriendlyException.SameMessage("知识草稿查询失败!");
-            return temp;
+            return _mapper.Map<KnowledgeInfoDto>(temp);
         }
 
         /// <summary>
@@ -154,12 +154,12 @@ namespace Hotline.Api.Controllers
         /// <param name="Id"></param>
         /// <returns></returns>
         [HttpGet("updateinfo/{Id}")]
-        public async Task<Knowledge> KnowledgeUpdateInfo(string Id)
+        public async Task<KnowledgeInfoDto> KnowledgeUpdateInfo(string Id)
         {
             var know = await _knowledgeRepository.GetAsync(Id, HttpContext.RequestAborted);
             if (know is null)
                 throw UserFriendlyException.SameMessage("知识查询失败!");
-            return know;
+            return _mapper.Map<KnowledgeInfoDto>(know);
         }
 
         /// <summary>
@@ -168,11 +168,11 @@ namespace Hotline.Api.Controllers
         /// <param name="Id"></param>
         /// <returns></returns>
         [HttpGet("info/{Id}")]
-        public async Task<Knowledge> KnowledgeInfo(string Id)
+        public async Task<KnowledgeInfoDto> KnowledgeInfo(string Id)
         {
             var knowledge = await _knowledgeDomainService.KnowledgeInfo(Id, HttpContext.RequestAborted);
             _mediator.Publish(new GetKnowledgeInfoNotify(knowledge));
-            return knowledge;
+            return _mapper.Map<KnowledgeInfoDto>(knowledge);
         }
 
         /// <summary>

+ 34 - 7
src/Hotline.Share/Dtos/Knowledge/KnowledgeDto.cs

@@ -11,6 +11,11 @@ namespace Hotline.Share.Dtos.Knowledge
         /// ID
         /// </summary>
         public string Id { get; set; }
+
+        /// <summary>
+        /// 工作流信息
+        /// </summary>
+        public StartWorkflowDto StartWorkflowDto { get; set; }
     }
 
     /// <summary>
@@ -22,10 +27,36 @@ namespace Hotline.Share.Dtos.Knowledge
         /// 知识Code
         /// </summary>
         public string Code { get; set; }
+
+        /// <summary>
+        /// 工作流信息
+        /// </summary>
+        public StartWorkflowDto StartWorkflowDto { get; set; }
     }
 
     /// <summary>
-    /// 新增
+    /// 查询详情
+    /// </summary>
+    public record KnowledgeInfoDto: KnowledgeDto
+    {
+        /// <summary>
+        /// ID
+        /// </summary>
+        public string Id { get; set; }
+
+        /// <summary>
+        /// 知识Code
+        /// </summary>
+        public string Code { get; set; }
+
+        /// <summary>
+        /// 流程Id
+        /// </summary>
+        public string? WorkflowId { get; set; }
+    }
+
+    /// <summary>
+    /// 基础
     /// </summary>
     public record KnowledgeDto
     {
@@ -60,9 +91,9 @@ namespace Hotline.Share.Dtos.Knowledge
         public bool IsPublic { get; set; }
 
         /// <summary>
-        /// 下架时间-到期时间
+        /// 到期时间
         /// </summary>
-        public DateTime? OffShelfTime { get; set; }
+        public DateTime? ExpiredTime { get; set; }
 
         /// <summary>
         /// 关键词
@@ -84,9 +115,5 @@ namespace Hotline.Share.Dtos.Knowledge
         /// </summary>
         public List<string> Knowledges { get; set; }
 
-        /// <summary>
-        /// 工作流信息
-        /// </summary>
-        public StartWorkflowDto StartWorkflowDto { get; set; }
     }
 }

+ 5 - 0
src/Hotline/KnowledgeBase/Knowledge.cs

@@ -69,6 +69,11 @@ public class Knowledge : WorkflowEntity//   WorkflowEntity  FullStateEntity
     /// </summary>
     public DateTime? OffShelfTime { get; set; }
 
+    /// <summary>
+    /// 过期时间
+    /// </summary>
+    public DateTime? ExpiredTime { get; set; }
+
     /// <summary>
     /// 关键词
     /// </summary>