处理冲突

lixiaojun

2024-10-12 a8ccc992964272f6a74631e8c164e8c91e5cb6d4

 BLL/HStation.BLL.Assets.Core/03-localclient/03-ValveManage/ValveSeries.cs

@@ -5,21 +5,21 @@
    /// <summary>
    /// 报警等级
    /// </summary>
    public class ValveSeries : IValveSeries
    public class AssetsValveSeries : IAssetsValveSeries
    {
        private readonly HStation.Service.ValveSeries _service = new();
        private readonly HStation.Service.AssetsValveSeries _service = new();

        #region Query

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

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

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