From 0e54c48e8190937f5b483c79e3cc9d17ec7c9af0 Mon Sep 17 00:00:00 2001 From: duheng <2784771470@qq.com> Date: 星期五, 27 九月 2024 15:45:37 +0800 Subject: [PATCH] 提交自动匹配界面优化 --- Application/HStation.Application.Assets.Core/01-ProjectProduct/PumpSeries_Controller.cs | 55 +++++++++++++++++++++++++++++++++---------------------- 1 files changed, 33 insertions(+), 22 deletions(-) diff --git a/Application/HStation.Application.Assets.Core/01-ProjectProduct/PumpSeries_Controller.cs b/Application/HStation.Application.Assets.Core/01-ProjectProduct/PumpSeries_Controller.cs index ffe1ff0..07c5990 100644 --- a/Application/HStation.Application.Assets.Core/01-ProjectProduct/PumpSeries_Controller.cs +++ b/Application/HStation.Application.Assets.Core/01-ProjectProduct/PumpSeries_Controller.cs @@ -6,7 +6,7 @@ /// PumpSeries /// </summary> [Route("Assets/PumpSeries")] - [ApiDescriptionSettings("Assets", Name = "璧勪骇", Order = 100000)] + [ApiDescriptionSettings("Assets", Name = "PumpSeries", Order = 400000)] public class PumpSeries_Controller : IDynamicApiController { private readonly Service.PumpSeries _service = new(); @@ -58,9 +58,9 @@ /// </summary> [Route("Insert@V1.0")] [HttpPost] - public long Insert(AddPumpSeriesDto input) + public long Insert(AddPumpSeriesInput input) { - var model = input.Adapt<AddPumpSeriesDto, Model.PumpSeries>(); + var model = input.Adapt<AddPumpSeriesInput, Model.PumpSeries>(); model.SortCode = _service.GetMaxSortCode() + 1; var id = _service.Insert(model); return id; @@ -71,9 +71,9 @@ /// </summary> [Route("Inserts@V1.0")] [HttpPost] - public bool Inserts(List<AddPumpSeriesDto> inputList) + public bool Inserts(List<AddPumpSeriesInput> inputList) { - var list = inputList.Select(x => x.Adapt<AddPumpSeriesDto, Model.PumpSeries>()).ToList(); + var list = inputList.Select(x => x.Adapt<AddPumpSeriesInput, Model.PumpSeries>()).ToList(); list.ForEach(x => { x.SortCode = _service.GetMaxSortCode() + 1 + list.IndexOf(x); @@ -91,7 +91,7 @@ /// </summary> [Route("Update@V1.0")] [HttpPut] - public bool Update(UpdatePumpSeriesDto input) + public bool Update([Required] UpdatePumpSeriesInput input) { var model = _service.GetByID(input.ID); if (model == null) @@ -110,13 +110,13 @@ /// </summary> [Route("Updates@V1.0")] [HttpPut] - public bool Updates(List<UpdatePumpSeriesDto> inputList) + public bool Updates([Required] List<UpdatePumpSeriesInput> inputList) { if (inputList == null || inputList.Count < 1) { return false; } - var list = inputList.Select(x => x.Adapt<UpdatePumpSeriesDto, Model.PumpSeries>()).ToList(); + var list = inputList.Select(x => x.Adapt<UpdatePumpSeriesInput, Model.PumpSeries>()).ToList(); var bol = _service.Updates(list); return bol; } @@ -126,9 +126,9 @@ /// </summary> [Route("UpdateSortCode@V1.0")] [HttpPut] - public bool UpdateSortCode(long ID, int SortCode) + public bool UpdateSortCode([Required] UpdateSortCodeInput input) { - var bol = _service.UpdateSortCode(ID, SortCode); + var bol = _service.UpdateSortCode(input.ID, input.SortCode); return bol; } @@ -137,8 +137,12 @@ /// </summary> [Route("UpdateSorter@V1.0")] [HttpPut] - public bool UpdateSorter(List<UpdateSortCodeInput> inputList) + public bool UpdateSorter([Required] List<UpdateSortCodeInput> inputList) { + if (inputList == null || inputList.Count < 1) + { + return false; + } var list = inputList.Select(x => x.Adapt<Yw.Model.Sorter>()).ToList(); var bol = _service.UpdateSorter(list); return bol; @@ -149,9 +153,9 @@ /// </summary> [Route("UpdateParas@V1.0")] [HttpPut] - public bool UpdateParas(long ID, Dictionary<string, string> Paras) + public bool UpdateParas([Required] UpdateParasInput input) { - var bol = _service.UpdateParas(ID, Paras); + var bol = _service.UpdateParas(input.ID, input.Paras); return bol; } @@ -160,20 +164,27 @@ /// </summary> [Route("UpdateFlags@V1.0")] [HttpPut] - public bool UpdateFlags(long ID, List<string> Flags) + public bool UpdateFlags([Required] UpdateFlagsInput input) { - var bol = _service.UpdateFlags(ID, Flags); + var bol = _service.UpdateFlags(input.ID, input.Flags); return bol; } /// <summary> - /// 鏇存柊 TagName + /// 鏇存柊TagName /// </summary> [Route("UpdateTagName@V1.0")] [HttpPut] - public bool UpdateTagName(long ID, string TagName) + public bool UpdateTagName([Required] UpdateTagNameInput input) { - var bol = _service.UpdateTagName(ID, TagName); + if (!string.IsNullOrEmpty(input.TagName)) + { + if (_service.IsExistTagNameExceptID(input.TagName, input.ID)) + { + throw Oops.Oh(InternalErrorCodes.V001, $"TagName:{input.TagName}", "鏍囪鍚嶇О宸插瓨鍦�"); + } + } + var bol = _service.UpdateTagName(input.ID, input.TagName); return bol; } @@ -182,9 +193,9 @@ /// </summary> [Route("UpdateUseStatus@V1.0")] [HttpPut] - public bool UpdateUseStatus(long ID, int UseStatus) + public bool UpdateUseStatus([Required] UpdateUseStatusInput input) { - var bol = _service.UpdateUseStatus(ID, (Yw.Model.eUseStatus)UseStatus); + var bol = _service.UpdateUseStatus(input.ID, (Yw.Model.eUseStatus)input.UseStatus); return bol; } @@ -197,9 +208,9 @@ /// </summary> [Route("DeleteByID@V1.0")] [HttpDelete] - public bool DeleteByID(long ID) + public bool DeleteByID([FromQuery][Required] IDInput input) { - var bol = _service.DeleteByID(ID, out string msg); + var bol = _service.DeleteByID(input.ID, out string msg); if (!bol) { throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D999, msg); -- Gitblit v1.9.3