ideship/track
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'S01-轨迹中台' into dev

Browse Source
This commit is contained in:
moyongzhen 2024-03-02 09:59:33 +08:00
commit c8afebe635
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/SJZY.Track.Application/Services/TrackStatus/TrackStatusService.cs
View File

@ -87,13 +87,13 @@ public class TrackStatusService : ApplicationService, ITransientDependency
{
#region 业务校验
var trackStatusEntity = await _trackStatusRepository.GetFirstAsync(a => a.SubSystemId == input.SubSystemId &&
var trackStatusEntitys = await _trackStatusRepository.GetListAsync(a => a.SubSystemId == input.SubSystemId &&
(a.Code == input.Code ||
a.Status == input.TrackStatus || a.EnStatus == input.EntrackStatus));
if (trackStatusEntity != null)
if (trackStatusEntitys.Any())
{
//throw new BusinessException(message: _stringLocalizer["TrackStatusExist"]);
throw new BusinessException("当前子系统下，轨迹状态代码或轨迹状态或轨迹状态英文存在");
throw new BusinessException(message: "当前子系统下，轨迹状态代码或轨迹状态或轨迹状态英文存在");
}
#endregion
@ -108,13 +108,13 @@ public class TrackStatusService : ApplicationService, ITransientDependency
{
#region 业务校验
var trackStatusEntity = await _trackStatusRepository.GetFirstAsync(a => a.Id != input.Id &&
var trackStatusEntitys = await _trackStatusRepository.GetListAsync(a => a.Id != input.Id &&
a.SubSystemId == input.SubSystemId && (a.Code == input.Code ||
a.Status == input.TrackStatus || a.EnStatus == input.EntrackStatus));
if (trackStatusEntity != null)
if (trackStatusEntitys.Any())
{
//throw new BusinessException(message: _stringLocalizer["TrackStatusExist"]);
throw new BusinessException("当前子系统下，轨迹状态代码或轨迹状态或轨迹状态英文存在");
throw new BusinessException(message: "当前子系统下，轨迹状态代码或轨迹状态或轨迹状态英文存在");
}
#endregion
@ -133,7 +133,7 @@ public class TrackStatusService : ApplicationService, ITransientDependency
if (isExistStatus!=null)
{
//throw new BusinessException(message: _stringLocalizer["IsExistTrackStatus"]);
throw new BusinessException("轨迹内容已经绑定了该轨迹状态，请先删除轨迹内容后再删除该轨迹状态");
throw new BusinessException(message: "轨迹内容已经绑定了该轨迹状态，请先删除轨迹内容后再删除该轨迹状态");
}
#endregion
var isTrue = await _trackStatusRepository.SoftDeleteAsync(x => x.Id == input.Id);

8
src/SJZY.Track.Application/Services/TrackTemplates/TrackTemplateService.cs
View File

@ -101,7 +101,7 @@ public class TrackTemplateService : ApplicationService, ITransientDependency
if (templateEntity != null)
{
//throw new BusinessException(message: _stringLocalizer["TemplateExist"]);
throw new BusinessException("模板代码已存在于当前选择的子系统下");
throw new BusinessException(message: "模板代码已存在于当前选择的子系统下");
}
#endregion 业务校验
@ -120,7 +120,7 @@ public class TrackTemplateService : ApplicationService, ITransientDependency
a.Id != input.Id && a.SubSystemId == input.SubSystemId && a.Code == input.Code);
if (isExist != null)
{
throw new BusinessException(message: _stringLocalizer["模板代码已存在于当前选择的子系统下"]);
throw new BusinessException(message: "模板代码已存在于当前选择的子系统下");
}
#endregion 业务校验
@ -141,13 +141,13 @@ public class TrackTemplateService : ApplicationService, ITransientDependency
if (isExisistTrackPullConfigs.Any())
{
//throw new BusinessException(message: _stringLocalizer["IsExistTrackPullConfig"]);
throw new BusinessException(message: _stringLocalizer["轨迹拉取配置里已经绑定模版，请检查"]);
throw new BusinessException(message: "轨迹拉取配置里已经绑定模版，请检查");
}
//轨迹推送里看看是否被占用
var isExisistTrackPushConfigs = await _trackPushConfigRepository.GetListAsync(a => a.TrackTemplateId.Contains(input.Id.ToString()));
if (isExisistTrackPushConfigs.Any())
{
throw new BusinessException(message: _stringLocalizer["轨迹推送配置里已经绑定模版，请检查"]);
throw new BusinessException(message: "轨迹推送配置里已经绑定模版，请检查");
}
#endregion 业务校验