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/PumpType.cs

@@ -5,21 +5,21 @@
    /// <summary>
    /// 报警等级
    /// </summary>
    public class PumpType : IPumpType
    public class AssetsPumpType : IAssetsPumpType
    {
        private readonly HStation.Service.PumpType _service = new();
        private readonly HStation.Service.AssetsPumpType _service = new();

        #region Query

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

        /// <summary>
        /// 通过 Ids 获取
        /// </summary>
        public async Task<List<PumpTypeDto>> GetByIds(List<long> Ids)
        public async Task<List<AssetsPumpTypeDto>> GetByIds(List<long> Ids)
        {
            return await Task.Factory.StartNew(() =>
            {
                var list = _service.GetByIds(Ids);
                var vm_list = list?.Select(x => new PumpTypeDto(x)).ToList();
                var vm_list = list?.Select(x => new AssetsPumpTypeDto(x)).ToList();
                return vm_list;
            });
        }
@@ -56,11 +56,11 @@
        /// <summary>
        /// 插入一条
        /// </summary>
        public async Task<long> Insert(AddPumpTypeInput input)
        public async Task<long> Insert(AddAssetsPumpTypeInput input)
        {
            return await Task.Factory.StartNew(() =>
            {
                var model = input.Adapt<AddPumpTypeInput, Model.PumpType>();
                var model = input.Adapt<AddAssetsPumpTypeInput, Model.AssetsPumpType>();
                model.SortCode = _service.GetMaxSortCode() + 1;
                var id = _service.Insert(model);
                return id;
@@ -70,11 +70,11 @@
        /// <summary>
        /// 批量插入
        /// </summary>
        public async Task<bool> Inserts(List<AddPumpTypeInput> inputList)
        public async Task<bool> Inserts(List<AddAssetsPumpTypeInput> inputList)
        {
            return await Task.Factory.StartNew(() =>
            {
                var list = inputList.Select(x => x.Adapt<AddPumpTypeInput, Model.PumpType>()).ToList();
                var list = inputList.Select(x => x.Adapt<AddAssetsPumpTypeInput, Model.AssetsPumpType>()).ToList();
                list.ForEach(x =>
                {
                    x.SortCode = _service.GetMaxSortCode() + 1 + list.IndexOf(x);
@@ -87,7 +87,7 @@
        /// <summary>
        /// 大批量插入
        /// </summary>
        public async Task<bool> BulkInserts(List<AddPumpTypeInput> list)
        public async Task<bool> BulkInserts(List<AddAssetsPumpTypeInput> list)
        {
            return await Task.Factory.StartNew(() =>
            {
@@ -102,7 +102,7 @@
        /// <summary>
        /// 更新一条
        /// </summary>
        public async Task<bool> Update(UpdatePumpTypeInput input)
        public async Task<bool> Update(UpdateAssetsPumpTypeInput input)
        {
            return await Task.Factory.StartNew(() =>
            {
@@ -112,7 +112,7 @@
                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{input.ID} 数据不存在");
                }

                var rhs = new Model.PumpType(model);
                var rhs = new Model.AssetsPumpType(model);
                input.Adapt(rhs);
                var bol = _service.Update(rhs);
                return bol;
@@ -122,7 +122,7 @@
        /// <summary>
        /// 批量更新
        /// </summary>
        public async Task<bool> Updates(List<UpdatePumpTypeInput> inputList)
        public async Task<bool> Updates(List<UpdateAssetsPumpTypeInput> inputList)
        {
            return await Task.Factory.StartNew(() =>
            {
@@ -130,7 +130,7 @@
                {
                    return false;
                }
                var list = inputList.Select(x => x.Adapt<UpdatePumpTypeInput, Model.PumpType>()).ToList();
                var list = inputList.Select(x => x.Adapt<UpdateAssetsPumpTypeInput, Model.AssetsPumpType>()).ToList();
                var bol = _service.Updates(list);
                return bol;
            });
@@ -139,7 +139,7 @@
        /// <summary>
        /// 大批量更新
        /// </summary>
        public async Task<bool> BulkUpdates(List<UpdatePumpTypeInput> list)
        public async Task<bool> BulkUpdates(List<UpdateAssetsPumpTypeInput> list)
        {
            return await Task.Factory.StartNew(() =>
            {