From ff39bbf7e3a3d02f7f051ce1bee06cec007be3ff Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 30 十一月 2024 13:15:26 +0800
Subject: [PATCH] epa 计算节点局部损失字段修改
---
Service/HStation.Service.Assets.Core/02-model/06-PipeLine/AssetsPipeMain.cs | 56 ++++++++++++++++++++++++--------------------------------
1 files changed, 24 insertions(+), 32 deletions(-)
diff --git a/Service/HStation.Service.Assets.Core/02-model/06-PipeLine/AssetsPipeMain.cs b/Service/HStation.Service.Assets.Core/02-model/06-PipeLine/AssetsPipeMain.cs
index 0ab70ca..71788fb 100644
--- a/Service/HStation.Service.Assets.Core/02-model/06-PipeLine/AssetsPipeMain.cs
+++ b/Service/HStation.Service.Assets.Core/02-model/06-PipeLine/AssetsPipeMain.cs
@@ -14,37 +14,34 @@
public AssetsPipeMain()
{ }
- public AssetsPipeMain(AssetsPipeMain rhs)
+ public AssetsPipeMain(AssetsPipeMain rhs) : base(rhs)
{
- this.Caliber = rhs.Caliber;
- this.ID = rhs.ID;
- this.SeriesID = rhs.SeriesID;
this.Name = rhs.Name;
- this.MaterialName = rhs.MaterialName;
- this.Manning = rhs.Manning;
- this.Coefficient = rhs.Coefficient;
- this.Darcy = rhs.Darcy;
+ this.SeriesID = rhs.SeriesID;
+ this.Caliber = rhs.Caliber;
+ this.Material = rhs.Material;
+ this.MinorLoss = rhs.MinorLoss;
this.Hazen = rhs.Hazen;
- this.SortCode = rhs.SortCode;
+ this.Darcy = rhs.Darcy;
+ this.Manning = rhs.Manning;
this.KeyWord = rhs.KeyWord;
- this.IsDefault = rhs.IsDefault;
+ this.SortCode = rhs.SortCode;
this.Description = rhs.Description;
}
public void Reset(AssetsPipeMain rhs)
{
- this.Caliber = rhs.Caliber;
this.ID = rhs.ID;
- this.SeriesID = rhs.SeriesID;
this.Name = rhs.Name;
- this.MaterialName = rhs.MaterialName;
- this.Manning = rhs.Manning;
- this.Coefficient = rhs.Coefficient;
- this.Darcy = rhs.Darcy;
+ this.SeriesID = rhs.SeriesID;
+ this.Caliber = rhs.Caliber;
+ this.Material = rhs.Material;
+ this.MinorLoss = rhs.MinorLoss;
this.Hazen = rhs.Hazen;
- this.SortCode = rhs.SortCode;
+ this.Darcy = rhs.Darcy;
+ this.Manning = rhs.Manning;
this.KeyWord = rhs.KeyWord;
- this.IsDefault = rhs.IsDefault;
+ this.SortCode = rhs.SortCode;
this.Description = rhs.Description;
}
@@ -66,12 +63,17 @@
/// <summary>
/// 鏉愭枡
/// </summary>
- public string MaterialName { get; set; }
+ public string Material { get; set; }
+
+ /// <summary>
+ /// 璇嗗埆鍏抽敭瀛�
+ /// </summary>
+ public List<string> KeyWord { get; set; }
/// <summary>
/// 绯绘暟
/// </summary>
- public double? Coefficient { get; set; }
+ public double MinorLoss { get; set; }
/// <summary>
///Hazen
@@ -89,16 +91,6 @@
public double? Manning { get; set; }
/// <summary>
- /// 璇嗗埆鍏抽敭瀛�
- /// </summary>
- public string KeyWord { get; set; }
-
- /// <summary>
- /// 鏄惁榛樿
- /// </summary>
- public bool IsDefault { get; set; }
-
- /// <summary>
/// 鎺掑簭鐮�
/// </summary>
public int SortCode { get; set; }
@@ -111,9 +103,9 @@
/// <summary>
///
/// </summary>
- public AssetsPumpGroupAndMainMap Clone()
+ public AssetsPumpGroupAndMainMapping Clone()
{
- return (AssetsPumpGroupAndMainMap)this.MemberwiseClone();
+ return (AssetsPumpGroupAndMainMapping)this.MemberwiseClone();
}
object ICloneable.Clone()
--
Gitblit v1.9.3