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/PumpType.cs |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/BLL/HStation.BLL.Assets.Core/03-localclient/01-PumpMainManage/PumpType.cs b/BLL/HStation.BLL.Assets.Core/03-localclient/01-PumpMainManage/PumpType.cs
index 9a41fa0..639763e 100644
--- a/BLL/HStation.BLL.Assets.Core/03-localclient/01-PumpMainManage/PumpType.cs
+++ b/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(() =>
             {

--
Gitblit v1.9.3