From f2333318a31e92f6cbc3a572d8eb9fae9da0f892 Mon Sep 17 00:00:00 2001 From: lixiaojun <1287241240@qq.com> Date: 星期六, 12 十月 2024 13:59:15 +0800 Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0 --- Application/HStation.Application.Assets.Core/01-ProjectProduct/PumpPropContent_Controller.cs | 60 ++++++++++++++++++++++++++++++------------------------------ 1 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Application/HStation.Application.Assets.Core/01-ProjectProduct/PumpPropContent_Controller.cs b/Application/HStation.Application.Assets.Core/01-ProjectProduct/PumpPropContent_Controller.cs index 176de7c..443031e 100644 --- a/Application/HStation.Application.Assets.Core/01-ProjectProduct/PumpPropContent_Controller.cs +++ b/Application/HStation.Application.Assets.Core/01-ProjectProduct/PumpPropContent_Controller.cs @@ -3,13 +3,13 @@ namespace HStation.Application { /// <summary> - /// PumpSeries + /// AssetsPumpSeries /// </summary> - [Route("Assets/PumpPropContent")] - [ApiDescriptionSettings("Assets", Name = "PumpPropContent", Order = 500000)] - public class PumpPropContent_Controller : IDynamicApiController + [Route("Assets/AssetsPumpPropContent")] + [ApiDescriptionSettings("Assets", Name = "AssetsPumpPropContent", Order = 500000)] + public class AssetsPumpPropContent_Controller : IDynamicApiController { - private readonly HStation.Service.PumpPropContent _service = new(); + private readonly HStation.Service.AssetsPumpPropContent _service = new(); #region Query @@ -18,10 +18,10 @@ /// </summary> [Route("GetAll@V1.0")] [HttpGet] - public List<PumpPropContentDto> GetAll() + public List<AssetsPumpPropContentDto> GetAll() { var list = _service.GetAll(); - var vm_list = list?.Select(x => new PumpPropContentDto(x)).ToList(); + var vm_list = list?.Select(x => new AssetsPumpPropContentDto(x)).ToList(); return vm_list; } @@ -30,10 +30,10 @@ /// </summary> [Route("GetByID@V1.0")] [HttpGet] - public PumpPropContentDto GetByID([FromQuery][Required] IDInput input) + public AssetsPumpPropContentDto GetByID([FromQuery][Required] IDInput input) { var model = _service.GetByID(input.ID); - return model == null ? null : new PumpPropContentDto(model); + return model == null ? null : new AssetsPumpPropContentDto(model); } /// <summary> @@ -41,25 +41,25 @@ /// </summary> [Route("GetByIds@V1.0")] [HttpGet] - public List<PumpPropContentDto> GetByIds([FromQuery][Required] IdsInput input) + public List<AssetsPumpPropContentDto> GetByIds([FromQuery][Required] IdsInput input) { var ids = LongListHelper.ToList(input.Ids); var list = _service.GetByIds(ids); - var vm_list = list?.Select(x => new PumpPropContentDto(x)).ToList(); + var vm_list = list?.Select(x => new AssetsPumpPropContentDto(x)).ToList(); return vm_list; } - /// <summary> - /// 閫氳繃浜у搧ID 鑾峰彇 - /// </summary> - [Route("GetByPumpPartID@V1.0")] - [HttpGet] - public List<PumpPropContentDto> GetByPumpPartID(long pumpPartId) - { - var list = _service.GetByPartID(pumpPartId); - var vm_list = list?.Select(x => new PumpPropContentDto(x)).ToList(); - return vm_list; - } + /* /// <summary> + /// 閫氳繃浜у搧ID 鑾峰彇 + /// </summary> + [Route("GetByPumpPartID@V1.0")] + [HttpGet] + public List<AssetsPumpPropContentDto> GetByPumpPartID(long pumpPartId) + { + var list = _service.GetByPartID(pumpPartId); + var vm_list = list?.Select(x => new AssetsPumpPropContentDto(x)).ToList(); + return vm_list; + }*/ #endregion Query @@ -70,9 +70,9 @@ /// </summary> [Route("Insert@V1.0")] [HttpPost] - public long Insert(AddPumpPropContentInput input) + public long Insert(AddAssetsPumpPropContentInput input) { - var model = input.Adapt<AddPumpPropContentInput, Model.PumpPropContent>(); + var model = input.Adapt<AddAssetsPumpPropContentInput, Model.AssetsPumpPropContent>(); var id = _service.Insert(model); return id; } @@ -82,9 +82,9 @@ /// </summary> [Route("Inserts@V1.0")] [HttpPost] - public bool Inserts(List<AddPumpPropContentInput> inputList) + public bool Inserts(List<AddAssetsPumpPropContentInput> inputList) { - var list = inputList.Select(x => x.Adapt<AddPumpPropContentInput, Model.PumpPropContent>()).ToList(); + var list = inputList.Select(x => x.Adapt<AddAssetsPumpPropContentInput, Model.AssetsPumpPropContent>()).ToList(); var bol = _service.Inserts(list); return bol; } @@ -98,7 +98,7 @@ /// </summary> [Route("Update@V1.0")] [HttpPut] - public bool Update([Required] UpdatePumpPropContentInput input) + public bool Update([Required] UpdateAssetsPumpPropContentInput input) { var model = _service.GetByID(input.ID); if (model == null) @@ -106,7 +106,7 @@ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{input.ID} 鏁版嵁涓嶅瓨鍦�"); } - var rhs = new Model.PumpPropContent(model); + var rhs = new Model.AssetsPumpPropContent(model); input.Adapt(rhs); var bol = _service.Update(rhs); return bol; @@ -117,13 +117,13 @@ /// </summary> [Route("Updates@V1.0")] [HttpPut] - public bool Updates([Required] List<UpdatePumpPropContentInput> inputList) + public bool Updates([Required] List<UpdateAssetsPumpPropContentInput> inputList) { if (inputList == null || inputList.Count < 1) { return false; } - var list = inputList.Select(x => x.Adapt<UpdatePumpPropContentInput, Model.PumpPropContent>()).ToList(); + var list = inputList.Select(x => x.Adapt<UpdateAssetsPumpPropContentInput, Model.AssetsPumpPropContent>()).ToList(); var bol = _service.Updates(list); return bol; } -- Gitblit v1.9.3