From d6111ca1fa9f70afc50c8213f81c9d78c14a6527 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 22 一月 2025 14:37:21 +0800
Subject: [PATCH] 阀门单独匹配修改

---
 BLL/HStation.BLL.Assets.Core/03-localclient/18-Hydrant/AssetsHydrantMain.cs |   54 +++++++++++++++++++++++++++++++-----------------------
 1 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/BLL/HStation.BLL.Assets.Core/03-localclient/18-Hydrant/AssetsHydrantMain.cs b/BLL/HStation.BLL.Assets.Core/03-localclient/18-Hydrant/AssetsHydrantMain.cs
index b9cf9f8..a9ff02d 100644
--- a/BLL/HStation.BLL.Assets.Core/03-localclient/18-Hydrant/AssetsHydrantMain.cs
+++ b/BLL/HStation.BLL.Assets.Core/03-localclient/18-Hydrant/AssetsHydrantMain.cs
@@ -1,15 +1,13 @@
-锘縰sing HStation.Dto;
-using System.Linq;
-using Yw.Dto;
+锘縰sing Mapster;
 
 namespace HStation.CAL.LocalClient
 {
     /// <summary>
-    /// 娑堢伀鏍�
-    ///</summary>
+    /// 鎹㈢儹鍣ㄥ瀷鍙�
+    /// </summary>
     public class AssetsHydrantMain : IAssetsHydrantMain
     {
-        private readonly Service.AssetsHydrantMain _service = new();
+        private readonly HStation.Service.AssetsHydrantMain _service = new();
 
         #region Query
 
@@ -52,27 +50,26 @@
         }
 
         /// <summary>
-        /// 閫氳繃 绯诲垪ID 鑾峰彇
+        /// 鑾峰彇鏁伴噺
         /// </summary>
-        public async Task<List<AssetsHydrantMainDto>> GetBySeriesID(long ID)
+        public async Task<int> GetCount()
         {
             return await Task.Factory.StartNew(() =>
             {
-                var model = _service.GetAll();
-                var vm_list = model?.Where(x => x.SeriesID == ID).Select(x => new AssetsHydrantMainDto(x)).ToList();
-                return vm_list;
+                return _service.GetCount();
             });
         }
 
         /// <summary>
-        /// 鑾峰彇鏈�澶ф帓搴忕爜
+        /// 閫氳繃 SeriesID 鑾峰彇
         /// </summary>
-        public async Task<int> GetMaxSortCode()
+        public async Task<List<AssetsHydrantMainDto>> GetBySeriesID(long SeriesID)
         {
             return await Task.Factory.StartNew(() =>
             {
-                var sort_code = _service.GetMaxSortCode();
-                return sort_code;
+                var list = _service.GetBySeriesID(SeriesID);
+                var vm_list = list?.Select(x => new AssetsHydrantMainDto(x)).ToList();
+                return vm_list;
             });
         }
 
@@ -87,15 +84,20 @@
         {
             return await Task.Factory.StartNew(() =>
             {
+                var series = new HStation.Service.AssetsHydrantSeries().GetByID(input.SeriesID);
+                if (series == null)
+                {
+                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"SeriesID:{input.SeriesID} 鏁版嵁涓嶅瓨鍦�");
+                }
                 if (!string.IsNullOrEmpty(input.TagName))
                 {
                     if (_service.IsExistTagName(input.TagName))
                     {
-                        throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"TagName:{input.TagName}", "鏍囪宸插瓨鍦�");
+                        throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"TagName:{input.TagName} 鏍囪宸插瓨鍦�");
                     }
                 }
                 var model = input.Adapt<AddAssetsHydrantMainInput, Model.AssetsHydrantMain>();
-                model.SortCode = _service.GetMaxSortCode() + 1;
+                model.SortCode = _service.GetMaxSortCode(input.SeriesID) + 1;
                 var id = _service.Insert(model);
                 return id;
             });
@@ -108,7 +110,13 @@
         {
             return await Task.Factory.StartNew(() =>
             {
-                return false;
+                var list = inputList.Select(x => x.Adapt<AddAssetsHydrantMainInput, Model.AssetsHydrantMain>()).ToList();
+                list.ForEach(x =>
+                {
+                    x.SortCode = _service.GetMaxSortCode(x.SeriesID) + 1 + list.IndexOf(x);
+                });
+                var bol = _service.Inserts(list);
+                return bol;
             });
         }
 
@@ -139,12 +147,11 @@
                 {
                     throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{input.ID} 鏁版嵁涓嶅瓨鍦�");
                 }
-
                 if (!string.IsNullOrEmpty(input.TagName))
                 {
                     if (_service.IsExistTagNameExceptID(input.TagName, input.ID))
                     {
-                        throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"TagName:{input.TagName}", "鏍囪宸插瓨鍦�");
+                        throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.V001, $"TagName:{input.TagName} 鏍囪宸插瓨鍦�");
                     }
                 }
                 var rhs = new Model.AssetsHydrantMain(model);
@@ -249,7 +256,7 @@
         #region Exist
 
         /// <summary>
-        /// 鍒ゆ柇TagName鏄惁瀛樺湪
+        ///
         /// </summary>
         public async Task<bool> IsExistTagName(string TagName)
         {
@@ -261,7 +268,7 @@
         }
 
         /// <summary>
-        /// 鍒ゆ柇TagName鏄惁瀛樺湪 ExceptID
+        ///
         /// </summary>
         public async Task<bool> IsExistTagNameExceptID(string TagName, long ExceptID)
         {
@@ -304,8 +311,9 @@
         }
 
         /// <summary>
-        /// 鍏ㄩ儴鍒犻櫎
+        /// 鍒犻櫎鍏ㄩ儴
         /// </summary>
+        /// <returns></returns>
         public async Task<bool> DeleteAll()
         {
             return await Task.Factory.StartNew(() =>

--
Gitblit v1.9.3