Merge branch 'S07' into test

# Conflicts:
#	src/SJZY.Track.Application.Contract/SJZY.Track.Application.Contract.csproj
This commit is contained in:
hardstylewyl 2025-02-25 09:33:26 +08:00
commit 1e32b839fb
2 changed files with 5 additions and 5 deletions

View File

@ -1,7 +1,7 @@
using SJZY.Track.Application.Contract.Dtos.TrackContents; using SJZY.Track.Application.Contract.Dtos.TrackContents;
using Volo.Abp; using Volo.Abp;
namespace SJZY.Track.Application.Contract.Services; namespace SJZY.Track.Application.Contract.Services.ProvideServices;
public interface ITrackContentService : IRemoteService public interface ITrackContentService : IRemoteService
{ {
@ -10,5 +10,5 @@ public interface ITrackContentService : IRemoteService
/// </summary> /// </summary>
/// <param name="subSystemId"></param> /// <param name="subSystemId"></param>
/// <returns></returns> /// <returns></returns>
Task<List<TrackContentOutput>> GetTrackContentsAsync(int subSystemId); Task<UnifyResultDto<List<TrackContentOutput>>> GetTrackContentsAsync(int subSystemId);
} }

View File

@ -1,5 +1,5 @@
using SJZY.Track.Application.Contract.Dtos.TrackContents; using SJZY.Track.Application.Contract.Dtos.TrackContents;
using SJZY.Track.Application.Contract.Services; using SJZY.Track.Application.Contract.Services.ProvideServices;
using SJZY.Track.Domain.Aggregates.TrackContentAggregate; using SJZY.Track.Domain.Aggregates.TrackContentAggregate;
using SJZY.Track.Domain.Dtos.TrackContents; using SJZY.Track.Domain.Dtos.TrackContents;
@ -25,10 +25,10 @@ public class TrackContentService : ApplicationService, ITrackContentService
/// <param name="subSystemId"></param> /// <param name="subSystemId"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("Track/GetTrackContents")] [HttpPost("Track/GetTrackContents")]
public async Task<List<TrackContentOutput>> GetTrackContentsAsync(int subSystemId) public async Task<UnifyResultDto<List<TrackContentOutput>>> GetTrackContentsAsync(int subSystemId)
{ {
var res = await _trackContentRepository.GetTrackContentBySyetemIdAsync(subSystemId); var res = await _trackContentRepository.GetTrackContentBySyetemIdAsync(subSystemId);
var result = ObjectMapper.Map<List<TrackContentVO>, List<TrackContentOutput>>(res); var result = ObjectMapper.Map<List<TrackContentVO>, List<TrackContentOutput>>(res);
return result; return new UnifyResultDto<List<TrackContentOutput>>(true, result);
} }
} }