diff --git a/src/SJZY.Track.Api/appsettings.json b/src/SJZY.Track.Api/appsettings.json
index d69cb0c1..b88d44ad 100644
--- a/src/SJZY.Track.Api/appsettings.json
+++ b/src/SJZY.Track.Api/appsettings.json
@@ -5,9 +5,11 @@
"Apollo": {
"AppId": "SJZY.Track.Configuration",
"Env": "DEV",
- "Namespace": "Test",
+ "Namespace": "Dev",
"MetaServer": "http://apollo-service-test-apollo-configservice.apollo.svc.cluster.local:8080",
- "ConfigServer": [ "http://apollo-service-test-apollo-configservice.apollo.svc.cluster.local:8080" ]
+ "ConfigServer": [
+ "http://apollo-service-test-apollo-configservice.apollo.svc.cluster.local:8080"
+ ]
}
},
"Kestrel": {
diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/EditTrackContentInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackContents/EditTrackContentInput.cs
index bf4ddc54..d2a829ca 100644
--- a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/EditTrackContentInput.cs
+++ b/src/SJZY.Track.Application.Contract/Dtos/TrackContents/EditTrackContentInput.cs
@@ -94,10 +94,5 @@
/// 轨迹标记
///
public string TrackFlag { get; set; }
-
- ///
- /// 是否完结
- ///
- public bool IsFinish { get; set; }
}
}
\ No newline at end of file
diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetPageTrackContentInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetPageTrackContentInput.cs
index 8c0b6b05..b6aa4a90 100644
--- a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetPageTrackContentInput.cs
+++ b/src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetPageTrackContentInput.cs
@@ -20,7 +20,7 @@
///
/// 选中的轨迹内容id
///
- public List? SelectIds { get; set; }
+ public List? SelectIds { get; set; }
}
public class GetTrackContentListDto
@@ -84,10 +84,5 @@
/// 修改人
///
public string UpdateUser { get; set; }
-
- ///
- /// 是否完结
- ///
- public bool IsFinish { get; set; }
}
}
\ No newline at end of file
diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullContentInput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullContentInput.cs
index b409c9e6..1342b38b 100644
--- a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullContentInput.cs
+++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/EditTrackPullContentInput.cs
@@ -53,4 +53,9 @@ public class EditTrackPullContentInput
/// 轨迹时区GMT
///
public double? TrackTimeZone { get; set; }
+
+ ///
+ /// 是否完结
+ ///
+ public bool IsCompleted { get; set; }
}
\ No newline at end of file
diff --git a/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs b/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs
index 90795551..657cc671 100644
--- a/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs
+++ b/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs
@@ -1,297 +1,296 @@
-using Microsoft.Extensions.Localization;
+using System.Linq.Expressions;
+using Microsoft.Extensions.Localization;
using SJZY.Expand.ABP.Core.Localization;
using SJZY.Expand.ABP.Core.PublicMethords;
using SJZY.Track.Application.Contract.Dtos.TrackContents;
using SJZY.Track.Application.Localization;
using SJZY.Track.Domain.Aggregates.TrackContentAggregate;
-using SJZY.Track.Domain.Aggregates.TrackTemplateAggregate;
using SJZY.Track.Domain.Dtos.TrackContents;
-using SJZY.Track.Domain.Queries;
-using System.Linq.Expressions;
-using Volo.Abp.DependencyInjection;
-namespace SJZY.Track.Application.Services.TrackContents
+namespace SJZY.Track.Application.Services.TrackContents;
+
+///
+/// 轨迹内容服务
+///
+[ApiExplorerSettings(GroupName = "轨迹内容")]
+[Route("/Track/Content")]
+public class TrackContentService : ApplicationService
{
- ///
- /// 轨迹内容服务
- ///
- [ApiExplorerSettings(GroupName = "轨迹内容")]
- [Route("/Track/Content")]
- public class TrackContentService : ApplicationService, ITransientDependency
+ private readonly IStringLocalizer _stringLocalizer;
+ private readonly ITrackContentRepository _trackContentRepository;
+
+ public TrackContentService(
+ IStringLocalizer stringLocalizer,
+ ITrackContentRepository trackContentRepository
+ )
{
- private readonly IStringLocalizer _stringLocalizer;
- private readonly ITrackContentRepository _trackContentRepository;
- private readonly IBasicQuery _trackContentMapBasicQuery;
- private readonly IBasicQuery _trackTemplateContentBasicQuery;
+ _stringLocalizer = stringLocalizer;
+ _trackContentRepository = trackContentRepository;
+ }
- public TrackContentService(
- IStringLocalizer stringLocalizer,
- ITrackContentRepository trackContentRepository,
- IBasicQuery trackContentMapBasicQuery,
- IBasicQuery trackTemplateContentBasicQuery
- )
+ ///
+ /// 轨迹内容编辑
+ ///
+ ///
+ [HttpPost("Edit")]
+ public async Task EditAsync(EditTrackContentInput input)
+ {
+ return input.Options switch
{
- this._stringLocalizer = stringLocalizer;
- this._trackContentRepository = trackContentRepository;
- this._trackContentMapBasicQuery = trackContentMapBasicQuery;
- this._trackTemplateContentBasicQuery = trackTemplateContentBasicQuery;
+ OptionType.新增 => await AddAsync(input),
+ OptionType.修改 => await UpdateAsync(input),
+ OptionType.删除 => await DeleteAsync(input),
+ _ => throw new BusinessException(message: "当前操作动作不合法")
+ };
+ }
+
+ ///
+ /// 根据内容id获取轨迹内容
+ ///
+ ///
+ ///
+ [HttpGet("GetDetail")]
+ public async Task> GetDetailAsync(int id)
+ {
+ var detailInfo = await _trackContentRepository.GetDetailAsync(id);
+ if (detailInfo == null)
+ {
+ return new UnifyResultDto(false, null!, "未查询到轨迹状态");
}
- ///
- /// 轨迹内容编辑
- ///
- ///
- [HttpPost("Edit")]
- public async Task EditAsync(EditTrackContentInput input)
- {
- return input.Options switch
- {
- OptionType.新增 => await AddAsync(input),
- OptionType.修改 => await UpdateAsync(input),
- OptionType.删除 => await DeleteAsync(input),
- _ => throw new BusinessException(message: "当前操作动作不合法")
- };
- }
+ var dto = ObjectMapper.Map(detailInfo);
+ return new UnifyResultDto("200", "", dto);
+ }
- ///
- /// 根据内容id获取轨迹内容
- ///
- ///
- ///
- [HttpGet("GetDetail")]
- public async Task> GetDetailAsync(int id)
+ ///
+ /// 获取分页轨迹内容
+ ///
+ ///
+ ///
+ [HttpPost("GetList")]
+ public async Task> GetPageTrackContent(
+ GetPageTrackContentInput input)
+ {
+ var vo = ObjectMapper.Map(input);
+ var resultDto = await _trackContentRepository.GetPageTrackContent(vo);
+ var pageResultDto =
+ ObjectMapper.Map, UnifyPageResultDto>(
+ resultDto);
+
+ return pageResultDto;
+ }
+
+ #region 私有方法
+
+ private async Task AddAsync(EditTrackContentInput input)
+ {
+ #region 业务逻辑校验
+
+ var trackContentEntitys = await _trackContentRepository.GetListAsync(a =>
+ a.SubSystemId == input.SubSystemId && (a.Code == input.Code ||
+ a.Content == input.Content || a.EnContent == input.EnContent));
+ if (trackContentEntitys.Any())
{
- var detailInfo = await _trackContentRepository.GetDetailAsync(id);
- if (detailInfo == null)
+ //throw new BusinessException(message: _stringLocalizer["TrackContentExist"]);
+ var codes = trackContentEntitys.FirstOrDefault(a => a.Code == input.Code);
+ if (codes != null)
{
- return new UnifyResultDto(false, null!, "未查询到轨迹状态");
+ throw new BusinessException(message: "该子系统下轨迹代码已存在");
}
- var dto = ObjectMapper.Map(detailInfo);
- return new UnifyResultDto("200", "", dto);
- }
-
- ///
- /// 获取分页轨迹内容
- ///
- ///
- ///
- [HttpPost("GetList")]
- public async Task> GetPageTrackContent(
- GetPageTrackContentInput input)
- {
- var vo = ObjectMapper.Map(input);
- var resultDto = await _trackContentRepository.GetPageTrackContent(vo);
- var pageResultDto =
- ObjectMapper.Map, UnifyPageResultDto>(
- resultDto);
-
- return pageResultDto;
- }
-
- #region 私有方法
-
- private async Task AddAsync(EditTrackContentInput input)
- {
- #region 业务逻辑校验
-
- var trackContentEntitys = await _trackContentRepository.GetListAsync(a =>
- a.SubSystemId == input.SubSystemId && (a.Code == input.Code ||
- a.Content == input.Content || a.EnContent == input.EnContent));
- if (trackContentEntitys.Any())
+ var contents = trackContentEntitys.FirstOrDefault(a => a.Content == input.Content);
+ if (contents != null)
{
- //throw new BusinessException(message: _stringLocalizer["TrackContentExist"]);
- var codes = trackContentEntitys.FirstOrDefault(a => a.Code == input.Code);
- if (codes != null)
- {
- throw new BusinessException(message: "该子系统下轨迹代码已存在");
- }
- var contents = trackContentEntitys.FirstOrDefault(a => a.Content == input.Content);
- if (contents != null)
- {
- throw new BusinessException(message: "该子系统下轨迹内容已存在");
- }
- var contentEns = trackContentEntitys.FirstOrDefault(a => a.EnContent == input.EnContent);
- if (contentEns != null)
- {
- throw new BusinessException(message: "该子系统下轨迹内容英文已存在");
- }
- //throw new BusinessException(message: "当前子系统下，轨迹代码或轨迹内容或轨迹内容英文存在");
+ throw new BusinessException(message: "该子系统下轨迹内容已存在");
}
- #endregion 业务逻辑校验
-
- var entity = ObjectMapper.Map(input);
- var isTrue = await _trackContentRepository.InsertAsync(entity);
-
- return new UnifyResultDto("200", "新增成功", isTrue);
+ var contentEns = trackContentEntitys.FirstOrDefault(a => a.EnContent == input.EnContent);
+ if (contentEns != null)
+ {
+ throw new BusinessException(message: "该子系统下轨迹内容英文已存在");
+ }
+ //throw new BusinessException(message: "当前子系统下，轨迹代码或轨迹内容或轨迹内容英文存在");
}
- private async Task UpdateAsync(EditTrackContentInput input)
- {
- #region 业务逻辑校验
+ #endregion 业务逻辑校验
- var trackContentEntitys = await _trackContentRepository.GetListAsync(a => a.Id != input.Id &&
- a.SubSystemId == input.SubSystemId && (a.Code == input.Code ||
- a.Content == input.Content || a.EnContent == input.EnContent));
- if (trackContentEntitys.Any())
+ var entity = ObjectMapper.Map(input);
+ var isTrue = await _trackContentRepository.InsertAsync(entity);
+
+ return new UnifyResultDto("200", "新增成功", isTrue);
+ }
+
+ private async Task UpdateAsync(EditTrackContentInput input)
+ {
+ #region 业务逻辑校验
+
+ var trackContentEntitys = await _trackContentRepository.GetListAsync(a => a.Id != input.Id &&
+ a.SubSystemId == input.SubSystemId && (a.Code == input.Code ||
+ a.Content == input.Content || a.EnContent == input.EnContent));
+ if (trackContentEntitys.Any())
+ {
+ //throw new BusinessException(message: _stringLocalizer["TrackContentExist"]);
+ //throw new BusinessException(message: "当前子系统下，轨迹代码或轨迹内容或轨迹内容英文存在");
+ var codes = trackContentEntitys.FirstOrDefault(a => a.Code == input.Code);
+ if (codes != null)
{
- //throw new BusinessException(message: _stringLocalizer["TrackContentExist"]);
- //throw new BusinessException(message: "当前子系统下，轨迹代码或轨迹内容或轨迹内容英文存在");
- var codes = trackContentEntitys.FirstOrDefault(a => a.Code == input.Code);
- if (codes != null)
+ throw new BusinessException(message: "该子系统下轨迹代码已存在");
+ }
+
+ var contents = trackContentEntitys.FirstOrDefault(a => a.Content == input.Content);
+ if (contents != null)
+ {
+ throw new BusinessException(message: "该子系统下轨迹内容已存在");
+ }
+
+ var contentEns = trackContentEntitys.FirstOrDefault(a => a.EnContent == input.EnContent);
+ if (contentEns != null)
+ {
+ throw new BusinessException(message: "该子系统下轨迹内容英文已存在");
+ }
+ }
+
+ #endregion 业务逻辑校验
+
+ //更新的时候需要覆盖内容映射轨迹代码
+ var templateEntity = await _trackContentRepository.GetFirstAsync(a => a.Id == input.Id);
+
+ bool isTrue;
+
+ using (var ts = TransactionScopeHelper.Create())
+ {
+ // 如果轨迹内容的子系统和code发生变化，同步到轨迹映射表
+ if (templateEntity.SubSystemId != input.SubSystemId || templateEntity.Code != input.Code)
+ {
+ await _trackContentRepository.UpdateMapAsync(x => new TrackContentMapEntity
{
- throw new BusinessException(message: "该子系统下轨迹代码已存在");
- }
- var contents = trackContentEntitys.FirstOrDefault(a => a.Content == input.Content);
- if (contents != null)
+ SubSystemId = input.SubSystemId,
+ TrackContentCode = input.Code
+ }, x => x.TrackContentId == input.Id);
+
+ await _trackContentRepository.UpdateMapAsync(x => new TrackContentMapEntity
{
- throw new BusinessException(message: "该子系统下轨迹内容已存在");
- }
- var contentEns = trackContentEntitys.FirstOrDefault(a => a.EnContent == input.EnContent);
- if (contentEns != null)
- {
- throw new BusinessException(message: "该子系统下轨迹内容英文已存在");
- }
+ MapSubSystemId = input.SubSystemId,
+ MapTrackContentCode = input.Code
+ }, x => x.MapTrackContentId == input.Id);
}
- #endregion 业务逻辑校验
+ ObjectMapper.Map(input, templateEntity);
- //更新的时候需要覆盖内容映射轨迹代码
- var templateEntity = await _trackContentRepository.GetFirstAsync(a => a.Id == input.Id);
+ isTrue = await _trackContentRepository.UpdateAsync(templateEntity);
- bool isTrue = false;
-
- using (var ts = TransactionScopeHelper.Create())
- {
- // 如果轨迹内容的子系统和code发生变化，同步到轨迹映射表
- if (templateEntity.SubSystemId != input.SubSystemId || templateEntity.Code != input.Code)
- {
- await _trackContentRepository.UpdateMapAsync(x => new TrackContentMapEntity
- {
- SubSystemId = input.SubSystemId,
- TrackContentCode = input.Code
- }, x => x.TrackContentId == input.Id);
-
- await _trackContentRepository.UpdateMapAsync(x => new TrackContentMapEntity
- {
- MapSubSystemId = input.SubSystemId,
- MapTrackContentCode = input.Code
- }, x => x.MapTrackContentId == input.Id);
- }
-
- ObjectMapper.Map(input, templateEntity);
-
- isTrue = await _trackContentRepository.UpdateAsync(templateEntity);
-
- ts.Complete();
- }
-
- return new UnifyResultDto("200", "修改成功", isTrue);
+ ts.Complete();
}
- private async Task DeleteAsync(EditTrackContentInput input)
+ return new UnifyResultDto("200", "修改成功", isTrue);
+ }
+
+ private async Task DeleteAsync(EditTrackContentInput input)
+ {
+ #region 业务校验
+
+ //查询是否关联了轨迹模版内容
+ var isExistTemplate = await _trackContentRepository.GetTemplateIsExist(input.Id);
+ if (isExistTemplate)
{
- #region 业务校验
- //查询是否关联了轨迹模版内容
- var isExistTemplate = await _trackContentRepository.GetTemplateIsExist(input.Id);
- if (isExistTemplate)
- {
- throw new BusinessException(message: "该轨迹内容关联轨迹模板，禁止删除");
- }
- //var trackTemplateContents = await _trackTemplateContentBasicQuery.GetListAsync(a => a.TrackContentId == input.Id);
- //if (trackTemplateContents.Any())
- //{
- // throw new BusinessException(message: "该轨迹内容关联轨迹模板，禁止删除");
- //}
-
- //需要加个判断，存在内容映射，则出提示
- //var trackContentMapEntities = await _trackContentMapBasicQuery.GetListAsync(a => a.TrackContentId == input.Id || a.MapTrackContentId == input.Id);
- //if (trackContentMapEntities.Any())
- //{
- // throw new BusinessException(message: "无法删除该内容，该轨迹内容已在轨迹内容映射中使用了,请检查");
- //}
- #endregion 业务校验
-
- var isTrue = await _trackContentRepository.SoftDeleteAsync(x => x.Id == input.Id);
-
- return new UnifyResultDto("200", "删除成功", isTrue);
+ throw new BusinessException(message: "该轨迹内容关联轨迹模板，禁止删除");
}
+ //var trackTemplateContents = await _trackTemplateContentBasicQuery.GetListAsync(a => a.TrackContentId == input.Id);
+ //if (trackTemplateContents.Any())
+ //{
+ // throw new BusinessException(message: "该轨迹内容关联轨迹模板，禁止删除");
+ //}
- #endregion 私有方法
+ //需要加个判断，存在内容映射，则出提示
+ //var trackContentMapEntities = await _trackContentMapBasicQuery.GetListAsync(a => a.TrackContentId == input.Id || a.MapTrackContentId == input.Id);
+ //if (trackContentMapEntities.Any())
+ //{
+ // throw new BusinessException(message: "无法删除该内容，该轨迹内容已在轨迹内容映射中使用了,请检查");
+ //}
- ///
- /// 轨迹内容映射列表
- ///
- ///
- ///
- [HttpPost("GetMapPage")]
- public async Task> GetMapPageAsync([FromBody] GetTrackContentMapPageInputVO input)
+ #endregion 业务校验
+
+ var isTrue = await _trackContentRepository.SoftDeleteAsync(x => x.Id == input.Id);
+
+ return new UnifyResultDto("200", "删除成功", isTrue);
+ }
+
+ #endregion 私有方法
+
+ ///
+ /// 轨迹内容映射列表
+ ///
+ ///
+ ///
+ [HttpPost("GetMapPage")]
+ public async Task> GetMapPageAsync(
+ [FromBody] GetTrackContentMapPageInputVO input)
+ {
+ return await _trackContentRepository.GetMapPageAsync(input);
+ }
+
+ ///
+ /// 轨迹内容映射详情
+ ///
+ ///
+ ///
+ [HttpGet("GetMapDetail")]
+ public async Task GetMapDetailAsync(int id)
+ {
+ return await _trackContentRepository.GetMapDetailAsync(id);
+ }
+
+ ///
+ /// 轨迹内容映射编辑
+ ///
+ ///
+ ///
+ [HttpPost("EditMap")]
+ public async Task EditMapAsync([FromBody] EditTrackContentMapInput input)
+ {
+ if (input.Options != OptionTypeNoNull.删除)
{
- return await _trackContentRepository.GetMapPageAsync(input);
+ if (input.SubSystemId == input.MapSubSystemId)
+ throw new BusinessException(message: _stringLocalizer["NotAllowedToMapSubSystem"]);
+
+ Expression> isMapAnyExp = x =>
+ x.TrackContentId == input.TrackContentId && x.MapTrackContentId == input.MapTrackContentId;
+ if (input.Options == OptionTypeNoNull.修改) isMapAnyExp.And(x => x.Id != input.Id);
+
+ if (await _trackContentRepository.IsMapAnyAsync(isMapAnyExp))
+ throw new BusinessException(message: _stringLocalizer["IsTrackContentMapAny"]);
}
- ///
- /// 轨迹内容映射详情
- ///
- ///
- ///
- [HttpGet("GetMapDetail")]
- public async Task GetMapDetailAsync(int id)
+ switch (input.Options)
{
- return await _trackContentRepository.GetMapDetailAsync(id);
+ case OptionTypeNoNull.新增:
+ {
+ var trackContentMapEntity = ObjectMapper.Map(input);
+
+ await _trackContentRepository.InsertMapAsync(trackContentMapEntity);
+ }
+ break;
+
+ case OptionTypeNoNull.修改:
+ {
+ var oldTrackContentMapEntity = await _trackContentRepository.GetMapByIdAsync(input.Id!.Value) ??
+ throw new BusinessException(message: _stringLocalizer["NotFindData"]);
+
+ ObjectMapper.Map(input, oldTrackContentMapEntity);
+
+ await _trackContentRepository.UpdateMapAsync(oldTrackContentMapEntity);
+ }
+ break;
+
+ case OptionTypeNoNull.删除:
+ await _trackContentRepository.SoftDeleteMapAsync(x => x.Id == input.Id);
+ break;
+
+ default:
+ throw new BusinessException(message: _stringLocalizer[SjzyBasicLocalization.Validation_IsInEnum,
+ nameof(EditTrackContentMapInput.Options)]);
}
- ///
- /// 轨迹内容映射编辑
- ///
- ///
- ///
- [HttpPost("EditMap")]
- public async Task EditMapAsync([FromBody] EditTrackContentMapInput input)
- {
- if (input.Options != OptionTypeNoNull.删除)
- {
- if (input.SubSystemId == input.MapSubSystemId) throw new BusinessException(message: _stringLocalizer["NotAllowedToMapSubSystem"]);
-
- Expression> isMapAnyExp = x =>
- x.TrackContentId == input.TrackContentId && x.MapTrackContentId == input.MapTrackContentId;
- if (input.Options == OptionTypeNoNull.修改) isMapAnyExp.And(x => x.Id != input.Id);
-
- if (await _trackContentRepository.IsMapAnyAsync(isMapAnyExp))
- throw new BusinessException(message: _stringLocalizer["IsTrackContentMapAny"]);
- }
-
- switch (input.Options)
- {
- case OptionTypeNoNull.新增:
- {
- var trackContentMapEntity = ObjectMapper.Map(input);
-
- await _trackContentRepository.InsertMapAsync(trackContentMapEntity);
- }
- break;
-
- case OptionTypeNoNull.修改:
- {
- var oldTrackContentMapEntity = await _trackContentRepository.GetMapByIdAsync(input.Id!.Value) ?? throw new BusinessException(message: _stringLocalizer["NotFindData"]);
-
- ObjectMapper.Map(input, oldTrackContentMapEntity);
-
- await _trackContentRepository.UpdateMapAsync(oldTrackContentMapEntity);
- }
- break;
-
- case OptionTypeNoNull.删除:
- await _trackContentRepository.SoftDeleteMapAsync(x => x.Id == input.Id);
- break;
-
- default:
- throw new BusinessException(message: _stringLocalizer[SjzyBasicLocalization.Validation_IsInEnum,
- nameof(EditTrackContentMapInput.Options)]);
- }
-
- return true;
- }
+ return true;
}
}
\ No newline at end of file
diff --git a/src/SJZY.Track.Application/Services/TrackPull/TrackPullService.cs b/src/SJZY.Track.Application/Services/TrackPull/TrackPullService.cs
index af00b7c6..d23937e9 100644
--- a/src/SJZY.Track.Application/Services/TrackPull/TrackPullService.cs
+++ b/src/SJZY.Track.Application/Services/TrackPull/TrackPullService.cs
@@ -152,6 +152,7 @@ public class TrackPullService : ApplicationService
x.PullOrPushConfigId == input.Id && !x.IsPush);
await _trackPullConfigRepository.SoftDeleteContentAsync(x => x.TrackPullConfigId == input.Id);
+ await _trackPullCacheService.SetPullConfigAsync(input.Id);
ts.Complete();
}
@@ -182,19 +183,19 @@ public class TrackPullService : ApplicationService
if (await _trackPullConfigRepository.IsContentAnyAsync(isContentAnyExp.And(x =>
x.TrackContentId == input.TrackContentId)))
throw new BusinessException(message: _stringLocalizer["IsTrackPullContentAny"]);
- else if (!input.TrackContentCodeValue.IsNullOrWhiteSpace() &&
- await _trackPullConfigRepository.IsContentAnyAsync(isContentAnyExp.And(x =>
- x.TrackContentCodeValue == input.TrackContentCodeValue)))
+ if (!input.TrackContentCodeValue.IsNullOrWhiteSpace() &&
+ await _trackPullConfigRepository.IsContentAnyAsync(isContentAnyExp.And(x =>
+ x.TrackContentCodeValue == input.TrackContentCodeValue)))
throw new BusinessException(message: _stringLocalizer["IsTrackPullContentCodeValueAny"]);
- else if (!input.TrackStatusValue.IsNullOrWhiteSpace() &&
- await _trackPullConfigRepository.IsContentAnyAsync(isContentAnyExp.And(x =>
- x.TrackStatusValue == input.TrackStatusValue)))
+ if (!input.TrackStatusValue.IsNullOrWhiteSpace() &&
+ await _trackPullConfigRepository.IsContentAnyAsync(isContentAnyExp.And(x =>
+ x.TrackStatusValue == input.TrackStatusValue)))
throw new BusinessException(message: _stringLocalizer["IsTrackPullContentStatusValueAny"]);
- else if (!input.TrackContentValue.IsNullOrWhiteSpace() &&
- await _trackPullConfigRepository.IsContentAnyAsync(isContentAnyExp.And(x =>
- x.TrackContentValue == input.TrackContentValue)))
+ if (!input.TrackContentValue.IsNullOrWhiteSpace() &&
+ await _trackPullConfigRepository.IsContentAnyAsync(isContentAnyExp.And(x =>
+ x.TrackContentValue == input.TrackContentValue)))
throw new BusinessException(message: _stringLocalizer["IsTrackPullContentValueAny"]);
- else if (!input.TrackKeywords.IsNullOrEmpty())
+ if (!input.TrackKeywords.IsNullOrEmpty())
{
Expression> trackKeywordExp = _ => false;
input.TrackKeywords!.ForEach(item =>
diff --git a/src/SJZY.Track.Domain/Dtos/TrackContents/GetPageTrackContentVO.cs b/src/SJZY.Track.Domain/Dtos/TrackContents/GetPageTrackContentVO.cs
index 4fff79ed..aa506d9e 100644
--- a/src/SJZY.Track.Domain/Dtos/TrackContents/GetPageTrackContentVO.cs
+++ b/src/SJZY.Track.Domain/Dtos/TrackContents/GetPageTrackContentVO.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SJZY.Track.Domain.Dtos.TrackContents
+namespace SJZY.Track.Domain.Dtos.TrackContents
{
public class GetPageTrackContentVO : PageInfoInput
{
@@ -90,10 +84,5 @@ namespace SJZY.Track.Domain.Dtos.TrackContents
/// 修改人
///
public string UpdateUser { get; set; }
-
- ///
- /// 是否完结
- ///
- public bool IsFinish { get; set; }
}
-}
+}
\ No newline at end of file
diff --git a/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentDetailVO.cs b/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentDetailVO.cs
index eb5a22b9..19113d90 100644
--- a/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentDetailVO.cs
+++ b/src/SJZY.Track.Domain/Dtos/TrackContents/GetTrackContentDetailVO.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SJZY.Track.Domain.Dtos.TrackContents
+namespace SJZY.Track.Domain.Dtos.TrackContents
{
public class GetTrackContentDetailVO
{
@@ -57,10 +51,5 @@ namespace SJZY.Track.Domain.Dtos.TrackContents
/// 轨迹标记
///
public string TrackFlag { get; set; }
-
- ///
- /// 是否完结
- ///
- public bool IsFinish { get; set; }
}
-}
+}
\ No newline at end of file