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

cloudflight

2024-12-24 97a43bf839f59cdda1641d61706e6e71a0c5e172

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

@@ -3,13 +3,13 @@
namespace HStation.Application
{
    /// <summary>
    /// PumpSeries
    /// AssetsPumpSeries
    /// </summary>
    [Route("Assets/PumpSeries")]
    [ApiDescriptionSettings("Assets", Name = "资产", Order = 100000)]
    public class PumpSeries_Controller : IDynamicApiController
    [Route("Assets/AssetsPumpSeries")]
    [ApiDescriptionSettings("Assets", Name = "AssetsPumpSeries", Order = 400000)]
    public class AssetsPumpSeries_Controller : IDynamicApiController
    {
        private readonly Service.PumpSeries _service = new();
        private readonly Service.AssetsPumpSeries _service = new();

        #region Query

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

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

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

@@ -58,9 +58,9 @@
        /// </summary>
        [Route("Insert@V1.0")]
        [HttpPost]
        public long Insert(AddPumpSeriesDto input)
        public long Insert(AddAssetsPumpSeriesInput input)
        {
            var model = input.Adapt<AddPumpSeriesDto, Model.PumpSeries>();
            var model = input.Adapt<AddAssetsPumpSeriesInput, Model.AssetsPumpSeries>();
            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<AddAssetsPumpSeriesInput> inputList)
        {
            var list = inputList.Select(x => x.Adapt<AddPumpSeriesDto, Model.PumpSeries>()).ToList();
            var list = inputList.Select(x => x.Adapt<AddAssetsPumpSeriesInput, Model.AssetsPumpSeries>()).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] UpdateAssetsPumpSeriesInput input)
        {
            var model = _service.GetByID(input.ID);
            if (model == null)
@@ -99,7 +99,7 @@
                throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{input.ID} 数据不存在");
            }

            var rhs = new Model.PumpSeries(model);
            var rhs = new Model.AssetsPumpSeries(model);
            input.Adapt(rhs);
            var bol = _service.Update(rhs);
            return bol;
@@ -110,13 +110,13 @@
        /// </summary>
        [Route("Updates@V1.0")]
        [HttpPut]
        public bool Updates(List<UpdatePumpSeriesDto> inputList)
        public bool Updates([Required] List<UpdateAssetsPumpSeriesInput> 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<UpdateAssetsPumpSeriesInput, Model.AssetsPumpSeries>()).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,31 +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);
            return bol;
        }

        /// <summary>
        /// 更新 UseStatus
        /// </summary>
        [Route("UpdateUseStatus@V1.0")]
        [HttpPut]
        public bool UpdateUseStatus(long ID, int UseStatus)
        {
            var bol = _service.UpdateUseStatus(ID, (Yw.Model.eUseStatus)UseStatus);
            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;
        }

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