From 7676398e188b4e6618ec9c7831534db1775c99cc Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期一, 02 十二月 2024 15:23:03 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingHelper.cs | 730 ++++++++++++++++++++++++--------------------------------
1 files changed, 312 insertions(+), 418 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingHelper.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingHelper.cs
index 6744c32..25e9e8e 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingHelper.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingHelper.cs
@@ -1,5 +1,4 @@
-锘縰sing HStation.Vmo;
-using HStation.WinFrmUI.PhartRelation;
+锘縰sing HStation.WinFrmUI.PhartRelation;
namespace HStation.WinFrmUI
{
@@ -12,9 +11,13 @@
private const double _headTolerance = 5;
private const double _powerTolerance = 0.05;
+ private const double _valveLift = 10;//闃�闂ㄥ紑搴﹁寖鍥�
+ private const int _angle = 1;//瑙掑害鑼冨洿
+
//璧勪骇鑷姩鍖归厤
- public static async Task<bool> Matching(AssetsMatchingViewModel assetsAutoMatchingView)
+ public static bool Matching(AssetsMatchingViewModel assetsAutoMatchingView, out string Error)
{
+ Error = string.Empty;
bool IsMaching = false;
var AssetsPumpMain = new BLL.AssetsPumpMain();
var adaptingManage = new BLL.AdaptingManage();
@@ -23,67 +26,74 @@
var AssetsElbowMain = new BLL.AssetsElbowMain();
var AssetsThreelinkMain = new BLL.AssetsThreelinkMain();
var AssetsFourlinkMain = new BLL.AssetsFourlinkMain();
-
- var allPump = await AssetsPumpMain.GetAll();
- var allAdapting = await adaptingManage.GetAll();
- var allPipeLine = await pipeLineManage.GetAll();
- var allValve = await AssetsValveMain.GetAll();
- var allElbow = await AssetsElbowMain.GetAll();
- var allThreeLink = await AssetsThreelinkMain.GetAll();
- var allFourLink = await AssetsFourlinkMain.GetAll();
- //娉靛尮閰�
- foreach (var item in assetsAutoMatchingView.PumpMatchingList)
+ try
{
- if (await MatchingPumps(item, allPump))
+ var allPump = Task.Run(async () => await AssetsPumpMain.GetAll()).Result;
+ var allAdapting = Task.Run(async () => await adaptingManage.GetAll()).Result;
+ var allPipeLine = Task.Run(async () => await pipeLineManage.GetAll()).Result;
+ var allValve = Task.Run(async () => await AssetsValveMain.GetAll()).Result;
+ var allElbow = Task.Run(async () => await AssetsElbowMain.GetAll()).Result;
+ var allThreeLink = Task.Run(async () => await AssetsThreelinkMain.GetAll()).Result;
+ var allFourLink = Task.Run(async () => await AssetsFourlinkMain.GetAll()).Result;
+ //娉靛尮閰�
+ foreach (var item in assetsAutoMatchingView.PumpMatchingList)
{
- IsMaching = true;
+ if (MatchingPumps(item, allPump))
+ {
+ IsMaching = true;
+ }
+ }
+ //涓夐�氬尮閰�
+ foreach (var item in assetsAutoMatchingView.ThreelinkMatchingList)
+ {
+ if (MatchingThreelink(item, allThreeLink))
+ {
+ IsMaching = true;
+ }
+ }
+ //鍥涢�氬尮閰�
+ foreach (var item in assetsAutoMatchingView.FourlinkMatchingList)
+ {
+ if (MatchingFourlink(item, allFourLink))
+ {
+ IsMaching = true;
+ }
+ }
+ //绠￠亾鍖归厤
+ foreach (var item in assetsAutoMatchingView.PipeMatchingList)
+ {
+ if (MatchingPipe(item, allPipeLine))
+ {
+ IsMaching = true;
+ }
+ }
+ //闃�闂ㄥ尮閰�
+ foreach (var item in assetsAutoMatchingView.ValveMatchingList)
+ {
+ if (MatchingValve(item, allValve))
+ {
+ IsMaching = true;
+ }
+ }
+ //寮ご鍖归厤
+ foreach (var item in assetsAutoMatchingView.ElbowMatchingList)
+ {
+ if (MatchingElbow(item, allElbow))
+ {
+ IsMaching = true;
+ }
}
}
- //涓夐�氬尮閰�
- foreach (var item in assetsAutoMatchingView.ThreelinkMatchingList)
+ catch (Exception ex)
{
- if (MatchingThreelink(item, allThreeLink))
- {
- IsMaching = true;
- }
- }
- //鍥涢�氬尮閰�
- foreach (var item in assetsAutoMatchingView.FourlinkMatchingList)
- {
- if (MatchingFourlink(item, allFourLink))
- {
- IsMaching = true;
- }
- }
- //绠￠亾鍖归厤
- foreach (var item in assetsAutoMatchingView.PipeMatchingList)
- {
- if (MatchingPipe(item, allPipeLine))
- {
- IsMaching = true;
- }
- }
- //闃�闂ㄥ尮閰�
- foreach (var item in assetsAutoMatchingView.ValveMatchingList)
- {
- if (MatchingValve(item, allValve))
- {
- IsMaching = true;
- }
- }
- //寮ご鍖归厤
- foreach (var item in assetsAutoMatchingView.ElbowMatchingList)
- {
- if (MatchingElbow(item, allElbow))
- {
- IsMaching = true;
- }
+ Error = ex.Message;
+ return false;
}
return IsMaching;
}
//娉靛尮閰�
- public static async Task<bool> MatchingPumps(PumpMatchingViewModel InputModel, List<Vmo.AssetsPumpMainVmo> AssetsPumpMainVmos)
+ public static bool MatchingPumps(PumpMatchingViewModel InputModel, List<Vmo.AssetsPumpMainVmo> AssetsPumpMainVmos)
{
if (AssetsPumpMainVmos == null)
{
@@ -151,13 +161,14 @@
InputModel.MatchingRatedP = vmo.RatedPower;
InputModel.MatchingDbId = vmo.ID.ToString();
InputModel.MatchingModelType = vmo.Name;
- var list = await new BLL.XhsPumpMainPhartMappingExtensions().GetByPumpMainID(vmo.ID);
+ var list = Task.Run(async () => await new BLL.XhsPumpMainPhartMappingExtensions().GetByPumpMainID(vmo.ID)).Result;
if (list != null && list.Count > 0)
{
- InputModel.MatchingCurveDbId = list.First().ID.ToString();
- var graph_qh = list.First().Diagram.GraphList.Find(x => x.GraphType == HStation.PhartRelation.eGraphType.PumpQH);
- var graph_qe = list.First().Diagram.GraphList.Find(x => x.GraphType == HStation.PhartRelation.eGraphType.PumpQE);
- var graph_qp = list.First().Diagram.GraphList.Find(x => x.GraphType == HStation.PhartRelation.eGraphType.PumpQP);
+ var maxImportanceItem = list.OrderByDescending(x => x.Importance).First();
+ InputModel.MatchingCurveDbId = maxImportanceItem.ID.ToString();
+ var graph_qh = maxImportanceItem.Diagram.GraphList.Find(x => x.GraphType == HStation.PhartRelation.eGraphType.PumpQH);
+ var graph_qe = maxImportanceItem.Diagram.GraphList.Find(x => x.GraphType == HStation.PhartRelation.eGraphType.PumpQE);
+ var graph_qp = maxImportanceItem.Diagram.GraphList.Find(x => x.GraphType == HStation.PhartRelation.eGraphType.PumpQP);
if (graph_qh != null)
{
var points_qh = PhartPerformCurveHelper.GetFeatPointList(graph_qh.GraphType, graph_qh.GeometryInfo, 100, null);
@@ -192,175 +203,172 @@
}
//闃�闂ㄥ尮閰�
- public static bool MatchingValve(ValveMatchingViewModel input, List<Vmo.AssetsValveMainVmo> adaptingManageVmos)
+ public static bool MatchingValve(ValveMatchingViewModel input, List<Vmo.AssetsValveMainVmo> valveMainVmos)
{
- if (adaptingManageVmos == null)
+ if (valveMainVmos == null)
{
return true;
}
HStation.Vmo.AssetsValveMainVmo vmo = null;
- int firstCount = 0;
//鍙ｅ緞鏈�灏忓樊鍊�
// 缁濆鍖归厤
- var absoluteMatch = adaptingManageVmos.Where(i =>
- ((i.Caliber == null) || i.Caliber == input.Diameter) &&
- ((input.Material == null) || i.MaterialName == input.Material)).ToList();
- if (absoluteMatch.Any())
+ valveMainVmos = valveMainVmos.Where(x => x.ValveType == input.ValveType).ToList();
+
+ var nameMatching = valveMainVmos.Where(x =>
+ (x.KeyWord != null && x.KeyWord.Any(keyword => GetIntersect(keyword, input.ModelType) >= 1)) ||
+ (x.KeyWord == null || !x.KeyWord.Any()) && GetIntersect(x.Name, input.ModelType) >= 1
+ ) //鍏堣繘琛岀瓫閫�,鍚庤繘琛屼粠澶у埌灏忔帓搴�
+ .OrderByDescending(x =>
+ (x.KeyWord != null && x.KeyWord.Any(keyword => GetIntersect(keyword, input.ModelType) >= 1)) ||
+ (x.KeyWord == null || !x.KeyWord.Any()) && GetIntersect(x.Name, input.ModelType) >= 1)
+ .ToList();//浣跨敤鍨嬪彿鍚嶆垨鑰呭叧閿瓧鎵惧嚭鐩稿悓瀛楃鍦�1浠ヤ笂骞朵笖杩涜鎺掑簭
+
+ if (nameMatching.Count > 0)
{
- foreach (var range in absoluteMatch)
+ var absoluteMatching = nameMatching.Where(i =>
+ ((i.Caliber == null) || Math.Abs(Convert.ToInt64(i.Caliber) - input.Diameter) <= _caliberTolerance) && //鐩村緞绾︽潫
+ i.Material == input.Material //鏉愭枡绾︽潫
+ ).ToList();
+ if (absoluteMatching.Count > 1)
{
- int commonCount = GetIntersect(input.ModelType, range.KeyWord);
- if (commonCount > firstCount)
- {
- vmo = range;
- firstCount = commonCount;
- }
+ return false;
}
+ else if (absoluteMatching.Count == 1)
+ {
+ vmo = absoluteMatching.First();
+ }
+ else
+ return false;
+ }
+ else if (nameMatching.Count == 1)
+ {
+ vmo = nameMatching.First();
}
else
{
- //鍖洪棿鍖归厤
- var rangeMatch = adaptingManageVmos.Where(item =>
+ var absoluteMatching = valveMainVmos.Where(i =>
+ ((i.Caliber == null) || Math.Abs(Convert.ToInt64(i.Caliber) - input.Diameter) <= _caliberTolerance) && //鐩村緞绾︽潫
+ i.Material == input.Material //鏉愭枡绾︽潫
+ ).ToList();
+ if (absoluteMatching.Count > 1)
{
- if (item.Caliber.HasValue)
- {
- return Math.Abs(Convert.ToInt64(item.Caliber - input.Diameter)) <= _caliberTolerance;
- }
- else
- {
- if (item.Caliber == null)
- {
- return true;
- }
- }
return false;
- })
- .ToList();
- if (rangeMatch != null && rangeMatch.Count > 0)
- {
- var materialList = new List<Vmo.AssetsValveMainVmo>();
- foreach (var range in rangeMatch)
- {
- //浠ユ潗鏂欎负鏉′欢寮�濮嬪尮閰�
- if (range.MaterialName == null)
- {
- materialList.Add(range);
- }
- else
- {
- int commonCount = GetIntersect(input.Material, range.MaterialName);
- if (commonCount > firstCount)
- {
- materialList.Add(range);
- firstCount = commonCount;
- }
- }
- }
- //鐢ㄥ凡缁忕瓫閫夊畬鎴愮殑鍒楄〃涓互鍚嶇О绛涢��
- firstCount = 0;
- foreach (var material in materialList)
- {
- int commonCount = GetIntersect(input.ModelType, material.KeyWord);
- if (commonCount > firstCount)
- {
- vmo = material;
- firstCount = commonCount;
- }
- }
}
- }
- //鍙ｅ緞鍜屾潗鏂欓兘娌℃湁鍖归厤涓�,灏辩敤鍨嬪彿鍚嶅尮閰�
- firstCount = 0;
- if (vmo == null)
- {
- foreach (var item in adaptingManageVmos)
+ else if (absoluteMatching.Count == 1)
{
- int commonCount = GetIntersect(input.ModelType, item.KeyWord);
- if (commonCount > firstCount)
- {
- vmo = item;
- firstCount = commonCount;
- }
+ vmo = absoluteMatching.First();
}
+ else
+ return false;
}
if (vmo != null)
{
- input.MatchingMinorLoss = vmo.Coefficient;
+ input.MatchingMinorLoss = vmo.MinorLoss;
input.MatchingDbId = vmo.ID.ToString();
input.MatchingDiameter = vmo.Caliber;
- input.MatchingMaterial = vmo.MaterialName;
+ input.MatchingMaterial = vmo.Material;
input.MatchingModelType = vmo.Name;
- // input.MatchingValveSetting =
- input.MatchingValveType = vmo.SeriesType.ToString();
- return true;
+ input.MatchingValveSetting = vmo.ValveSetting;
+ input.MatchingValveType = vmo.ValveType;
+ if (vmo.ValveType == HStation.Assets.eValveType.GPV)
+ {
+ var list = Task.Run(async () => await new BLL.XhsPumpMainPhartMappingExtensions().GetByPumpMainID(vmo.ID)).Result;
+ if (list != null && list.Count > 0)
+ {
+ var maxImportanceItem = list.OrderByDescending(x => x.Importance).First();
+ input.MatchingCurveDbId = maxImportanceItem.ID.ToString();
+ var graph_ql = maxImportanceItem.Diagram.GraphList.Find(x => x.GraphType == HStation.PhartRelation.eGraphType.ValveQL);
+ var graph_ol = maxImportanceItem.Diagram.GraphList.Find(x => x.GraphType == HStation.PhartRelation.eGraphType.ValveOL);
+ if (graph_ql != null)
+ {
+ var points_qh = PhartPerformCurveHelper.GetFeatPointList(graph_ql.GraphType, graph_ql.GeometryInfo, 100, null);
+ input.MatchingCurveQL = new List<CurvePointMatchingViewModel>();
+ foreach (var item in points_qh)
+ {
+ input.MatchingCurveQL.Add(new CurvePointMatchingViewModel(item.X, item.Y));
+ }
+ }
+ }
+ return true;
+ }
+ else if (vmo.ValveType == HStation.Assets.eValveType.TCV)
+ {
+ var list = Task.Run(async () => await new BLL.XhsPumpMainPhartMappingExtensions().GetByPumpMainID(vmo.ID)).Result;
+ if (list != null && list.Count > 0)
+ {
+ var maxImportanceItem = list.OrderByDescending(x => x.Importance).First();
+ input.MatchingCurveDbId = maxImportanceItem.ID.ToString();
+ var graph_ol = maxImportanceItem.Diagram.GraphList.Find(x => x.GraphType == HStation.PhartRelation.eGraphType.ValveOL);
+ if (graph_ol != null)
+ {
+ var points_qh = PhartPerformCurveHelper.GetFeatPointList(graph_ol.GraphType, graph_ol.GeometryInfo, 100, null);
+ input.MatchingCurveOL = new List<CurvePointMatchingViewModel>();
+ foreach (var item in points_qh)
+ {
+ input.MatchingCurveOL.Add(new CurvePointMatchingViewModel(item.X, item.Y));
+ }
+ }
+ }
+ return true;
+ }
}
return false;
}
//绠￠亾鍖归厤
- public static bool MatchingPipe(PipeMatchingViewModel input, List<Vmo.AssetsPipeMainVmo> pipeLineManageVmos)
+ public static bool MatchingPipe(PipeMatchingViewModel input, List<Vmo.AssetsPipeMainVmo> pipeLineMainVmos)
{
- if (pipeLineManageVmos == null)
+ if (pipeLineMainVmos == null)
{
return true;
}
Vmo.AssetsPipeMainVmo vmo = null;
- int StartCount = 0;
- //鍙ｅ緞鏈�灏忓樊鍊�
- // 缁濆鍖归厤
- var absoluteMatch = pipeLineManageVmos.Where(i =>
- ((i.Caliber == null) || i.Caliber == input.Diameter) &&
- ((input.Material == null) || i.MaterialName == input.Material)).ToList();
- if (absoluteMatch.Any())
+
+ var nameMatching = pipeLineMainVmos.Where(x =>
+ (x.KeyWord != null && x.KeyWord.Any(keyword => GetIntersect(keyword, input.ModelType) >= 1)) ||
+ (x.KeyWord == null || !x.KeyWord.Any()) && GetIntersect(x.Name, input.ModelType) >= 1
+ ) //鍏堣繘琛岀瓫閫�,鍚庤繘琛屼粠澶у埌灏忔帓搴�
+ .OrderByDescending(x =>
+ (x.KeyWord != null && x.KeyWord.Any(keyword => GetIntersect(keyword, input.ModelType) >= 1)) ||
+ (x.KeyWord == null || !x.KeyWord.Any()) && GetIntersect(x.Name, input.ModelType) >= 1).ToList();
+
+ if (nameMatching.Count > 1)
{
- foreach (var range in absoluteMatch)
+ var absoluteMatching = nameMatching.Where(i =>
+ ((i.Caliber == null) || Math.Abs(Convert.ToInt64(i.Caliber) - input.Diameter) <= _caliberTolerance) && //鐩村緞绾︽潫
+ i.Material == input.Material //鏉愭枡绾︽潫
+ ).ToList();
+ if (absoluteMatching.Count > 1)
{
- int commonCount = GetIntersect(input.ModelType, range.KeyWord);
- if (commonCount > StartCount)
- {
- vmo = range;
- StartCount = commonCount;
- }
+ return false;
}
+ else if (absoluteMatching.Count == 1)
+ {
+ vmo = absoluteMatching.First();
+ }
+ else
+ return false;
+ }
+ else if (nameMatching.Count == 1)
+ {
+ vmo = nameMatching.First();
}
else
{
- //鍖洪棿鍖归厤
- var rangeMatch = pipeLineManageVmos.Where(item =>
+ var absoluteMatching = pipeLineMainVmos.Where(i =>
+ ((i.Caliber == null) || Math.Abs(Convert.ToInt64(i.Caliber) - input.Diameter) <= _caliberTolerance) && //鐩村緞绾︽潫
+ i.Material == input.Material //鏉愭枡绾︽潫
+ ).ToList();
+ if (absoluteMatching.Count > 1)
{
- if (item.Caliber != null)
- {
- return Math.Abs(Convert.ToInt64(item.Caliber - input.Diameter)) <= _caliberTolerance;
- }
return false;
- })
- .ToList();
- if (rangeMatch != null)
- {
- foreach (var range in rangeMatch)
- {
- //浠ユ潗鏂欎负鏉′欢寮�濮嬪尮閰�
- int commonCount = GetIntersect(input.Material, range.MaterialName);
- if (commonCount > StartCount)
- {
- vmo = range;
- StartCount = commonCount;
- }
- }
}
- }
- //鍙ｅ緞鍜屾潗鏂欓兘娌℃湁鍖归厤涓�,灏辩敤鍨嬪彿鍚嶅尮閰�
- if (vmo == null)
- {
- foreach (var item in pipeLineManageVmos)
+ else if (absoluteMatching.Count == 1)
{
- int commonCount = GetIntersect(input.ModelType, item.KeyWord);
- if (commonCount > StartCount)
- {
- vmo = item;
- StartCount = commonCount;
- }
+ vmo = absoluteMatching.First();
}
+ else
+ return false;
}
if (vmo != null)
{
@@ -383,317 +391,207 @@
break;
}
input.MatchingDbId = vmo.ID.ToString();
- input.MatchingMaterial = vmo.MaterialName;
+ input.MatchingMaterial = vmo.Material;
input.MatchingModelType = vmo.Name;
- input.MatchingMinorLoss = vmo.Coefficient;
+ input.MatchingMinorLoss = vmo.MinorLoss;
return true;
}
return false;
}
//寮ご鍖归厤
- public static bool MatchingElbow(ElbowMatchingViewModel input, List<Vmo.AssetsElbowMainVmo> adaptingManageVmos)
+ public static bool MatchingElbow(ElbowMatchingViewModel input, List<Vmo.AssetsElbowMainVmo> elbowMainVmos)
{
- if (adaptingManageVmos == null)
+ if (elbowMainVmos == null)
{
return true;
}
Vmo.AssetsElbowMainVmo vmo = null;
- int firstCount = 0;
- //鍙ｅ緞鏈�灏忓樊鍊�
- // 缁濆鍖归厤
- var absoluteMatch = adaptingManageVmos.Where(i =>
- ((input.Caliber == null && i.Caliber == null) || i.Caliber == input.Caliber) &&
- ((input.Material == null) || i.MaterialName == input.Material)).ToList();
- if (absoluteMatch.Any())
+ var nameMatching = elbowMainVmos.Where(x =>
+ (x.KeyWord != null && x.KeyWord.Any(keyword => GetIntersect(keyword, input.ModelType) >= 1)) ||
+ (x.KeyWord == null || !x.KeyWord.Any()) && GetIntersect(x.Name, input.ModelType) >= 1
+ ) //鍏堣繘琛岀瓫閫�,鍚庤繘琛屼粠澶у埌灏忔帓搴�
+ .OrderByDescending(x =>
+ (x.KeyWord != null && x.KeyWord.Any(keyword => GetIntersect(keyword, input.ModelType) >= 1)) ||
+ (x.KeyWord == null || !x.KeyWord.Any()) && GetIntersect(x.Name, input.ModelType) >= 1).ToList();
+
+ if (nameMatching.Count > 1)
{
- foreach (var range in absoluteMatch)
+ var absoluteMatching = nameMatching.Where(i =>
+ ((i.Caliber == null || input.Caliber == null) || Math.Abs(Convert.ToInt64(i.Caliber) - Convert.ToInt64(input.Caliber)) <= _caliberTolerance) && //鐩村緞绾︽潫
+ i.Material == input.Material //鏉愭枡绾︽潫
+ ).ToList();
+ if (absoluteMatching.Count > 1)
{
- int commonCount = GetIntersect(input.ModelType, range.KeyWord);
- if (commonCount > firstCount)
- {
- vmo = range;
- firstCount = commonCount;
- }
+ return false;
}
+ else if (absoluteMatching.Count == 1)
+ {
+ vmo = absoluteMatching.First();
+ }
+ else
+ return false;
+ }
+ else if (nameMatching.Count == 1)
+ {
+ vmo = nameMatching.First();
}
else
{
- //鍖洪棿鍖归厤
- var rangeMatch = adaptingManageVmos.Where(item =>
+ var absoluteMatching = elbowMainVmos.Where(i =>
+ ((i.Caliber == null || input.Caliber == null) || Math.Abs(Convert.ToInt64(i.Caliber) - Convert.ToInt64(input.Caliber)) <= _caliberTolerance) && //鐩村緞绾︽潫
+ i.Material == input.Material //鏉愭枡绾︽潫
+ ).ToList();
+ if (absoluteMatching.Count > 1)
{
- if (item.Caliber != null && input.Caliber != null)
- {
- return Math.Abs(Convert.ToInt64(item.Caliber - input.Caliber)) <= _caliberTolerance;
- }
- else
- {
- if (item.Caliber == null)
- {
- return true;
- }
- }
return false;
- })
- .ToList();
- if (rangeMatch != null && rangeMatch.Count > 0)
- {
- var materialList = new List<Vmo.AssetsElbowMainVmo>();
- foreach (var range in rangeMatch)
- {
- //浠ユ潗鏂欎负鏉′欢寮�濮嬪尮閰�
- if (range.MaterialName == null)
- {
- materialList.Add(range);
- }
- else
- {
- int commonCount = GetIntersect(input.Material, range.MaterialName);
- if (commonCount > firstCount)
- {
- materialList.Add(range);
- firstCount = commonCount;
- }
- }
- }
- //鐢ㄥ凡缁忕瓫閫夊畬鎴愮殑鍒楄〃涓互鍚嶇О绛涢��
- firstCount = 0;
- foreach (var material in materialList)
- {
- int commonCount = GetIntersect(input.ModelType, material.KeyWord);
- if (commonCount > firstCount)
- {
- vmo = material;
- firstCount = commonCount;
- }
- }
}
- }
- //鍙ｅ緞鍜屾潗鏂欓兘娌℃湁鍖归厤涓�,灏辩敤鍨嬪彿鍚嶅尮閰�
- firstCount = 0;
- if (vmo == null)
- {
- foreach (var item in adaptingManageVmos)
+ else if (absoluteMatching.Count == 1)
{
- int commonCount = GetIntersect(input.ModelType, item.Name);
- if (commonCount > firstCount)
- {
- vmo = item;
- firstCount = commonCount;
- }
+ vmo = absoluteMatching.First();
}
+ else
+ return false;
}
if (vmo != null)
{
- input.MatchingMinorLoss = vmo.Coefficient;
+ input.MatchingMinorLoss = vmo.MinorLoss;
input.MatchingDbId = vmo.ID.ToString();
- input.MatchingMaterial = vmo.MaterialName;
+ input.MatchingMaterial = vmo.Material;
input.MatchingModelType = vmo.Name;
+ input.MatchingConnectionLength = vmo.ElbowLengthType;
+ input.MatchingAngle = vmo.Angle;
return true;
}
return false;
}
//涓夐�氬尮閰�
- public static bool MatchingThreelink(ThreelinkMatchingViewModel input, List<Vmo.AssetsThreelinkMainVmo> adaptingManageVmos)
+ public static bool MatchingThreelink(ThreelinkMatchingViewModel input, List<Vmo.AssetsThreelinkMainVmo> threelinkVmos)
{
- if (adaptingManageVmos == null)
+ Vmo.AssetsThreelinkMainVmo vmo = null;
+ if (threelinkVmos == null)
{
return true;
}
- Vmo.AssetsThreelinkMainVmo vmo = null;
- int firstCount = 0;
- //鍙ｅ緞鏈�灏忓樊鍊�
- // 缁濆鍖归厤
- var absoluteMatch = adaptingManageVmos.Where(i =>
- ((input.Caliber == null && i.Caliber == null) || i.Caliber == input.Caliber) &&
- ((input.Material == null) || i.MaterialName == input.Material)).ToList();
- if (absoluteMatch.Any())
+ var nameMatching = threelinkVmos.Where(x =>
+ (x.KeyWord != null && x.KeyWord.Any(keyword => GetIntersect(keyword, input.ModelType) >= 1)) ||
+ (x.KeyWord == null || !x.KeyWord.Any()) && GetIntersect(x.Name, input.ModelType) >= 1
+ ) //鍏堣繘琛岀瓫閫�,鍚庤繘琛屼粠澶у埌灏忔帓搴�
+ .OrderByDescending(x =>
+ (x.KeyWord != null && x.KeyWord.Any(keyword => GetIntersect(keyword, input.ModelType) >= 1)) ||
+ (x.KeyWord == null || !x.KeyWord.Any()) && GetIntersect(x.Name, input.ModelType) >= 1).ToList();
+
+ if (nameMatching.Count > 1)
{
- foreach (var range in absoluteMatch)
+ var absoluteMatching = nameMatching.Where(i =>
+ ((i.Caliber == null || input.Caliber == null) || Math.Abs(Convert.ToInt64(i.Caliber) - Convert.ToInt64(input.Caliber)) <= _caliberTolerance) && //鐩村緞绾︽潫
+ i.Material == input.Material //鏉愭枡绾︽潫
+ ).ToList();
+ if (absoluteMatching.Count > 1)
{
- int commonCount = GetIntersect(input.ModelType, range.Name);
- if (commonCount > firstCount)
- {
- vmo = range;
- firstCount = commonCount;
- }
+ return false;
}
+ else if (absoluteMatching.Count == 1)
+ {
+ vmo = absoluteMatching.First();
+ }
+ else
+ return false;
+ }
+ else if (nameMatching.Count == 1)
+ {
+ vmo = nameMatching.First();
}
else
{
- //鍖洪棿鍖归厤
- var rangeMatch = adaptingManageVmos.Where(item =>
+ var absoluteMatching = threelinkVmos.Where(i =>
+ ((i.Caliber == null || input.Caliber == null) || Math.Abs(Convert.ToInt64(i.Caliber) - Convert.ToInt64(input.Caliber)) <= _caliberTolerance) && //鐩村緞绾︽潫
+ i.Material == input.Material //鏉愭枡绾︽潫
+ ).ToList();
+ if (absoluteMatching.Count > 1)
{
- if (item.Caliber != null && input.Caliber != null)
- {
- return Math.Abs(Convert.ToInt64(item.Caliber - input.Caliber)) <= _caliberTolerance;
- }
- else
- {
- if (item.Caliber == null)
- {
- return true;
- }
- }
return false;
- })
- .ToList();
- if (rangeMatch != null && rangeMatch.Count > 0)
- {
- var materialList = new List<Vmo.AssetsThreelinkMainVmo>();
- foreach (var range in rangeMatch)
- {
- //浠ユ潗鏂欎负鏉′欢寮�濮嬪尮閰�
- if (range.MaterialName == null)
- {
- materialList.Add(range);
- }
- else
- {
- int commonCount = GetIntersect(input.Material, range.MaterialName);
- if (commonCount > firstCount)
- {
- materialList.Add(range);
- firstCount = commonCount;
- }
- }
- }
- //鐢ㄥ凡缁忕瓫閫夊畬鎴愮殑鍒楄〃涓互鍚嶇О绛涢��
- firstCount = 0;
- foreach (var material in materialList)
- {
- int commonCount = GetIntersect(input.ModelType, material.Name);
- if (commonCount > firstCount)
- {
- vmo = material;
- firstCount = commonCount;
- }
- }
}
- }
- //鍙ｅ緞鍜屾潗鏂欓兘娌℃湁鍖归厤涓�,灏辩敤鍨嬪彿鍚嶅尮閰�
- firstCount = 0;
- if (vmo == null)
- {
- foreach (var item in adaptingManageVmos)
+ else if (absoluteMatching.Count == 1)
{
- int commonCount = GetIntersect(input.ModelType, item.Name);
- if (commonCount > firstCount)
- {
- vmo = item;
- firstCount = commonCount;
- }
+ vmo = absoluteMatching.First();
}
+ else
+ return false;
}
if (vmo != null)
{
- input.MatchingMinorLoss = vmo.Coefficient;
+ input.MatchingMinorLoss = vmo.MinorLoss;
input.MatchingDbId = vmo.ID.ToString();
- input.MatchingMaterial = vmo.MaterialName;
+ input.MatchingMaterial = vmo.Material;
input.MatchingModelType = vmo.Name;
+ input.MatchingRunThroughCoefficient = vmo.RunThroughMinorLoss;
+ input.MatchingBranchThroughCoefficient = vmo.BranchThroughMinorLoss;
return true;
}
return false;
}
//鍥涢�氬尮閰�
- public static bool MatchingFourlink(FourlinkMatchingViewModel input, List<Vmo.AssetsFourlinkMainVmo> adaptingManageVmos)
+ public static bool MatchingFourlink(FourlinkMatchingViewModel input, List<Vmo.AssetsFourlinkMainVmo> fourLinkVmos)
{
- if (adaptingManageVmos == null)
+ if (fourLinkVmos == null)
{
return true;
}
Vmo.AssetsFourlinkMainVmo vmo = null;
- int firstCount = 0;
- //鍙ｅ緞鏈�灏忓樊鍊�
- // 缁濆鍖归厤
- var absoluteMatch = adaptingManageVmos.Where(i =>
- ((input.Caliber == null && i.Caliber == null) || i.Caliber == input.Caliber) &&
- ((input.Material == null) || i.MaterialName == input.Material)).ToList();
- if (absoluteMatch.Any())
+ var nameMatching = fourLinkVmos.Where(x =>
+ (x.KeyWord != null && x.KeyWord.Any(keyword => GetIntersect(keyword, input.ModelType) >= 1)) ||
+ (x.KeyWord == null || !x.KeyWord.Any()) && GetIntersect(x.Name, input.ModelType) >= 1
+ ) //鍏堣繘琛岀瓫閫�,鍚庤繘琛屼粠澶у埌灏忔帓搴�
+.OrderByDescending(x =>
+ (x.KeyWord != null && x.KeyWord.Any(keyword => GetIntersect(keyword, input.ModelType) >= 1)) ||
+ (x.KeyWord == null || !x.KeyWord.Any()) && GetIntersect(x.Name, input.ModelType) >= 1).ToList();
+
+ if (nameMatching.Count > 1)
{
- foreach (var range in absoluteMatch)
+ var absoluteMatching = nameMatching.Where(i =>
+ ((i.Caliber == null || input.Caliber == null) || Math.Abs(Convert.ToInt64(i.Caliber) - Convert.ToInt64(input.Caliber)) <= _caliberTolerance) && //鐩村緞绾︽潫
+ i.Material == input.Material //鏉愭枡绾︽潫
+ ).ToList();
+ if (absoluteMatching.Count > 1)
{
- int commonCount = GetIntersect(input.ModelType, range.Name);
- if (commonCount > firstCount)
- {
- vmo = range;
- firstCount = commonCount;
- }
+ return false;
}
+ else if (absoluteMatching.Count == 1)
+ {
+ vmo = absoluteMatching.First();
+ }
+ else
+ return false;
+ }
+ else if (nameMatching.Count == 1)
+ {
+ vmo = nameMatching.First();
}
else
{
- //鍖洪棿鍖归厤
- var rangeMatch = adaptingManageVmos.Where(item =>
+ var absoluteMatching = fourLinkVmos.Where(i =>
+ ((i.Caliber == null || input.Caliber == null) || Math.Abs(Convert.ToInt64(i.Caliber) - Convert.ToInt64(input.Caliber)) <= _caliberTolerance) && //鐩村緞绾︽潫
+ i.Material == input.Material //鏉愭枡绾︽潫
+ ).ToList();
+ if (absoluteMatching.Count > 1)
{
- if (item.Caliber != null && input.Caliber != null)
- {
- return Math.Abs(Convert.ToInt64(item.Caliber - input.Caliber)) <= _caliberTolerance;
- }
- else
- {
- if (item.Caliber == null)
- {
- return true;
- }
- }
return false;
- })
- .ToList();
- if (rangeMatch != null && rangeMatch.Count > 0)
- {
- var materialList = new List<Vmo.AssetsFourlinkMainVmo>();
- foreach (var range in rangeMatch)
- {
- //浠ユ潗鏂欎负鏉′欢寮�濮嬪尮閰�
- if (range.MaterialName == null)
- {
- materialList.Add(range);
- }
- else
- {
- int commonCount = GetIntersect(input.Material, range.MaterialName);
- if (commonCount > firstCount)
- {
- materialList.Add(range);
- firstCount = commonCount;
- }
- }
- }
- //鐢ㄥ凡缁忕瓫閫夊畬鎴愮殑鍒楄〃涓互鍚嶇О绛涢��
- firstCount = 0;
- foreach (var material in materialList)
- {
- int commonCount = GetIntersect(input.ModelType, material.Name);
- if (commonCount > firstCount)
- {
- vmo = material;
- firstCount = commonCount;
- }
- }
}
- }
- //鍙ｅ緞鍜屾潗鏂欓兘娌℃湁鍖归厤涓�,灏辩敤鍨嬪彿鍚嶅尮閰�
- firstCount = 0;
- if (vmo == null)
- {
- foreach (var item in adaptingManageVmos)
+ else if (absoluteMatching.Count == 1)
{
- int commonCount = GetIntersect(input.ModelType, item.KeyWord);
- if (commonCount > firstCount)
- {
- vmo = item;
- firstCount = commonCount;
- }
+ vmo = absoluteMatching.First();
}
+ else
+ return false;
}
if (vmo != null)
{
- input.MatchingMinorLoss = vmo.Coefficient;
+ input.MatchingMinorLoss = vmo.MinorLoss;
input.MatchingDbId = vmo.ID.ToString();
- input.MatchingMaterial = vmo.MaterialName;
+ input.MatchingMaterial = vmo.Material;
input.MatchingModelType = vmo.Name;
return true;
}
@@ -703,13 +601,9 @@
/// <summary>
/// 鑾峰彇涓や釜瀛楃涓茬殑鎵�鏈変氦闆�
/// </summary>
- /// <param name="str1"></param>
- /// <param name="str2"></param>
- /// <returns></returns>
public static int GetIntersect(string str1, string str2)
{
if (str1 == null || str2 == null) return 0;
-
return string.Join("", str1.Intersect(str2)).Count();
}
}
--
Gitblit v1.9.3