From 97a43bf839f59cdda1641d61706e6e71a0c5e172 Mon Sep 17 00:00:00 2001
From: cloudflight <cloudflight@126.com>
Date: 星期二, 24 十二月 2024 23:54:17 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

---
 Application/HStation.Application.Assets.Core/01-ProjectProduct/PumpSeries_Controller.cs |   49 +++++++++++++++++++------------------------------
 1 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/Application/HStation.Application.Assets.Core/01-ProjectProduct/PumpSeries_Controller.cs b/Application/HStation.Application.Assets.Core/01-ProjectProduct/PumpSeries_Controller.cs
index 07c5990..b84ee25 100644
--- a/Application/HStation.Application.Assets.Core/01-ProjectProduct/PumpSeries_Controller.cs
+++ b/Application/HStation.Application.Assets.Core/01-ProjectProduct/PumpSeries_Controller.cs
@@ -3,13 +3,13 @@
 namespace HStation.Application
 {
     /// <summary>
-    /// PumpSeries
+    /// AssetsPumpSeries
     /// </summary>
-    [Route("Assets/PumpSeries")]
-    [ApiDescriptionSettings("Assets", Name = "PumpSeries", Order = 400000)]
-    public class PumpSeries_Controller : IDynamicApiController
+    [Route("Assets/AssetsPumpSeries")]
+    [ApiDescriptionSettings("Assets", Name = "AssetsPumpSeries", Order = 400000)]
+    public class AssetsPumpSeries_Controller : IDynamicApiController
     {
-        private readonly Service.PumpSeries _service = new();
+        private readonly Service.AssetsPumpSeries _service = new();
 
         #region Query
 
@@ -18,10 +18,10 @@
         /// </summary>
         [Route("GetAll@V1.0")]
         [HttpGet]
-        public List<PumpSeriesDto> GetAll()
+        public List<AssetsPumpSeriesDto> GetAll()
         {
             var list = _service.GetAll();
-            var vmList = list?.Select(x => new PumpSeriesDto(x)).ToList();
+            var vmList = list?.Select(x => new AssetsPumpSeriesDto(x)).ToList();
             return vmList;
         }
 
@@ -30,10 +30,10 @@
         /// </summary>
         [Route("GetByID@V1.0")]
         [HttpGet]
-        public PumpSeriesDto GetByID([FromQuery][Required] IDInput input)
+        public AssetsPumpSeriesDto GetByID([FromQuery][Required] IDInput input)
         {
             var model = _service.GetByID(input.ID);
-            return model == null ? null : new PumpSeriesDto(model);
+            return model == null ? null : new AssetsPumpSeriesDto(model);
         }
 
         /// <summary>
@@ -41,11 +41,11 @@
         /// </summary>
         [Route("GetByIds@V1.0")]
         [HttpGet]
-        public List<PumpSeriesDto> GetByIds([FromQuery][Required] IdsInput input)
+        public List<AssetsPumpSeriesDto> GetByIds([FromQuery][Required] IdsInput input)
         {
             var ids = LongListHelper.ToList(input.Ids);
             var list = _service.GetByIds(ids);
-            var vmList = list?.Select(x => new PumpSeriesDto(x)).ToList();
+            var vmList = list?.Select(x => new AssetsPumpSeriesDto(x)).ToList();
             return vmList;
         }
 
@@ -58,9 +58,9 @@
         /// </summary>
         [Route("Insert@V1.0")]
         [HttpPost]
-        public long Insert(AddPumpSeriesInput input)
+        public long Insert(AddAssetsPumpSeriesInput input)
         {
-            var model = input.Adapt<AddPumpSeriesInput, Model.PumpSeries>();
+            var model = input.Adapt<AddAssetsPumpSeriesInput, Model.AssetsPumpSeries>();
             model.SortCode = _service.GetMaxSortCode() + 1;
             var id = _service.Insert(model);
             return id;
@@ -71,9 +71,9 @@
         /// </summary>
         [Route("Inserts@V1.0")]
         [HttpPost]
-        public bool Inserts(List<AddPumpSeriesInput> inputList)
+        public bool Inserts(List<AddAssetsPumpSeriesInput> inputList)
         {
-            var list = inputList.Select(x => x.Adapt<AddPumpSeriesInput, Model.PumpSeries>()).ToList();
+            var list = inputList.Select(x => x.Adapt<AddAssetsPumpSeriesInput, Model.AssetsPumpSeries>()).ToList();
             list.ForEach(x =>
             {
                 x.SortCode = _service.GetMaxSortCode() + 1 + list.IndexOf(x);
@@ -91,7 +91,7 @@
         /// </summary>
         [Route("Update@V1.0")]
         [HttpPut]
-        public bool Update([Required] UpdatePumpSeriesInput input)
+        public bool Update([Required] UpdateAssetsPumpSeriesInput input)
         {
             var model = _service.GetByID(input.ID);
             if (model == null)
@@ -99,7 +99,7 @@
                 throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{input.ID} 鏁版嵁涓嶅瓨鍦�");
             }
 
-            var rhs = new Model.PumpSeries(model);
+            var rhs = new Model.AssetsPumpSeries(model);
             input.Adapt(rhs);
             var bol = _service.Update(rhs);
             return bol;
@@ -110,13 +110,13 @@
         /// </summary>
         [Route("Updates@V1.0")]
         [HttpPut]
-        public bool Updates([Required] List<UpdatePumpSeriesInput> inputList)
+        public bool Updates([Required] List<UpdateAssetsPumpSeriesInput> inputList)
         {
             if (inputList == null || inputList.Count < 1)
             {
                 return false;
             }
-            var list = inputList.Select(x => x.Adapt<UpdatePumpSeriesInput, Model.PumpSeries>()).ToList();
+            var list = inputList.Select(x => x.Adapt<UpdateAssetsPumpSeriesInput, Model.AssetsPumpSeries>()).ToList();
             var bol = _service.Updates(list);
             return bol;
         }
@@ -185,17 +185,6 @@
                 }
             }
             var bol = _service.UpdateTagName(input.ID, input.TagName);
-            return bol;
-        }
-
-        /// <summary>
-        /// 鏇存柊 UseStatus
-        /// </summary>
-        [Route("UpdateUseStatus@V1.0")]
-        [HttpPut]
-        public bool UpdateUseStatus([Required] UpdateUseStatusInput input)
-        {
-            var bol = _service.UpdateUseStatus(input.ID, (Yw.Model.eUseStatus)input.UseStatus);
             return bol;
         }
 

--
Gitblit v1.9.3