diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetDetailTimelineInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetDetailTimelineInput.cs
index d6dbc062..21ec867c 100644
--- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetDetailTimelineInput.cs
+++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetDetailTimelineInput.cs
@@ -8,8 +8,12 @@ public class GetDetailTimelineInput
public string OrderNumber { get; set; }
///
- /// 子系统id
+ /// 订单所属子系统id
///
- public int SystemId{ get; set; }
+ public int SystemId { get; set; }
+ ///
+ /// 当前用户登陆子系统id
+ ///
+ public int CurrenUserSystemId { get; set; }
}
diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetDetailTimelineOutput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetDetailTimelineOutput.cs
index 4febf2c1..4441323c 100644
--- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetDetailTimelineOutput.cs
+++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetDetailTimelineOutput.cs
@@ -40,7 +40,7 @@ public class GetDetailTimelineOutput
///
/// 文件 osskey 集合
///
- public List Files { get; set; }
+ public List Files { get; set; }
///
/// 是否高亮
@@ -73,7 +73,7 @@ public class GetDetailTimelineOutput
public string? TrackPlaceNation { get; set; }
}
-public class FileItem
+public class TrackFileItem
{
///
/// 文件osskey
diff --git a/src/SJZY.Track.Application/SJZY.Track.Application.csproj b/src/SJZY.Track.Application/SJZY.Track.Application.csproj
index 926a7d69..0bcf26d3 100644
--- a/src/SJZY.Track.Application/SJZY.Track.Application.csproj
+++ b/src/SJZY.Track.Application/SJZY.Track.Application.csproj
@@ -10,6 +10,7 @@
+
diff --git a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs
index 467bfd14..4d0aea12 100644
--- a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs
+++ b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs
@@ -1,3 +1,4 @@
+using SJZY.Expand.AliyunOSS;
using SJZY.Track.Application.Contract.Dtos.ProvideServices;
using SJZY.Track.Application.Contract.Dtos.TrackOrder;
using SJZY.Track.Domain.Aggregates.OrderAggregate;
@@ -186,7 +187,10 @@ public class TrackOrderService : ApplicationService
if (input.SystemId <= 0)
return new UnifyResultDto>(false, "子系统id不合法");
- var system = await _orderRepository.GetSystemInfoById(input.SystemId);
+ if (input.CurrenUserSystemId <= 0)
+ return new UnifyResultDto>(false, "当前登陆用户子系统id不合法");
+
+ var system = await _orderRepository.GetSystemInfoById(input.CurrenUserSystemId);
if (system == null)
return new UnifyResultDto>(false, "未找到制定id的子系统");
@@ -211,11 +215,18 @@ public class TrackOrderService : ApplicationService
IsHighlight = true,
IsShowHover = true,
Remark = item.Remarks == null || item.Remarks == "--" ? "" : item.Remarks,
- TrackTimeZone = $"GMT {(item.TrackTimeZone >= 0 ? "+" : "-")}{GetTimeZoneStr(item.TrackTimeZone)}",
+ TrackTimeZone = $"GMT{(item.TrackTimeZone >= 0 ? "+" : "-")}{GetTimeZoneStr(item.TrackTimeZone)}",
TrackTime = ToUnixTimestamp(item.TrackTime),
TrackPlace = item.TrackPlace,
EnContent = item.TrackEnContent,
- //Files = string.IsNullOrEmpty(item.Files) || item.Files == "--" ? new List() : item.Files.Split(",").ToList(),
+ Files = item.Files?.Any() == true
+ ? new List()
+ : item.Files!.Select(m => new TrackFileItem()
+ {
+ OssKey = m.OssKey,
+ FileName = m.FileName,
+ Url = m.OssKey.GetUrlByKey(),
+ }).ToList(),
Content = item.TrackContent,
TrackCode = item.TrackCode,
TrackPlaceNation = item.TrackPlaceNation,
diff --git a/src/SJZY.Track.Application/SjzyTrackApplicationModule.cs b/src/SJZY.Track.Application/SjzyTrackApplicationModule.cs
index 9a8cc79b..44486d40 100644
--- a/src/SJZY.Track.Application/SjzyTrackApplicationModule.cs
+++ b/src/SJZY.Track.Application/SjzyTrackApplicationModule.cs
@@ -6,6 +6,7 @@ using RabbitMQ.Client;
using SJZY.Expand.ABP.Core.Localization;
using SJZY.Expand.ABP.Core.Logger;
using SJZY.Expand.ABP.Core.PublicMethords;
+using SJZY.Expand.AliyunOSS;
using SJZY.InterfaceRelay.Application.Contracts;
using SJZY.Track.Application.CAP;
using SJZY.Track.Application.Contract;
@@ -148,6 +149,16 @@ public class SjzyTrackApplicationModule : AbpModule
context.Services.Configure(configuration.GetSection("TrackApp"));
context.Services.Configure(
configuration.GetSection("InterfaceRelayParamsConfig"));
+
+ //注册阿里云OSS服务
+ context.Services.AddAliOSS(option =>
+ {
+ option.AccessKeyId = configuration["OSS:AccessKeyId"];
+ option.AccessKeySecret = configuration["OSS:AccessKeySecret"];
+ option.Endpoint = configuration["OSS:Endpoint"];
+ option.BucketName = configuration["OSS:BucketName"];
+ option.ReturnHttpsUrl = true;
+ });
}
public override void PreConfigureServices(ServiceConfigurationContext context)