From 531e14538b58d0874cddf6fbae3056d6e6a3034b Mon Sep 17 00:00:00 2001 From: eli Date: Thu, 14 Nov 2024 14:55:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BD=93=E5=89=8D=E7=99=BB?= =?UTF-8?q?=E9=99=86=E4=BA=BA=E5=AD=90=E7=B3=BB=E7=BB=9F=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProvideServices/GetDetailTimelineInput.cs | 4 --- .../GetDetailTimelineOutput.cs | 20 +++++++++++++- .../TrackContents/TrackContentService.cs | 1 - .../Services/TrackOrders/TrackOrderService.cs | 26 +++++++++++++++---- .../OrderAggregate/IOrderRepository.cs | 8 ++++++ .../Repositories/OrderRepository.cs | 5 ++++ 6 files changed, 53 insertions(+), 11 deletions(-) diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetDetailTimelineInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetDetailTimelineInput.cs index 94067c80..d6dbc062 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetDetailTimelineInput.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetDetailTimelineInput.cs @@ -12,8 +12,4 @@ public class GetDetailTimelineInput /// public int SystemId{ get; set; } - /// - /// 是否 - /// - public bool IsClient { 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 d5d56c9b..4febf2c1 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; } /// /// 是否高亮 @@ -72,3 +72,21 @@ public class GetDetailTimelineOutput /// public string? TrackPlaceNation { get; set; } } + +public class FileItem +{ + /// + /// 文件osskey + /// + public string OssKey { get; set; } + + /// + /// 文件名称 + /// + public string FileName { get; set; } + + /// + /// 文件url + /// + public string Url { get; set; } +} diff --git a/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs b/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs index b4bea62f..dca95c7e 100644 --- a/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs +++ b/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs @@ -242,7 +242,6 @@ public class TrackContentService : ApplicationService //获取轨迹详情 var trackDetails = await _trackDetailsEsRepository.GetListAsync(orderId); - //获取当前子系统下所有的轨迹内容 var contentList = await _trackContentRepository.GetListBySystemIdAsync(input.SystemId); if (contentList == null) diff --git a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs index 9b3cbae7..467bfd14 100644 --- a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs +++ b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs @@ -186,6 +186,10 @@ public class TrackOrderService : ApplicationService if (input.SystemId <= 0) return new UnifyResultDto>(false, "子系统id不合法"); + var system = await _orderRepository.GetSystemInfoById(input.SystemId); + if (system == null) + return new UnifyResultDto>(false, "未找到制定id的子系统"); + var trackStatus = await _trackStatusRepository.GetListAsync(m => m.SubSystemId == input.SystemId); var trackDetails = await _trackDetailsEsRepository.GetListAsync(order.Id); @@ -198,8 +202,8 @@ public class TrackOrderService : ApplicationService //是否完结 isCompleted = currentTrackStatus?.IsCompleted == true; - //如果是客户端，且轨迹内容不对外则跳过这条轨迹内容 - if (input.IsClient && item.IsVisibility) + //如果是内部系统，且轨迹内容不对外则跳过这条轨迹内容 + if (system.SystemProperty == 1 && item.IsVisibility) continue; res.Data.Add(new GetDetailTimelineOutput() @@ -207,11 +211,11 @@ public class TrackOrderService : ApplicationService IsHighlight = true, IsShowHover = true, Remark = item.Remarks == null || item.Remarks == "--" ? "" : item.Remarks, - TrackTimeZone = $"GMT{(item.TrackTimeZone >= 0 ? "+" : "-")}{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 = string.IsNullOrEmpty(item.Files) || item.Files == "--" ? new List() : item.Files.Split(",").ToList(), Content = item.TrackContent, TrackCode = item.TrackCode, TrackPlaceNation = item.TrackPlaceNation, @@ -238,11 +242,23 @@ public class TrackOrderService : ApplicationService public static long ToUnixTimestamp(DateTime time) { - //var sTime = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc); var sTime = TimeZoneInfo.ConvertTime(new DateTime(1970, 1, 1), TimeZoneInfo.Utc, TimeZoneInfo.Local); return (long) (time - sTime).TotalMilliseconds; } + private string GetTimeZoneStr(float timeZone) + { + var time = timeZone.ToString().Split('.'); + if (time.Length > 1 && time[1] != "0") //如果时区有小数点 + { + return time[0] + ":30"; + } + else + { + return time[0] + ":00"; + } + } + /// /// 根据轨迹id删除单条轨迹 /// diff --git a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs index be928230..ad8d9607 100644 --- a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs +++ b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs @@ -1,4 +1,5 @@ using SJZY.Track.Domain.Dtos.Order; +using SJZY.Track.Domain.VEntities; namespace SJZY.Track.Domain.Aggregates.OrderAggregate; @@ -131,4 +132,11 @@ public interface IOrderRepository : IBasicRepository Task UpdateOrderPullConfigForServiceProviderAsync(UpdateOrderPullConfigsInputVo inputVo); #endregion + + /// + /// 根据id获取子系统信息 + /// + /// + /// + Task GetSystemInfoById(int id); } diff --git a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs index eb62e350..c5488f36 100644 --- a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs +++ b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs @@ -163,6 +163,11 @@ public class OrderRepository : BasicRepository, IOrderRepository, I return res.Select(x => (x.Key, x.Id)).ToList(); } + public Task GetSystemInfoById(int id) + { + return Context.Queryable().FirstAsync(m => m.IsDeleted == false && m.Id == id); + } + private int UpdateOrderQuestionType(int questionType, IEnumerable ids) { var idsString = string.Join(",", ids);