对接前端

src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs

@@ -73,16 +73,6 @@ public class TrackOrderDto
     /// </summary>
     public string? OrderNumber { get; set; }
 
-    /// <summary>
-    /// 轨迹模版
-    /// </summary>
-    public string? TrackTemplateNames { get; set; }
-
-    /// <summary>
-    /// 轨迹模板Id数组
-    /// </summary>
-    public List<int>? TrackTemplateIds { get; set; }
-
     /// <summary>
     /// 客户简称
     /// </summary>

src/SJZY.Track.Application.Contract/Dtos/TrackContents/EditTrackContentInput.cs

@@ -98,5 +98,5 @@ public class GetTrackContentDetailDto
     /// <summary>
     /// 轨迹标记ids
     /// </summary>
-    public List<string>? TrackFlagIds { get; set; }
+    public List<int>? TrackFlagIds { get; set; }
 }

src/SJZY.Track.Application.Contract/Dtos/TrackFlags/GetTrackFlagListDto.cs

@@ -1,4 +1,4 @@
-namespace SJZY.Track.Application.Contract.Dtos.TrackFlags;
+namespace SJZY.Track.Application.Contract.Dtos.TrackFlags;
 
 public class GetTrackFlagListDto
 {
@@ -22,10 +22,10 @@ public class GetTrackFlagListDto
     /// </summary>
     public string Flag { get; set; }
 
-    ///// <summary>
+    /// <summary>
-    ///// 是否完结
+    /// 是否广播
-    ///// </summary>
+    /// </summary>
-    //public bool IsFinish { get; set; }
+    public bool IsToMq { get; set; }
 
     /// <summary>
     /// 创建时间

src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusDetailDto.cs

@@ -46,4 +46,9 @@ public class GetTrackStatusDetailDto
     /// 是否完结
     /// </summary>
     public bool IsCompleted { get; set; }
+
+    /// <summary>
+    /// 是否广播
+    /// </summary>
+    public bool IsToMq { get; set; }
 }

src/SJZY.Track.Application.Contract/Dtos/TrackStatus/GetTrackStatusListDto.cs

@@ -37,6 +37,11 @@ public class GetTrackStatusListDto
     /// </summary>
     public bool IsCompleted { get; set; }
 
+    /// <summary>
+    /// 是否广播
+    /// </summary>
+    public bool IsToMq { get; set; }
+
     /// <summary>
     /// 创建人
     /// </summary>

src/SJZY.Track.Domain/Dtos/TrackContents/GetPageTrackContentVO.cs

@@ -65,6 +65,11 @@ public class GetTrackContentListVO
     /// </summary>
     public string TrackFlag { get; set; }
 
+    /// <summary>
+    /// 是否对外
+    /// </summary>
+    public bool IsExternal { get; set; }
+
     /// <summary>
     /// 创建时间
     /// </summary>

src/SJZY.Track.Domain/Dtos/TrackFlags/GetPageTrackFlagVO.cs

@@ -1,4 +1,4 @@
-namespace SJZY.Track.Domain.Dtos.TrackFlags;
+namespace SJZY.Track.Domain.Dtos.TrackFlags;
 
 public class GetPageTrackFlagVO : PageInfoInput
 {
@@ -40,10 +40,10 @@ public class GetTrackFlagListVO
     /// </summary>
     public string Flag { get; set; }
 
-    ///// <summary>
+    /// <summary>
-    ///// 是否完结
+    /// 是否广播
-    ///// </summary>
+    /// </summary>
-    //public bool IsFinish { get; set; }
+    public bool IsToMq { get; set; }
 
     /// <summary>
     /// 创建时间

src/SJZY.Track.Domain/Dtos/TrackFlags/GetTrackFlagDetailVO.cs

@@ -1,4 +1,4 @@
-namespace SJZY.Track.Domain.Dtos.TrackFlags;
+namespace SJZY.Track.Domain.Dtos.TrackFlags;
 
 public class GetTrackFlagDetailVO
 {
@@ -23,12 +23,12 @@ public class GetTrackFlagDetailVO
     public string Code { get; set; }
 
     /// <summary>
-    /// 
+    ///
     /// </summary>
     public string Flag { get; set; }
 
-    ///// <summary>
+    /// <summary>
-    ///// 是否完结
+    /// 是否广播
-    ///// </summary>
+    /// </summary>
-    //public bool IsFinish { get; set; }
+    public bool IsToMq { get; set; }
 }

src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusDetailVO.cs

@@ -46,4 +46,9 @@ public class GetTrackStatusDetailVO
     /// 是否完结
     /// </summary>
     public bool IsCompleted { get; set; }
+
+    /// <summary>
+    /// 是否广播
+    /// </summary>
+    public bool IsToMq { get; set; }
 }

src/SJZY.Track.Domain/Dtos/TrackStatus/GetTrackStatusListVO.cs

@@ -42,6 +42,11 @@ public class GetTrackStatusListVO
     /// </summary>
     public bool IsCompleted { get; set; }
 
+    /// <summary>
+    /// 是否广播
+    /// </summary>
+    public bool IsToMq { get; set; }
+
     /// <summary>
     /// 创建人
     /// </summary>

src/SJZY.Track.Repository/Repositories/TrackContentRepository.cs

@@ -67,6 +67,7 @@ public class TrackContentRepository : BasicRepository<TrackContentEntity>, ITrac
                 Content = a.Content,
                 EnContent = a.EnContent,
                 TrackStatus = b.Status,
+                IsExternal = a.IsExternal,
                 Node = SqlFunc.IF(b.Node == 1).Return("揽收").ElseIF(b.Node == 2).Return("清关").ElseIF(b.Node == 3)
                     .Return("干线")
                     .ElseIF(b.Node == 4).Return("派送").ElseIF(b.Node == 5).Return("其他")

src/SJZY.Track.Repository/Repositories/TrackFlagRepository.cs

@@ -1,4 +1,4 @@
-using SJZY.Track.Domain.Aggregates.TrackFlagAggregate;
+using SJZY.Track.Domain.Aggregates.TrackFlagAggregate;
 using SJZY.Track.Domain.Dtos.TrackFlags;
 using SJZY.Track.Domain.VEntities;
 
@@ -26,8 +26,8 @@ public class TrackFlagRepository : BasicRepository<TrackFlagEntity>, ITrackFlagR
                 SubSystemId = a.SubSystemId,
                 SubSystem = b.CnName,
                 Code = a.Code,
-                Flag = a.Name
+                Flag = a.Name,
-                //,IsFinish=a.IsCompleted
+                IsToMq = a.IsToMq
             })
             .FirstAsync();
         return detail;
@@ -57,7 +57,7 @@ public class TrackFlagRepository : BasicRepository<TrackFlagEntity>, ITrackFlagR
                 SubSystem = b.CnName,
                 Code = a.Code,
                 Flag = a.Name,
-                //IsFinish=a.IsCompleted,
+                IsToMq = a.IsToMq,
                 CreateTime = a.CreateTime,
                 CreateUser = c.Name,
                 UpdateTime = a.UpdateTime,

src/SJZY.Track.Repository/Repositories/TrackStatusRepository.cs

@@ -28,7 +28,8 @@ public class TrackStatusRepository : BasicRepository<TrackStatusEntity>, ITrackS
                 NodeId = a.Node,
                 TrackStatus = a.Status,
                 NodeName = t.NodeName,
-                IsCompleted = a.IsCompleted
+                IsCompleted = a.IsCompleted,
+                IsToMq = a.IsToMq
             })
             .FirstAsync();
         return detail;
@@ -67,7 +68,8 @@ public class TrackStatusRepository : BasicRepository<TrackStatusEntity>, ITrackS
                 UpdateTime = a.UpdateTime,
                 UpdateUser = d.Name,
                 SubSystem = b.CnName,
-                IsCompleted = a.IsCompleted
+                IsCompleted = a.IsCompleted,
+                IsToMq = a.IsToMq
             })
             .ToPagedListAsync(input.PageIndex, input.PageSize);