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/PumpMain.cs | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/BLL/HStation.BLL.Assets.Core/03-localclient/01-PumpMainManage/PumpMain.cs b/BLL/HStation.BLL.Assets.Core/03-localclient/01-PumpMainManage/PumpMain.cs
index ba1a42d..c8a25c7 100644
--- a/BLL/HStation.BLL.Assets.Core/03-localclient/01-PumpMainManage/PumpMain.cs
+++ b/BLL/HStation.BLL.Assets.Core/03-localclient/01-PumpMainManage/PumpMain.cs
@@ -5,21 +5,21 @@
/// <summary>
/// 鎶ヨ绛夌骇
/// </summary>
- public class PumpMain : IPumpMain
+ public class AssetsPumpMain : IAssetsPumpMain
{
- private readonly HStation.Service.PumpMain _service = new();
+ private readonly HStation.Service.AssetsPumpMain _service = new();
#region Query
/// <summary>
/// 鑾峰彇鎵�鏈�
/// </summary>
- public async Task<List<PumpMainDto>> GetAll()
+ public async Task<List<AssetsPumpMainDto>> GetAll()
{
return await Task.Factory.StartNew(() =>
{
var list = _service.GetAll();
- var vm_list = list?.Select(x => new PumpMainDto(x)).ToList();
+ var vm_list = list?.Select(x => new AssetsPumpMainDto(x)).ToList();
return vm_list;
});
}
@@ -27,24 +27,24 @@
/// <summary>
/// 閫氳繃 ID 鑾峰彇
/// </summary>
- public async Task<PumpMainDto> GetByID(long ID)
+ public async Task<AssetsPumpMainDto> GetByID(long ID)
{
return await Task.Factory.StartNew(() =>
{
var model = _service.GetByID(ID);
- return model == null ? null : new PumpMainDto(model);
+ return model == null ? null : new AssetsPumpMainDto(model);
});
}
/// <summary>
/// 閫氳繃 Ids 鑾峰彇
/// </summary>
- public async Task<List<PumpMainDto>> GetByIds(List<long> Ids)
+ public async Task<List<AssetsPumpMainDto>> GetByIds(List<long> Ids)
{
return await Task.Factory.StartNew(() =>
{
var list = _service.GetByIds(Ids);
- var vm_list = list?.Select(x => new PumpMainDto(x)).ToList();
+ var vm_list = list?.Select(x => new AssetsPumpMainDto(x)).ToList();
return vm_list;
});
}
@@ -52,12 +52,12 @@
/// <summary>
/// 閫氳繃 绯诲垪ID 鑾峰彇
/// </summary>
- public async Task<List<PumpMainDto>> GetByPumpSeriesID(long ID)
+ public async Task<List<AssetsPumpMainDto>> GetByPumpSeriesID(long ID)
{
return await Task.Factory.StartNew(() =>
{
var list = _service.GetByPumpSeriesID(ID);
- var vm_list = list?.Select(x => new PumpMainDto(x)).ToList();
+ var vm_list = list?.Select(x => new AssetsPumpMainDto(x)).ToList();
return vm_list;
});
}
@@ -69,11 +69,11 @@
/// <summary>
/// 鎻掑叆涓�鏉�
/// </summary>
- public async Task<long> Insert(AddPumpMainInput input)
+ public async Task<long> Insert(AddAssetsPumpMainInput input)
{
return await Task.Factory.StartNew(() =>
{
- var model = input.Adapt<AddPumpMainInput, Model.PumpMain>();
+ var model = input.Adapt<AddAssetsPumpMainInput, Model.AssetsPumpMain>();
model.SortCode = _service.GetMaxSortCode() + 1;
var id = _service.Insert(model);
return id;
@@ -83,12 +83,12 @@
/// <summary>
/// 鎻掑叆鎷撳睍(鎻掑叆鍨嬪彿鍜屾槧灏勮〃)
/// </summary>
- public async Task<long> InsertEx(AddPumpMainInput input, AddPumpGroupAndMainMapInput mainmap)
+ public async Task<long> InsertEx(AddAssetsPumpMainInput input, AddAssetsPumpGroupAndMainMapInput mainmap)
{
return await Task.Factory.StartNew(() =>
{
- var mainmodel = input.Adapt<AddPumpMainInput, Model.PumpMain>();
- var mainmapmodel = mainmap.Adapt<AddPumpGroupAndMainMapInput, Model.PumpGroupAndMainMap>();
+ var mainmodel = input.Adapt<AddAssetsPumpMainInput, Model.AssetsPumpMain>();
+ var mainmapmodel = mainmap.Adapt<AddAssetsPumpGroupAndMainMapInput, Model.AssetsPumpGroupAndMainMap>();
mainmodel.SortCode = _service.GetMaxSortCode() + 1;
var id = _service.InsertEx(mainmodel, mainmapmodel);
return id;
@@ -98,11 +98,11 @@
/// <summary>
/// 鎵归噺鎻掑叆
/// </summary>
- public async Task<bool> Inserts(List<AddPumpMainInput> inputList)
+ public async Task<bool> Inserts(List<AddAssetsPumpMainInput> inputList)
{
return await Task.Factory.StartNew(() =>
{
- var list = inputList.Select(x => x.Adapt<AddPumpMainInput, Model.PumpMain>()).ToList();
+ var list = inputList.Select(x => x.Adapt<AddAssetsPumpMainInput, Model.AssetsPumpMain>()).ToList();
list.ForEach(x =>
{
x.SortCode = _service.GetMaxSortCode() + 1 + list.IndexOf(x);
@@ -115,7 +115,7 @@
/// <summary>
/// 澶ф壒閲忔彃鍏�
/// </summary>
- public async Task<bool> BulkInserts(List<AddPumpMainInput> list)
+ public async Task<bool> BulkInserts(List<AddAssetsPumpMainInput> list)
{
return await Task.Factory.StartNew(() =>
{
@@ -130,7 +130,7 @@
/// <summary>
/// 鏇存柊涓�鏉�
/// </summary>
- public async Task<bool> Update(UpdatePumpMainInput input)
+ public async Task<bool> Update(UpdateAssetsPumpMainInput input)
{
return await Task.Factory.StartNew(() =>
{
@@ -140,7 +140,7 @@
throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{input.ID} 鏁版嵁涓嶅瓨鍦�");
}
- var rhs = new Model.PumpMain(model);
+ var rhs = new Model.AssetsPumpMain(model);
input.Adapt(rhs);
var bol = _service.Update(rhs);
return bol;
@@ -150,7 +150,7 @@
/// <summary>
/// 鎵归噺鏇存柊
/// </summary>
- public async Task<bool> Updates(List<UpdatePumpMainInput> inputList)
+ public async Task<bool> Updates(List<UpdateAssetsPumpMainInput> inputList)
{
return await Task.Factory.StartNew(() =>
{
@@ -158,7 +158,7 @@
{
return false;
}
- var list = inputList.Select(x => x.Adapt<UpdatePumpMainInput, Model.PumpMain>()).ToList();
+ var list = inputList.Select(x => x.Adapt<UpdateAssetsPumpMainInput, Model.AssetsPumpMain>()).ToList();
var bol = _service.Updates(list);
return bol;
});
@@ -167,7 +167,7 @@
/// <summary>
/// 澶ф壒閲忔洿鏂�
/// </summary>
- public async Task<bool> BulkUpdates(List<UpdatePumpMainInput> list)
+ public async Task<bool> BulkUpdates(List<UpdateAssetsPumpMainInput> list)
{
return await Task.Factory.StartNew(() =>
{
--
Gitblit v1.9.3