修改计算方法

lixiaojun

2024-11-11 0dadc4f3b331ce7db035af47ff0a6dfa3f85a434

 Application/HStation.Application.Assets.Core/01-ProjectProduct/PumpGroupAndMainMap_Controller.cs

@@ -3,13 +3,13 @@
namespace HStation.Application
{
    /// <summary>
    /// PumpSeries
    /// AssetsPumpSeries
    /// </summary>
    [Route("Assets/PumpGroupAndMainMap")]
    [ApiDescriptionSettings("Assets", Name = "资产", Order = 600000)]
    public class PumpGroupAndMainMap_Controller : IDynamicApiController
    [Route("Assets/AssetsPumpGroupAndMainMap")]
    [ApiDescriptionSettings("Assets", Name = "umpGroupAndMainMapping", Order = 800000)]
    public class AssetsPumpGroupAndMainMap_Controller : IDynamicApiController
    {
        private readonly HStation.Service.PumpGroupAndMainMap _service = new();
        private readonly HStation.Service.AssetsPumpGroupAndMainMap _service = new();

        #region Query

@@ -18,10 +18,10 @@
        /// </summary>
        [Route("GetAll@V1.0")]
        [HttpGet]
        public async Task<List<PumpGroupAndMainMapDto>> GetAll()
        public List<AssetsPumpGroupAndMainMapDto> GetAll()
        {
            var list = _service.GetAll();
            var vm_list = list?.Select(x => new PumpGroupAndMainMapDto(x)).ToList();
            var vm_list = list?.Select(x => new AssetsPumpGroupAndMainMapDto(x)).ToList();
            return vm_list;
        }

@@ -30,10 +30,10 @@
        /// </summary>
        [Route("GetByID@V1.0")]
        [HttpGet]
        public PumpGroupAndMainMapDto GetByID(long ID)
        public AssetsPumpGroupAndMainMapDto GetByID([FromQuery][Required] IDInput input)
        {
            var model = _service.GetByID(ID);
            return model == null ? null : new PumpGroupAndMainMapDto(model);
            var model = _service.GetByID(input.ID);
            return model == null ? null : new AssetsPumpGroupAndMainMapDto(model);
        }

        /// <summary>
@@ -43,7 +43,7 @@
        [HttpGet]
        public List<long> GetByGroupID(long ID)
        {
            var model = Service.PumpGroupAndMainMap.GetMainIDByGroupID(ID);
            var model = Service.AssetsPumpGroupAndMainMap.GetMainIDByGroupID(ID);
            return model;
        }

@@ -52,10 +52,11 @@
        /// </summary>
        [Route("GetByIds@V1.0")]
        [HttpGet]
        public List<PumpGroupAndMainMapDto> GetByIds(List<long> Ids)
        public List<AssetsPumpGroupAndMainMapDto> GetByIds([FromQuery][Required] IdsInput input)
        {
            var list = _service.GetByIds(Ids);
            var vm_list = list?.Select(x => new PumpGroupAndMainMapDto(x)).ToList();
            var ids = LongListHelper.ToList(input.Ids);
            var list = _service.GetByIds(ids);
            var vm_list = list?.Select(x => new AssetsPumpGroupAndMainMapDto(x)).ToList();
            return vm_list;
        }

@@ -68,9 +69,9 @@
        /// </summary>
        [Route("Insert@V1.0")]
        [HttpPost]
        public long Insert(AddPumpGroupAndMainMapDto input)
        public long Insert(AddAssetsPumpGroupAndMainMapInput input)
        {
            var model = input.Adapt<AddPumpGroupAndMainMapDto, Model.PumpGroupAndMainMap>();
            var model = input.Adapt<AddAssetsPumpGroupAndMainMapInput, Model.AssetsPumpGroupAndMainMap>();
            var id = _service.Insert(model);
            return id;
        }
@@ -80,9 +81,9 @@
        /// </summary>
        [Route("Inserts@V1.0")]
        [HttpPost]
        public bool Inserts(List<AddPumpGroupAndMainMapDto> inputList)
        public bool Inserts(List<AddAssetsPumpGroupAndMainMapInput> inputList)
        {
            var list = inputList.Select(x => x.Adapt<AddPumpGroupAndMainMapDto, Model.PumpGroupAndMainMap>()).ToList();
            var list = inputList.Select(x => x.Adapt<AddAssetsPumpGroupAndMainMapInput, Model.AssetsPumpGroupAndMainMap>()).ToList();
            var bol = _service.Inserts(list);
            return bol;
        }
@@ -96,7 +97,7 @@
        /// </summary>
        [Route("Update@V1.0")]
        [HttpPut]
        public bool Update(UpdatePumpGroupAndMainMapDto input)
        public bool Update([Required] UpdateAssetsPumpGroupAndMainMapDto input)
        {
            var model = _service.GetByID(input.ID);
            if (model == null)
@@ -104,7 +105,7 @@
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{input.ID} 数据不存在");
            }

            var rhs = new Model.PumpGroupAndMainMap(model);
            var rhs = new Model.AssetsPumpGroupAndMainMap(model);
            input.Adapt(rhs);
            var bol = _service.Update(rhs);
            return bol;
@@ -115,13 +116,13 @@
        /// </summary>
        [Route("Updates@V1.0")]
        [HttpPut]
        public bool Updates(List<UpdatePumpGroupAndMainMapDto> inputList)
        public bool Updates([Required] List<UpdateAssetsPumpGroupAndMainMapDto> inputList)
        {
            if (inputList == null || inputList.Count < 1)
            {
                return false;
            }
            var list = inputList.Select(x => x.Adapt<UpdatePumpGroupAndMainMapDto, Model.PumpGroupAndMainMap>()).ToList();
            var list = inputList.Select(x => x.Adapt<UpdateAssetsPumpGroupAndMainMapDto, Model.AssetsPumpGroupAndMainMap>()).ToList();
            var bol = _service.Updates(list);
            return bol;
        }
@@ -131,9 +132,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;
        }

@@ -142,9 +143,9 @@
        /// </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;
        }

@@ -153,9 +154,16 @@
        /// </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;
        }

@@ -168,9 +176,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);