order eventCategory

src/Hotline.Api/Controllers/TestController.cs

@@ -128,8 +128,8 @@ public class TestController : BaseController
         //};
         //await _queue.EnqueueConcurrentAsync("tq1", order, HttpContext.RequestAborted);
 
-        var i = await _queue.DequeueAsync<Order>("tq1", HttpContext.RequestAborted);
-
+        //var i = await _queue.DequeueAsync<Order>("tq1", HttpContext.RequestAborted);
+        
         var today = DateTime.Today.ToString();
         //await _capPublisher.PublishAsync(EventNames.HotlineOrderFlowStarted, "123", cancellationToken: HttpContext.RequestAborted);
         return OpenResponse.Ok(today);

src/Hotline.Application/Subscribers/DatasharingSubscriber.cs

@@ -8,7 +8,7 @@ using XF.Domain.Dependency;
 
 namespace Hotline.Application.Subscribers
 {
-    public class DataSharingSubscriber : ICapSubscribe, IScopeDependency
+    public class DataSharingSubscriber : ICapSubscribe, ISingletonDependency
     {
 
     }

src/Hotline.Application/Subscribers/OrderSubscriber.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using DotNetCore.CAP;
+using XF.Domain.Dependency;
+
+namespace Hotline.Application.Subscribers
+{
+    public class OrderSubscriber : ICapSubscribe, ISingletonDependency
+    {
+       
+    }
+}

src/Hotline.Share/Dtos/Order/OrderDto.cs

@@ -339,7 +339,7 @@ namespace Hotline.Share.Dtos.Order
         /// </summary>
         public string? Password { get; set; }
 
-        public string? HotspotCodeLv1 { get; set; }
+        //public string? HotspotCodeLv1 { get; set; }
 
         public string WorkflowId { get; set; }
         public WorkflowDto Workflow { get; set; }
@@ -544,7 +544,7 @@ namespace Hotline.Share.Dtos.Order
         /// 热点
         /// </summary>
         public string? HotspotId { get; set; }
-        public string? HotspotCode { get; set; }
+        //public string? HotspotCode { get; set; }
         public string? HotspotName { get; set; }
         public string? HotspotSpliceName { get; set; }
 
@@ -555,6 +555,15 @@ namespace Hotline.Share.Dtos.Order
 
         #endregion
 
+        #region 事件分类
+
+        public string? EventCategoryId { get; set; }
+        public string? EventCategoryName { get; set; }
+        public string? EventCategorySpliceName { get; set; }
+        public string? EventCategoryExternal { get; set; }
+
+        #endregion
+
         /// <summary>
         /// 事发时间
         /// </summary>

src/Hotline/FlowEngine/Workflows/WorkflowStep.cs

@@ -40,17 +40,6 @@ public class WorkflowStep : StepBasicEntity
 
     #region 会签
 
-    ///// <summary>
-    ///// 会签流程生命周期上级节点Id(会签流程中的节点才有)
-    ///// </summary>
-    //public string? ParentId { get; set; }
-
-    ///// <summary>
-    ///// 会签流程生命周期下级节点
-    ///// </summary>
-    //[SugarColumn(IsIgnore = true)]
-    //public List<WorkflowStep> Steps { get; set; } = new();
-
     /// <summary>
     /// 会签id（或外层会签的id）
     /// </summary>

src/Hotline/Orders/Order.cs

@@ -23,7 +23,7 @@ namespace Hotline.Orders
     {
         public Order()
         {
-            HotspotCodeLv1 ??= HotspotCode?[..2];
+            //HotspotCodeLv1 ??= HotspotCode?[..2];
         }
 
         /// <summary>
@@ -151,8 +151,8 @@ namespace Hotline.Orders
         /// </summary>
         public string? HotspotId { get; set; }
 
-        public string? HotspotCode { get; set; }
-        public string? HotspotCodeLv1 { get; set; }
+        //public string? HotspotCode { get; set; }
+        //public string? HotspotCodeLv1 { get; set; }
 
         public string? HotspotName { get; set; }
 
@@ -165,6 +165,15 @@ namespace Hotline.Orders
 
         #endregion
 
+        #region 事件分类
+
+        public string? EventCategoryId { get; set; }
+        public string? EventCategoryName { get; set; }
+        public string? EventCategorySpliceName { get; set; }
+        public string? EventCategoryExternal { get; set; }
+
+        #endregion
+
         /// <summary>
         /// 事发时间
         /// </summary>
@@ -275,10 +284,15 @@ namespace Hotline.Orders
         public DateTime? StartTime { get; set; }
 
         /// <summary>
-        /// 过期时间
+        /// 超期时间
         /// </summary>
         public DateTime? ExpiredTime { get; set; }
 
+        /// <summary>
+        /// 即将超期时间
+        /// </summary>
+        public DateTime? NearlyExpiredTime { get; set; }
+
         /// <summary>
         /// 交办时间(中心交部门办理时间)
         /// </summary>