From f2333318a31e92f6cbc3a572d8eb9fae9da0f892 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 12 十月 2024 13:59:15 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
BLL/HStation.BLL.Assets.Core/03-localclient/01-PumpMainManage/PumpPart.cs | 73 ++++++++++++++++++------------------
1 files changed, 37 insertions(+), 36 deletions(-)
diff --git a/BLL/HStation.BLL.Assets.Core/03-localclient/01-PumpMainManage/PumpPart.cs b/BLL/HStation.BLL.Assets.Core/03-localclient/01-PumpMainManage/PumpPart.cs
index 00e6473..cb961f5 100644
--- a/BLL/HStation.BLL.Assets.Core/03-localclient/01-PumpMainManage/PumpPart.cs
+++ b/BLL/HStation.BLL.Assets.Core/03-localclient/01-PumpMainManage/PumpPart.cs
@@ -5,21 +5,21 @@
/// <summary>
/// 鎶ヨ绛夌骇
/// </summary>
- public class PumpPartMain : IPumpPartMain
+ public class AssetsPumpPartMain : IAssetsPumpPartMain
{
- private readonly HStation.Service.PumpPartMain _service = new();
+ private readonly HStation.Service.AssetsPumpPartMain _service = new();
#region Query
/// <summary>
/// 鑾峰彇鎵�鏈�
/// </summary>
- public async Task<List<PumpPartMainDto>> GetAll()
+ public async Task<List<AssetsPumpPartMainDto>> GetAll()
{
return await Task.Factory.StartNew(() =>
{
var list = _service.GetAll();
- var vm_list = list?.Select(x => new PumpPartMainDto(x)).ToList();
+ var vm_list = list?.Select(x => new AssetsPumpPartMainDto(x)).ToList();
return vm_list;
});
}
@@ -27,24 +27,24 @@
/// <summary>
/// 閫氳繃 ID 鑾峰彇
/// </summary>
- public async Task<PumpPartMainDto> GetByID(long ID)
+ public async Task<AssetsPumpPartMainDto> GetByID(long ID)
{
return await Task.Factory.StartNew(() =>
{
var model = _service.GetByID(ID);
- return model == null ? null : new PumpPartMainDto(model);
+ return model == null ? null : new AssetsPumpPartMainDto(model);
});
}
/// <summary>
/// 閫氳繃 Ids 鑾峰彇
/// </summary>
- public async Task<List<PumpPartMainDto>> GetByIds(List<long> Ids)
+ public async Task<List<AssetsPumpPartMainDto>> GetByIds(List<long> Ids)
{
return await Task.Factory.StartNew(() =>
{
var list = _service.GetByIds(Ids);
- var vm_list = list?.Select(x => new PumpPartMainDto(x)).ToList();
+ var vm_list = list?.Select(x => new AssetsPumpPartMainDto(x)).ToList();
return vm_list;
});
}
@@ -52,12 +52,12 @@
/// <summary>
/// 閫氳繃鍨嬪彿ID 鑾峰彇
/// </summary>
- public async Task<List<PumpPartMainDto>> GetByPumpMainID(long ID)
+ public async Task<List<AssetsPumpPartMainDto>> GetByPumpMainID(long ID)
{
return await Task.Factory.StartNew(() =>
{
var list = _service.GetByMainID(ID);
- var vm_list = list?.Select(x => new PumpPartMainDto(x)).ToList();
+ var vm_list = list?.Select(x => new AssetsPumpPartMainDto(x)).ToList();
return vm_list;
});
}
@@ -69,11 +69,11 @@
/// <summary>
/// 鎻掑叆涓�鏉�
/// </summary>
- public async Task<long> Insert(AddPumpPartMainInput input)
+ public async Task<long> Insert(AddAssetsPumpPartMainInput input)
{
return await Task.Factory.StartNew(() =>
{
- var model = input.Adapt<AddPumpPartMainInput, Model.PumpPartMain>();
+ var model = input.Adapt<AddAssetsPumpPartMainInput, Model.AssetsPumpPartMain>();
model.SortCode = _service.GetMaxSortCode() + 1;
var id = _service.Insert(model);
return id;
@@ -83,11 +83,11 @@
/// <summary>
/// 鎵归噺鎻掑叆
/// </summary>
- public async Task<bool> Inserts(List<AddPumpPartMainInput> inputList)
+ public async Task<bool> Inserts(List<AddAssetsPumpPartMainInput> inputList)
{
return await Task.Factory.StartNew(() =>
{
- var list = inputList.Select(x => x.Adapt<AddPumpPartMainInput, Model.PumpPartMain>()).ToList();
+ var list = inputList.Select(x => x.Adapt<AddAssetsPumpPartMainInput, Model.AssetsPumpPartMain>()).ToList();
list.ForEach(x =>
{
x.SortCode = _service.GetMaxSortCode() + 1 + list.IndexOf(x);
@@ -98,14 +98,14 @@
}
//鎻掑叆鎷撳睍
- public async Task<long> InsertEx(AddPumpPartMainInput part, List<AddPumpPropContentInput> propcontents, AddPumpMainAndPartMapDto partmap)
+ public async Task<long> InsertEx(AddAssetsPumpPartMainInput part, List<AddAssetsPumpPropContentInput> propcontents, AddAssetsPumpMainAndPartMapDto partmap)
{
return await Task.Factory.StartNew(() =>
{
- var partmodel = part.Adapt<AddPumpPartMainInput, Model.PumpPartMain>();
+ var partmodel = part.Adapt<AddAssetsPumpPartMainInput, Model.AssetsPumpPartMain>();
partmodel.SortCode = _service.GetMaxSortCode() + 1;
- var propcontentlistmodel = propcontents.Select(x => x.Adapt<AddPumpPropContentInput, Model.PumpPropContent>()).ToList();
- var partmapmodel = partmap.Adapt<AddPumpMainAndPartMapDto, Model.PumpMainAndPartMap>();
+ var propcontentlistmodel = propcontents.Select(x => x.Adapt<AddAssetsPumpPropContentInput, Model.AssetsPumpPropContent>()).ToList();
+ var partmapmodel = partmap.Adapt<AddAssetsPumpMainAndPartMapDto, Model.AssetsPumpMainAndPartMap>();
var id = _service.InsertEX(partmodel, propcontentlistmodel, partmapmodel);
return id;
});
@@ -114,7 +114,7 @@
/// <summary>
/// 澶ф壒閲忔彃鍏�
/// </summary>
- public async Task<bool> BulkInserts(List<AddPumpPartMainInput> list)
+ public async Task<bool> BulkInserts(List<AddAssetsPumpPartMainInput> list)
{
return await Task.Factory.StartNew(() =>
{
@@ -129,7 +129,7 @@
/// <summary>
/// 鏇存柊涓�鏉�
/// </summary>
- public async Task<bool> Update(UpdatePumpPartMainInput input)
+ public async Task<bool> Update(UpdateAssetsPumpPartMainInput input)
{
return await Task.Factory.StartNew(() =>
{
@@ -139,7 +139,7 @@
throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{input.ID} 鏁版嵁涓嶅瓨鍦�");
}
- var rhs = new Model.PumpPartMain(model);
+ var rhs = new Model.AssetsPumpPartMain(model);
input.Adapt(rhs);
var bol = _service.Update(rhs);
return bol;
@@ -149,7 +149,7 @@
/// <summary>
/// 鎵归噺鏇存柊
/// </summary>
- public async Task<bool> Updates(List<UpdatePumpPartMainInput> inputList)
+ public async Task<bool> Updates(List<UpdateAssetsPumpPartMainInput> inputList)
{
return await Task.Factory.StartNew(() =>
{
@@ -157,7 +157,7 @@
{
return false;
}
- var list = inputList.Select(x => x.Adapt<UpdatePumpPartMainInput, Model.PumpPartMain>()).ToList();
+ var list = inputList.Select(x => x.Adapt<UpdateAssetsPumpPartMainInput, Model.AssetsPumpPartMain>()).ToList();
var bol = _service.Updates(list);
return bol;
});
@@ -166,7 +166,7 @@
/// <summary>
/// 澶ф壒閲忔洿鏂�
/// </summary>
- public async Task<bool> BulkUpdates(List<UpdatePumpPartMainInput> list)
+ public async Task<bool> BulkUpdates(List<UpdateAssetsPumpPartMainInput> list)
{
return await Task.Factory.StartNew(() =>
{
@@ -175,12 +175,12 @@
}
//缂栬緫鎷撳睍
- public async Task<bool> UpdateEx(UpdatePumpPartMainInput pumppart, List<UpdatePumpPropContentInput> updatePumpPropContentDtos)
+ public async Task<bool> UpdateEx(UpdateAssetsPumpPartMainInput pumppart, List<UpdateAssetsPumpPropContentInput> updateAssetsPumpPropContentDtos)
{
return await Task.Factory.StartNew(() =>
{
- var partmodel = pumppart.Adapt<UpdatePumpPartMainInput, Model.PumpPartMain>();
- var propcontentlistmodel = updatePumpPropContentDtos.Select(x => x.Adapt<UpdatePumpPropContentInput, Model.PumpPropContent>()).ToList();
+ var partmodel = pumppart.Adapt<UpdateAssetsPumpPartMainInput, Model.AssetsPumpPartMain>();
+ var propcontentlistmodel = updateAssetsPumpPropContentDtos.Select(x => x.Adapt<UpdateAssetsPumpPropContentInput, Model.AssetsPumpPropContent>()).ToList();
return _service.UpdateEX(partmodel, propcontentlistmodel);
});
}
@@ -243,15 +243,16 @@
public async Task<bool> DeleteEx(long ID)
{
- return await Task.Factory.StartNew(() =>
- {
- var bol = _service.DeleteExByID(ID);
- if (!bol)
- {
- throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D999, "鍒犻櫎澶辫触");
- }
- return true;
- });
+ /* return await Task.Factory.StartNew(() =>
+ {
+ var bol = _service.DeleteExByID(ID);
+ if (!bol)
+ {
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D999, "鍒犻櫎澶辫触");
+ }
+ return true;
+ });*/
+ return false;
}
/// <summary>
--
Gitblit v1.9.3