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

lixiaojun

2024-10-12 f2333318a31e92f6cbc3a572d8eb9fae9da0f892

 BLL/HStation.BLL.Assets.Core/03-localclient/01-PumpMainManage/PumpSeries.cs

@@ -5,21 +5,21 @@
    /// <summary>
    /// 报警等级
    /// </summary>
    public class PumpSeries : IPumpSeries
    public class AssetsPumpSeries : IAssetsPumpSeries
    {
        private readonly HStation.Service.PumpSeries _service = new();
        private readonly HStation.Service.AssetsPumpSeries _service = new();

        #region Query

        /// <summary>
        /// 获取所有
        /// </summary>
        public async Task<List<PumpSeriesDto>> GetAll()
        public async Task<List<AssetsPumpSeriesDto>> GetAll()
        {
            return await Task.Factory.StartNew(() =>
            {
                var list = _service.GetAll();
                var vm_list = list?.Select(x => new PumpSeriesDto(x)).ToList();
                var vm_list = list?.Select(x => new AssetsPumpSeriesDto(x)).ToList();
                return vm_list;
            });
        }
@@ -27,24 +27,24 @@
        /// <summary>
        /// 通过 ID 获取
        /// </summary>
        public async Task<PumpSeriesDto> GetByID(long ID)
        public async Task<AssetsPumpSeriesDto> GetByID(long ID)
        {
            return await Task.Factory.StartNew(() =>
            {
                var model = _service.GetByID(ID);
                return model == null ? null : new PumpSeriesDto(model);
                return model == null ? null : new AssetsPumpSeriesDto(model);
            });
        }

        /// <summary>
        /// 通过 Ids 获取
        /// </summary>
        public async Task<List<PumpSeriesDto>> GetByIds(List<long> Ids)
        public async Task<List<AssetsPumpSeriesDto>> GetByIds(List<long> Ids)
        {
            return await Task.Factory.StartNew(() =>
            {
                var list = _service.GetByIds(Ids);
                var vm_list = list?.Select(x => new PumpSeriesDto(x)).ToList();
                var vm_list = list?.Select(x => new AssetsPumpSeriesDto(x)).ToList();
                return vm_list;
            });
        }
@@ -56,11 +56,11 @@
        /// <summary>
        /// 插入一条
        /// </summary>
        public async Task<long> Insert(AddPumpSeriesInput input)
        public async Task<long> Insert(AddAssetsPumpSeriesInput input)
        {
            return await Task.Factory.StartNew(() =>
            {
                var model = input.Adapt<AddPumpSeriesInput, Model.PumpSeries>();
                var model = input.Adapt<AddAssetsPumpSeriesInput, Model.AssetsPumpSeries>();
                model.SortCode = _service.GetMaxSortCode() + 1;
                var id = _service.Insert(model);
                return id;
@@ -70,11 +70,11 @@
        /// <summary>
        /// 批量插入
        /// </summary>
        public async Task<bool> Inserts(List<AddPumpSeriesInput> inputList)
        public async Task<bool> Inserts(List<AddAssetsPumpSeriesInput> inputList)
        {
            return await Task.Factory.StartNew(() =>
            {
                var list = inputList.Select(x => x.Adapt<AddPumpSeriesInput, 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);
@@ -87,7 +87,7 @@
        /// <summary>
        /// 大批量插入
        /// </summary>
        public async Task<bool> BulkInserts(List<AddPumpSeriesInput> list)
        public async Task<bool> BulkInserts(List<AddAssetsPumpSeriesInput> list)
        {
            return await Task.Factory.StartNew(() =>
            {
@@ -102,7 +102,7 @@
        /// <summary>
        /// 更新一条
        /// </summary>
        public async Task<bool> Update(UpdatePumpSeriesInput input)
        public async Task<bool> Update(UpdateAssetsPumpSeriesInput input)
        {
            return await Task.Factory.StartNew(() =>
            {
@@ -112,7 +112,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;
@@ -122,7 +122,7 @@
        /// <summary>
        /// 批量更新
        /// </summary>
        public async Task<bool> Updates(List<UpdatePumpSeriesInput> inputList)
        public async Task<bool> Updates(List<UpdateAssetsPumpSeriesInput> inputList)
        {
            return await Task.Factory.StartNew(() =>
            {
@@ -130,7 +130,7 @@
                {
                    return false;
                }
                var list = inputList.Select(x => x.Adapt<UpdatePumpSeriesInput, Model.PumpSeries>()).ToList();
                var list = inputList.Select(x => x.Adapt<UpdateAssetsPumpSeriesInput, Model.AssetsPumpSeries>()).ToList();
                var bol = _service.Updates(list);
                return bol;
            });
@@ -139,7 +139,7 @@
        /// <summary>
        /// 大批量更新
        /// </summary>
        public async Task<bool> BulkUpdates(List<UpdatePumpSeriesInput> list)
        public async Task<bool> BulkUpdates(List<UpdateAssetsPumpSeriesInput> list)
        {
            return await Task.Factory.StartNew(() =>
            {