Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

duheng

2024-09-27 d06e2aa43a5c791058a75aa83ef17f936e2f5c0d

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

@@ -3,10 +3,10 @@
namespace HStation.Application
{
    /// <summary>
    /// PumpSeries
    /// PumpGroup
    /// </summary>
    [Route("Assets/PumpGroup")]
    [ApiDescriptionSettings("Assets", Name = "资产", Order = 90000)]
    [ApiDescriptionSettings("Assets", Name = "PumpGroup", Order = 100000)]
    public class PumpGroup_Controller : IDynamicApiController
    {
        private readonly Service.PumpGroup _service = new();
@@ -30,10 +30,22 @@
        /// </summary>
        [Route("GetByID@V1.0")]
        [HttpGet]
        public PumpGroupDto GetByID(long ID)
        public PumpGroupDto GetByID([FromQuery][Required] IDInput input)
        {
            var model = _service.GetByID(ID);
            var model = _service.GetByID(input.ID);
            return model == null ? null : new PumpGroupDto(model);
        }

        /// <summary>
        /// 通过 SeriesID 获取
        /// </summary>
        [Route("GetBySeriesID@V1.0")]
        [HttpGet]
        public List<PumpGroupDto> GetBySeriesID(long SeriesID)
        {
            var list = _service.GetBySeriesID(SeriesID);
            var vm_list = list?.Select(x => new PumpGroupDto(x)).ToList();
            return vm_list;
        }

        /// <summary>
@@ -41,9 +53,10 @@
        /// </summary>
        [Route("GetByIds@V1.0")]
        [HttpGet]
        public List<PumpGroupDto> GetByIds(List<long> Ids)
        public List<PumpGroupDto> GetByIds([FromQuery][Required] IdsInput input)
        {
            var list = _service.GetByIds(Ids);
            var ids = LongListHelper.ToList(input.Ids);
            var list = _service.GetByIds(ids);
            var vm_list = list?.Select(x => new PumpGroupDto(x)).ToList();
            return vm_list;
        }
@@ -90,7 +103,7 @@
        /// </summary>
        [Route("Update@V1.0")]
        [HttpPut]
        public bool Update(UpdatePumpGroupDto input)
        public bool Update([Required] UpdatePumpGroupDto input)
        {
            var model = _service.GetByID(input.ID);
            if (model == null)
@@ -109,7 +122,7 @@
        /// </summary>
        [Route("Updates@V1.0")]
        [HttpPut]
        public bool Updates(List<UpdatePumpGroupDto> inputList)
        public bool Updates([Required] List<UpdatePumpGroupDto> inputList)
        {
            if (inputList == null || inputList.Count < 1)
            {
@@ -125,9 +138,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;
        }

@@ -136,7 +149,7 @@
        /// </summary>
        [Route("UpdateSorter@V1.0")]
        [HttpPut]
        public bool UpdateSorter(List<UpdateSortCodeInput> inputList)
        public bool UpdateSorter([Required] List<UpdateSortCodeInput> inputList)
        {
            var list = inputList.Select(x => x.Adapt<Yw.Model.Sorter>()).ToList();
            var bol = _service.UpdateSorter(list);
@@ -148,9 +161,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;
        }

@@ -159,20 +172,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
        /// </summary>
        [Route("UpdateFlags@V1.0")]
        [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;
        }

@@ -185,9 +205,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);