From e37b6f2ca026097b83da3ec989cb0d454cceddad Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 19 十二月 2024 14:13:22 +0800
Subject: [PATCH] 压力表整改
---
BLL/HStation.BLL.Assets.Core/03-localclient/18-pressmeter/01-series/AssetsPressmeterSeries.cs | 134 +++++++++++++++++++++++++-------------------
1 files changed, 76 insertions(+), 58 deletions(-)
diff --git a/BLL/HStation.BLL.Assets.Core/03-localclient/19-Pressmeter/AssetsPressmeterSeries.cs b/BLL/HStation.BLL.Assets.Core/03-localclient/18-pressmeter/01-series/AssetsPressmeterSeries.cs
similarity index 72%
rename from BLL/HStation.BLL.Assets.Core/03-localclient/19-Pressmeter/AssetsPressmeterSeries.cs
rename to BLL/HStation.BLL.Assets.Core/03-localclient/18-pressmeter/01-series/AssetsPressmeterSeries.cs
index 8c7c178..e55c8e1 100644
--- a/BLL/HStation.BLL.Assets.Core/03-localclient/19-Pressmeter/AssetsPressmeterSeries.cs
+++ b/BLL/HStation.BLL.Assets.Core/03-localclient/18-pressmeter/01-series/AssetsPressmeterSeries.cs
@@ -1,14 +1,11 @@
-锘縰sing HStation.Dto;
-using Yw.Dto;
-
-namespace HStation.CAL.LocalClient
+锘縩amespace HStation.CAL.LocalClient
{
/// <summary>
- /// 鍘嬪姏琛ㄧ郴鍒�
- ///</summary>
+ ///
+ /// </summary>
public class AssetsPressmeterSeries : IAssetsPressmeterSeries
{
- private readonly Service.AssetsPressmeterSeries _service = new();
+ private readonly HStation.Service.AssetsPressmeterSeries _service = new();
#region Query
@@ -50,31 +47,7 @@
});
}
- /// <summary>
- /// 鑾峰彇鏈�澶ф帓搴忕爜
- /// </summary>
- public async Task<int> GetMaxSortCode()
- {
- return await Task.Factory.StartNew(() =>
- {
- var sort_code = _service.GetMaxSortCode();
- return sort_code;
- });
- }
-
- /// <summary>
- /// 鑾峰彇鏈�澶ф帓搴忕爜
- /// </summary>
- public async Task<int> GetMaxSortCode(long ParentID)
- {
- return await Task.Factory.StartNew(() =>
- {
- var sort_code = _service.GetMaxSortCode(ParentID);
- return sort_code;
- });
- }
-
- #endregion Query
+ #endregion
#region Insert
@@ -85,16 +58,26 @@
{
return await Task.Factory.StartNew(() =>
{
+ var parentIds = new List<long>();
+ if (input.ParentID > 0)
+ {
+ var parent = _service.GetByID(input.ParentID);
+ if (parent == null)
+ {
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ParentID:{input.ParentID} 鏁版嵁涓嶅瓨鍦�");
+ }
+ parentIds = TreeParentIdsHelper.GetChildParentIds(parent.ID, parent.ParentIds);
+ }
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<AddAssetsPressmeterSeriesInput, Model.AssetsPressmeterSeries>();
- var parent_id = Yw.Untity.TreeParentIdsHelper.GetLastParentID(input.ParentIds);
- model.SortCode = _service.GetMaxSortCode(parent_id) + 1;
+ model.ParentIds = parentIds;
+ model.SortCode = _service.GetMaxSortCode(input.ParentID) + 1;
var id = _service.Insert(model);
return id;
});
@@ -122,7 +105,7 @@
});
}
- #endregion Insert
+ #endregion
#region Update
@@ -138,12 +121,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.AssetsPressmeterSeries(model);
@@ -200,26 +182,58 @@
});
}
+
/// <summary>
- /// 鏇存柊鏍戞帓搴�
+ /// 鏇存柊鏍戞帓搴忕爜
/// </summary>
public async Task<bool> UpdateTreeSortCode(long ID, long ParentID, int SortCode)
{
return await Task.Factory.StartNew(() =>
{
- var bol = _service.UpdateTreeSortCode(ID, new List<long>() { ParentID }, SortCode);
- return bol;
- });
- }
-
- /// <summary>
- /// 鏇存柊鏍戞帓搴忕爜
- /// </summary>
- public async Task<bool> UpdateTreeSortCode(long ID, List<long> ParentIds, int SortCode)
- {
- return await Task.Factory.StartNew(() =>
- {
- var bol = _service.UpdateTreeSortCode(ID, ParentIds, SortCode);
+ var model = _service.GetByID(ID);
+ if (model == null)
+ {
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{ID} 鏁版嵁涓嶅瓨鍦�");
+ }
+ var parentIds = new List<long>();
+ if (ParentID > 0)
+ {
+ var parent = _service.GetByID(ParentID);
+ if (parent == null)
+ {
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ParentID:{ParentID} 鏁版嵁涓嶅瓨鍦�");
+ }
+ parentIds = TreeParentIdsHelper.GetChildParentIds(parent.ID, parent.ParentIds);
+ }
+ var sorterList = new List<Yw.Model.TreeSorter>()
+ {
+ new Yw.Model.TreeSorter()
+ {
+ ID=ID,
+ ParentIds=parentIds,
+ SortCode=SortCode
+ }
+ };
+ if (TreeParentIdsHelper.ToString(parentIds) != TreeParentIdsHelper.ToString(model.ParentIds))
+ {
+ var children = _service.GetChildrenByID(ID);
+ if (children != null && children.Count > 0)
+ {
+ foreach (var item in children)
+ {
+ var itemParent = sorterList.Find(x => x.ID == item.ParentIds.Last());
+ var itemParentIds = TreeParentIdsHelper.GetChildParentIds(itemParent.ID, itemParent.ParentIds);
+ var sorter = new Yw.Model.TreeSorter()
+ {
+ ID = item.ID,
+ ParentIds = itemParentIds,
+ SortCode = item.SortCode
+ };
+ sorterList.Add(sorter);
+ }
+ }
+ }
+ var bol = _service.UpdateTreeSorter(sorterList);
return bol;
});
}
@@ -267,12 +281,13 @@
});
}
- #endregion Update
+
+ #endregion
#region Exist
/// <summary>
- /// 鍒ゆ柇TagName鏄惁瀛樺湪
+ ///
/// </summary>
public async Task<bool> IsExistTagName(string TagName)
{
@@ -284,7 +299,7 @@
}
/// <summary>
- /// 鍒ゆ柇TagName鏄惁瀛樺湪 ExceptID
+ ///
/// </summary>
public async Task<bool> IsExistTagNameExceptID(string TagName, long ExceptID)
{
@@ -295,7 +310,7 @@
});
}
- #endregion Exist
+ #endregion
#region Delete
@@ -327,8 +342,9 @@
}
/// <summary>
- /// 鍏ㄩ儴鍒犻櫎
+ /// 鍒犻櫎鍏ㄩ儴
/// </summary>
+ /// <returns></returns>
public async Task<bool> DeleteAll()
{
return await Task.Factory.StartNew(() =>
@@ -337,6 +353,8 @@
});
}
- #endregion Delete
+
+ #endregion
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3