From 3fa2fa94353dad7d2ccb65a0d1db9c9433c11c80 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 28 十月 2024 14:56:24 +0800
Subject: [PATCH] 检查控件优化
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingHelper.cs | 620 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 330 insertions(+), 290 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingHelper.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingHelper.cs
index 34281f8..04fb8e8 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingHelper.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingHelper.cs
@@ -1,5 +1,6 @@
锘縰sing HStation.Vmo;
using HStation.WinFrmUI.PhartRelation;
+using System.Windows.Input;
namespace HStation.WinFrmUI
{
@@ -12,87 +13,98 @@
private const double _headTolerance = 5;
private const double _powerTolerance = 0.05;
- //璧勪骇鑷姩鍖归厤
- public static async Task<bool> Matching(AssetsMatchingViewModel assetsAutoMatchingView)
- {
- bool IsMaching = false;
- var pumpMain = new BLL.PumpMain();
- var adaptingManage = new BLL.AdaptingManage();
- var pipeLineManage = new BLL.PipeMain();
- var valveMain = new BLL.ValveMain();
- var elbowMain = new BLL.ElbowMain();
- var threeLinkMain = new BLL.ThreeLinkMain();
- var fourLinkMain = new BLL.FourLinkMain();
+ private const double _valveLift = 10;//闃�闂ㄥ紑搴﹁寖鍥�
+ private const int _angle = 1;//瑙掑害鑼冨洿
- var allPump = await pumpMain.GetAll();
- var allAdapting = await adaptingManage.GetAll();
- var allPipeLine = await pipeLineManage.GetAll();
- var allValve = await valveMain.GetAll();
- var allElbow = await elbowMain.GetAll();
- var allThreeLink = await threeLinkMain.GetAll();
- var allFourLink = await fourLinkMain.GetAll();
- //娉靛尮閰�
- foreach (var item in assetsAutoMatchingView.PumpMatchingList)
+ //璧勪骇鑷姩鍖归厤
+ 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();
+ var pipeLineManage = new BLL.AssetsPipeMain();
+ var AssetsValveMain = new BLL.AssetsValveMain();
+ var AssetsElbowMain = new BLL.AssetsElbowMain();
+ var AssetsThreelinkMain = new BLL.AssetsThreelinkMain();
+ var AssetsFourlinkMain = new BLL.AssetsFourlinkMain();
+ 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.PumpMainVmo> pumpMainVmos)
+ public static bool MatchingPumps(PumpMatchingViewModel InputModel, List<Vmo.AssetsPumpMainVmo> AssetsPumpMainVmos)
{
- if (pumpMainVmos == null)
+ if (AssetsPumpMainVmos == null)
{
return true;
}
- Vmo.PumpMainVmo vmo = null;
+ Vmo.AssetsPumpMainVmo vmo = null;
int startCount = 0;
// 灏濊瘯缁濆鍖归厤
- var absoluteMatch = pumpMainVmos.Where(item =>
+ var absoluteMatch = AssetsPumpMainVmos.Where(item =>
(InputModel.RatedN == null || InputModel.RatedN == item.RatedSpeed) &&
(InputModel.RatedQ == null || InputModel.RatedQ == item.RatedFlow) &&
(InputModel.RatedH == null || InputModel.RatedH == item.RatedHead) &&
@@ -112,7 +124,7 @@
else
{
// 灏濊瘯鍖洪棿鍖归厤
- var rangeMatch = pumpMainVmos.Where(item =>
+ var rangeMatch = AssetsPumpMainVmos.Where(item =>
(InputModel.RatedN.HasValue ? Math.Abs(InputModel.RatedN.Value - item.RatedSpeed) <= _speedTolerance : true) &&
(InputModel.RatedQ.HasValue ? Math.Abs(InputModel.RatedQ.Value - item.RatedFlow) <= _flowTolerance : true) &&
(InputModel.RatedH.HasValue ? Math.Abs(InputModel.RatedH.Value - item.RatedHead) <= _headTolerance : true) &&
@@ -133,7 +145,7 @@
//
if (vmo == null)
{
- foreach (var item in pumpMainVmos)
+ foreach (var item in AssetsPumpMainVmos)
{
int commonCount = GetIntersect(InputModel.ModelType, item.Name);
if (commonCount > startCount)
@@ -151,7 +163,7 @@
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();
@@ -192,53 +204,98 @@
}
//闃�闂ㄥ尮閰�
- public static bool MatchingValve(ValveMatchingViewModel input, List<Vmo.ValveMainVmo> adaptingManageVmos)
+ public static bool MatchingValve(ValveMatchingViewModel input, List<Vmo.AssetsValveMainVmo> adaptingManageVmos)
{
if (adaptingManageVmos == null)
{
return true;
}
- HStation.Vmo.ValveMainVmo vmo = null;
- int firstCount = 0;
+ HStation.Vmo.AssetsValveMainVmo vmo = null;
//鍙ｅ緞鏈�灏忓樊鍊�
// 缁濆鍖归厤
- var absoluteMatch = adaptingManageVmos.Where(i =>
- ((i.Caliber == null) || i.Caliber == input.Diameter) &&
- ((input.Material == null) || i.MaterialName == input.Material)).ToList();
- if (absoluteMatch.Any())
+ adaptingManageVmos = adaptingManageVmos.Where(x => x.Type.ToString() == input.ValveType).ToList();
+ var nameMatching = adaptingManageVmos.Where(x => GetIntersect(x.KeyWord == string.Empty
+ ? x.Name : x.KeyWord, input.ModelType) >= 1)
+ .OrderByDescending(x => GetIntersect(x.KeyWord == string.Empty ? x.Name : x.KeyWord, input.ModelType))
+ .ToList();//浣跨敤鍨嬪彿鍚嶆垨鑰呭叧閿瓧鎵惧嚭鐩稿悓瀛楃鍦�2浠ヤ笂骞朵笖杩涜鎺掑簭
+ 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.MaterialName == input.Material && //鏉愭枡绾︽潫
+ (i.ValveLift == input.ValveLift || Math.Abs(Convert.ToInt64(i.ValveLift) - Convert.ToInt64(input.ValveLift)) <= _valveLift) //闃�闂ㄥ紑搴︾害鏉�
+ ).ToList();
+ if (absoluteMatching.Count > 1)
{
- int commonCount = GetIntersect(input.ModelType, range.KeyWord);
- if (commonCount > firstCount)
+ return false;
+ }
+ else if (absoluteMatching.Count == 1)
+ {
+ vmo = absoluteMatching.First();
+ }
+ else
+ return false;
+ }
+ else if (nameMatching.Count == 1)
+ {
+ vmo = nameMatching.First();
+ }
+ else
+ {
+ var absoluteMatching = adaptingManageVmos.Where(i =>
+ ((i.Caliber == null) || Math.Abs(Convert.ToInt64(i.Caliber) - input.Diameter) <= _caliberTolerance) && //鐩村緞绾︽潫
+ i.MaterialName == input.Material && //鏉愭枡绾︽潫
+ (i.ValveLift == input.ValveLift || Math.Abs(Convert.ToInt64(i.ValveLift) - Convert.ToInt64(input.ValveLift)) <= _valveLift) //闃�闂ㄥ紑搴︾害鏉�
+ ).ToList();
+ if (absoluteMatching.Count > 1)
+ {
+ return false;
+ }
+ else if (absoluteMatching.Count == 1)
+ {
+ vmo = absoluteMatching.First();
+ }
+ else
+ return false;
+ }
+
+ /*var absoluteMatch = adaptingManageVmos.Where(i =>
+ ((i.Caliber == null) || i.Caliber == input.Diameter) &&
+ ((input.Material == null && i.MaterialName == null) || i.MaterialName == input.Material)).ToList();
+ if (absoluteMatch.Count > 1)
+ {
+ var allMatchingList = absoluteMatch
+ .Where(x => GetIntersect(x.KeyWord == string.Empty
+ ? x.Name : x.KeyWord, input.ModelType) >= 2)
+ .OrderByDescending(x => GetIntersect(x.KeyWord == string.Empty ? x.Name : x.KeyWord, input.ModelType))
+ .ToList();//鎵惧嚭鐩稿悓瀛楃鍦�2浠ヤ笂骞朵笖杩涜鎺掑簭
+ if (allMatchingList.Count < 1)
+ return false;//閫氳繃鍨嬪彿鍚嶆病鏈夋壘鍒�,鍒欒涓烘病鏈夊尮閰嶅埌
+ foreach (var item in allMatchingList)
+ {
+ if (item.IsDefault)
{
- vmo = range;
- firstCount = commonCount;
+ vmo = item;
}
}
+ vmo = allMatchingList.First();//濡傛灉娌℃湁璁剧疆榛樿鍊�,鍒欓粯璁よ繑鍥炲尮閰嶅瓧绗︽渶澶氱殑涓�鏉℃暟鎹�
+ }
+ else if (absoluteMatch.Count == 1)
+ {
+ vmo = absoluteMatch.First();
}
else
{
//鍖洪棿鍖归厤
- var rangeMatch = adaptingManageVmos.Where(item =>
- {
- if (item.Caliber.HasValue)
- {
- return Math.Abs(Convert.ToInt64(item.Caliber - input.Diameter)) <= _caliberTolerance;
- }
- else
- {
- if (item.Caliber == null)
- {
- return true;
- }
- }
- return false;
- })
- .ToList();
+ var rangeMatch = adaptingManageVmos
+ .Where(item =>
+ item.Caliber == null ||
+ Math.Abs(Convert.ToInt64(item.Caliber) - Convert.ToInt64(input.Diameter)) <= _caliberTolerance
+ || Math.Abs(Convert.ToInt64(item.ValveLift) - Convert.ToInt64(input.ValveLift)) <= _valveLift)
+ .ToList();
if (rangeMatch != null && rangeMatch.Count > 0)
{
- var materialList = new List<Vmo.ValveMainVmo>();
+ var materialList = new List<Vmo.AssetsValveMainVmo>();
foreach (var range in rangeMatch)
{
//浠ユ潗鏂欎负鏉′欢寮�濮嬪尮閰�
@@ -258,31 +315,26 @@
}
//鐢ㄥ凡缁忕瓫閫夊畬鎴愮殑鍒楄〃涓互鍚嶇О绛涢��
firstCount = 0;
- foreach (var material in materialList)
+ if (materialList.Count < 1)
+ return false;
+ var allMatchingList = materialList
+ .Where(x => GetIntersect(x.KeyWord == string.Empty ? x.Name : x.KeyWord, input.ModelType) >= 2)
+ .OrderByDescending(x => GetIntersect(x.KeyWord == string.Empty ? x.Name : x.KeyWord, input.ModelType))
+ .ToList();//鎵惧嚭鐩稿悓瀛楃鍦�2浠ヤ笂骞朵笖杩涜鎺掑簭
+ if (allMatchingList.Count < 1)
+ return false;//閫氳繃鍨嬪彿鍚嶆病鏈夋壘鍒�,鍒欒涓烘病鏈夊尮閰嶅埌
+ foreach (var item in allMatchingList)
{
- int commonCount = GetIntersect(input.ModelType, material.KeyWord);
- if (commonCount > firstCount)
+ if (item.IsDefault)
{
- vmo = material;
- firstCount = commonCount;
+ vmo = item;
}
}
+ vmo = allMatchingList.First();//濡傛灉娌℃湁璁剧疆榛樿鍊�,鍒欓粯璁よ繑鍥炲尮閰嶅瓧绗︽渶澶氱殑涓�鏉℃暟鎹�
}
}
//鍙ｅ緞鍜屾潗鏂欓兘娌℃湁鍖归厤涓�,灏辩敤鍨嬪彿鍚嶅尮閰�
- firstCount = 0;
- if (vmo == null)
- {
- foreach (var item in adaptingManageVmos)
- {
- int commonCount = GetIntersect(input.ModelType, item.KeyWord);
- if (commonCount > firstCount)
- {
- vmo = item;
- firstCount = commonCount;
- }
- }
- }
+ firstCount = 0;*/
if (vmo != null)
{
input.MatchingMinorLoss = vmo.Coefficient;
@@ -290,78 +342,83 @@
input.MatchingDiameter = vmo.Caliber;
input.MatchingMaterial = vmo.MaterialName;
input.MatchingModelType = vmo.Name;
- // input.MatchingValveSetting =
- input.MatchingValveType = vmo.SeriesType.ToString();
+ input.MatchingValveSetting = vmo.ValveSetting;
+ input.MatchingValveLift = vmo.ValveLift;
+ input.MatchingValveType = vmo.Type.ToString();
return true;
}
return false;
}
//绠￠亾鍖归厤
- public static bool MatchingPipe(PipeMatchingViewModel input, List<Vmo.PipeMainVmo> pipeLineManageVmos)
+ public static bool MatchingPipe(PipeMatchingViewModel input, List<Vmo.AssetsPipeMainVmo> pipeLineManageVmos)
{
if (pipeLineManageVmos == null)
{
return true;
}
- Vmo.PipeMainVmo vmo = null;
- int StartCount = 0;
+ Vmo.AssetsPipeMainVmo vmo = null;
+ int firstCount = 0;
//鍙ｅ緞鏈�灏忓樊鍊�
// 缁濆鍖归厤
var absoluteMatch = pipeLineManageVmos.Where(i =>
((i.Caliber == null) || i.Caliber == input.Diameter) &&
((input.Material == null) || i.MaterialName == input.Material)).ToList();
- if (absoluteMatch.Any())
+ if (absoluteMatch.Count > 1)
{
- foreach (var range in absoluteMatch)
- {
- int commonCount = GetIntersect(input.ModelType, range.KeyWord);
- if (commonCount > StartCount)
- {
- vmo = range;
- StartCount = commonCount;
- }
- }
+ }
+ else if (absoluteMatch.Count == 1)
+ {
+ vmo = absoluteMatch.First();
}
else
{
//鍖洪棿鍖归厤
- var rangeMatch = pipeLineManageVmos.Where(item =>
- {
- if (item.Caliber != null)
- {
- return Math.Abs(Convert.ToInt64(item.Caliber - input.Diameter)) <= _caliberTolerance;
- }
- return false;
- })
- .ToList();
+ var rangeMatch = pipeLineManageVmos
+ .Where(item =>
+ item.Caliber == null ||
+ Math.Abs(Convert.ToInt64(item.Caliber) - Convert.ToInt64(input.Diameter)) <= _caliberTolerance)
+ .ToList();
if (rangeMatch != null)
{
+ var materialList = new List<Vmo.AssetsPipeMainVmo>();
foreach (var range in rangeMatch)
{
//浠ユ潗鏂欎负鏉′欢寮�濮嬪尮閰�
- int commonCount = GetIntersect(input.Material, range.MaterialName);
- if (commonCount > StartCount)
+ if (range.MaterialName == null)
{
- vmo = range;
- StartCount = commonCount;
+ materialList.Add(range);
+ }
+ else
+ {
+ int commonCount = GetIntersect(input.Material, range.MaterialName);
+ if (commonCount > firstCount)
+ {
+ materialList.Add(range);
+ firstCount = commonCount;
+ }
}
}
+ firstCount = 0;
+ if (materialList.Count < 1)
+ return false;
+ var allMatchingList = materialList
+ .Where(x => GetIntersect(x.KeyWord == string.Empty ? x.Name : x.KeyWord, input.ModelType) >= 2)
+ .OrderByDescending(x => GetIntersect(x.KeyWord == string.Empty ? x.Name : x.KeyWord, input.ModelType))
+ .ToList();//鎵惧嚭鐩稿悓瀛楃鍦�2浠ヤ笂骞朵笖杩涜鎺掑簭
+ if (allMatchingList.Count < 1)
+ return false;//閫氳繃鍨嬪彿鍚嶆病鏈夋壘鍒�,鍒欒涓烘病鏈夊尮閰嶅埌
+ foreach (var item in allMatchingList)
+ {
+ if (item.IsDefault)
+ {
+ vmo = item;
+ }
+ }
+ vmo = allMatchingList.First();//濡傛灉娌℃湁璁剧疆榛樿鍊�,鍒欓粯璁よ繑鍥炲尮閰嶅瓧绗︽渶澶氱殑涓�鏉℃暟鎹�
}
}
//鍙ｅ緞鍜屾潗鏂欓兘娌℃湁鍖归厤涓�,灏辩敤鍨嬪彿鍚嶅尮閰�
- if (vmo == null)
- {
- foreach (var item in pipeLineManageVmos)
- {
- int commonCount = GetIntersect(input.ModelType, item.KeyWord);
- if (commonCount > StartCount)
- {
- vmo = item;
- StartCount = commonCount;
- }
- }
- }
if (vmo != null)
{
switch (input.eAlgorithmType)
@@ -392,53 +449,54 @@
}
//寮ご鍖归厤
- public static bool MatchingElbow(ElbowMatchingViewModel input, List<Vmo.ElbowMainVmo> adaptingManageVmos)
+ public static bool MatchingElbow(ElbowMatchingViewModel input, List<Vmo.AssetsElbowMainVmo> adaptingManageVmos)
{
if (adaptingManageVmos == null)
{
return true;
}
- Vmo.ElbowMainVmo vmo = null;
+ 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())
+ if (absoluteMatch.Count > 1)
{
- foreach (var range in absoluteMatch)
+ var allMatchingList = absoluteMatch
+ .Where(x => GetIntersect(x.KeyWord == string.Empty ? x.Name : x.KeyWord, input.ModelType) >= 2)
+ .OrderByDescending(x => GetIntersect(x.KeyWord == string.Empty ? x.Name : x.KeyWord, input.ModelType))
+ .ToList();//鎵惧嚭鐩稿悓瀛楃鍦�2浠ヤ笂骞朵笖杩涜鎺掑簭
+ if (allMatchingList.Count < 1)
+ return false;//閫氳繃鍨嬪彿鍚嶆病鏈夋壘鍒�,鍒欒涓烘病鏈夊尮閰嶅埌
+ foreach (var item in allMatchingList)
{
- int commonCount = GetIntersect(input.ModelType, range.KeyWord);
- if (commonCount > firstCount)
+ if (item.IsDefault)
{
- vmo = range;
- firstCount = commonCount;
+ vmo = item;
}
}
+ vmo = allMatchingList.First();//濡傛灉娌℃湁璁剧疆榛樿鍊�,鍒欓粯璁よ繑鍥炲尮閰嶅瓧绗︽渶澶氱殑涓�鏉℃暟鎹�
+ }
+ else if (absoluteMatch.Count == 1)
+ {
+ vmo = absoluteMatch.First();
}
else
{
//鍖洪棿鍖归厤
- var rangeMatch = adaptingManageVmos.Where(item =>
- {
- 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();
+ var rangeMatch = adaptingManageVmos
+ .Where(item =>
+ (input.Caliber == null && input.Caliber == null)
+ || (item.Caliber.HasValue && input.Caliber.HasValue) && //瀛樺湪鍊�,鍒欒繘琛屼笅闈㈠樊鍊煎垽鏂�
+ Math.Abs(Convert.ToInt64(item.Caliber) - Convert.ToInt64(input.Caliber)) <= _caliberTolerance
+ || item.ConnectionLength == input.ConnectionLength
+ || (item.Angle.HasValue && input.Angle.HasValue) && //瀛樺湪鍊�,鍒欒繘琛屼笅闈㈠樊鍊煎垽鏂�
+ Math.Abs(Convert.ToInt64(item.Angle) - Convert.ToInt64(input.Angle)) <= _angle)
+ .ToList();
if (rangeMatch != null && rangeMatch.Count > 0)
{
- var materialList = new List<Vmo.ElbowMainVmo>();
+ var materialList = new List<Vmo.AssetsElbowMainVmo>();
foreach (var range in rangeMatch)
{
//浠ユ潗鏂欎负鏉′欢寮�濮嬪尮閰�
@@ -458,90 +516,85 @@
}
//鐢ㄥ凡缁忕瓫閫夊畬鎴愮殑鍒楄〃涓互鍚嶇О绛涢��
firstCount = 0;
- foreach (var material in materialList)
+ if (materialList.Count < 1)
+ return false;
+ var allMatchingList = materialList
+ .Where(x => GetIntersect(x.KeyWord == string.Empty ? x.Name : x.KeyWord, input.ModelType) >= 2)
+ .OrderByDescending(x => GetIntersect(x.KeyWord == string.Empty ? x.Name : x.KeyWord, input.ModelType))
+ .ToList();//鎵惧嚭鐩稿悓瀛楃鍦�2浠ヤ笂骞朵笖杩涜鎺掑簭
+ if (allMatchingList.Count < 1)
+ return false;//閫氳繃鍨嬪彿鍚嶆病鏈夋壘鍒�,鍒欒涓烘病鏈夊尮閰嶅埌
+ foreach (var item in allMatchingList)
{
- int commonCount = GetIntersect(input.ModelType, material.KeyWord);
- if (commonCount > firstCount)
+ if (item.IsDefault)
{
- vmo = material;
- firstCount = commonCount;
+ vmo = item;
}
}
+ vmo = allMatchingList.First();//濡傛灉娌℃湁璁剧疆榛樿鍊�,鍒欓粯璁よ繑鍥炲尮閰嶅瓧绗︽渶澶氱殑涓�鏉℃暟鎹�
}
}
- //鍙ｅ緞鍜屾潗鏂欓兘娌℃湁鍖归厤涓�,灏辩敤鍨嬪彿鍚嶅尮閰�
+ //绮剧‘鍖归厤鍜岀矖绯欏尮閰嶉兘娌℃湁鍖归厤鍒板氨杩斿洖閿欒
firstCount = 0;
- if (vmo == null)
- {
- foreach (var item in adaptingManageVmos)
- {
- int commonCount = GetIntersect(input.ModelType, item.Name);
- if (commonCount > firstCount)
- {
- vmo = item;
- firstCount = commonCount;
- }
- }
- }
if (vmo != null)
{
input.MatchingMinorLoss = vmo.Coefficient;
input.MatchingDbId = vmo.ID.ToString();
input.MatchingMaterial = vmo.MaterialName;
input.MatchingModelType = vmo.Name;
+ input.MatchingConnectionLength = vmo.ConnectionLength;
+ input.MatchingAngle = vmo.Angle;
return true;
}
return false;
}
//涓夐�氬尮閰�
- public static bool MatchingThreelink(ThreelinkMatchingViewModel input, List<Vmo.ThreeLinkMainVmo> adaptingManageVmos)
+ public static bool MatchingThreelink(ThreelinkMatchingViewModel input, List<Vmo.AssetsThreelinkMainVmo> adaptingManageVmos)
{
if (adaptingManageVmos == null)
{
return true;
}
- Vmo.ThreeLinkMainVmo vmo = null;
+ 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())
+ if (absoluteMatch.Count > 1)
{
- foreach (var range in absoluteMatch)
+ var allMatchingList = absoluteMatch
+ .Where(x => GetIntersect(x.KeyWord == string.Empty ? x.Name : x.KeyWord, input.ModelType) >= 2)
+ .OrderByDescending(x => GetIntersect(x.KeyWord == string.Empty ? x.Name : x.KeyWord, input.ModelType))
+ .ToList();//鎵惧嚭鐩稿悓瀛楃鍦�2浠ヤ笂骞朵笖杩涜鎺掑簭
+ if (allMatchingList.Count < 1)
+ return false;//閫氳繃鍨嬪彿鍚嶆病鏈夋壘鍒�,鍒欒涓烘病鏈夊尮閰嶅埌
+ foreach (var item in allMatchingList)
{
- int commonCount = GetIntersect(input.ModelType, range.Name);
- if (commonCount > firstCount)
+ if (item.IsDefault)
{
- vmo = range;
- firstCount = commonCount;
+ vmo = item;
}
}
+ vmo = allMatchingList.First();//濡傛灉娌℃湁璁剧疆榛樿鍊�,鍒欓粯璁よ繑鍥炲尮閰嶅瓧绗︽渶澶氱殑涓�鏉℃暟鎹�
+ }
+ else if (absoluteMatch.Count == 1)
+ {
+ vmo = absoluteMatch.First();
}
else
{
//鍖洪棿鍖归厤
- var rangeMatch = adaptingManageVmos.Where(item =>
- {
- 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();
+ var rangeMatch = adaptingManageVmos
+ .Where(item =>
+ input.Caliber == null ||
+ item.Caliber == null ||
+ Math.Abs(Convert.ToInt64(item.Caliber) - Convert.ToInt64(input.Caliber)) <= _caliberTolerance)
+ .ToList();
if (rangeMatch != null && rangeMatch.Count > 0)
{
- var materialList = new List<Vmo.ThreeLinkMainVmo>();
+ var materialList = new List<Vmo.AssetsThreelinkMainVmo>();
foreach (var range in rangeMatch)
{
//浠ユ潗鏂欎负鏉′欢寮�濮嬪尮閰�
@@ -561,90 +614,85 @@
}
//鐢ㄥ凡缁忕瓫閫夊畬鎴愮殑鍒楄〃涓互鍚嶇О绛涢��
firstCount = 0;
- foreach (var material in materialList)
+ if (materialList.Count < 1)
+ return false;
+ var allMatchingList = materialList
+ .Where(x => GetIntersect(x.KeyWord == string.Empty ? x.Name : x.KeyWord, input.ModelType) >= 2)
+ .OrderByDescending(x => GetIntersect(x.KeyWord == string.Empty ? x.Name : x.KeyWord, input.ModelType))
+ .ToList();//鎵惧嚭鐩稿悓瀛楃鍦�2浠ヤ笂骞朵笖杩涜鎺掑簭
+ if (allMatchingList.Count < 1)
+ return false;//閫氳繃鍨嬪彿鍚嶆病鏈夋壘鍒�,鍒欒涓烘病鏈夊尮閰嶅埌
+ foreach (var item in allMatchingList)
{
- int commonCount = GetIntersect(input.ModelType, material.Name);
- if (commonCount > firstCount)
+ if (item.IsDefault)
{
- vmo = material;
- firstCount = commonCount;
+ vmo = item;
}
}
+ vmo = allMatchingList.First();//濡傛灉娌℃湁璁剧疆榛樿鍊�,鍒欓粯璁よ繑鍥炲尮閰嶅瓧绗︽渶澶氱殑涓�鏉℃暟鎹�
}
}
- //鍙ｅ緞鍜屾潗鏂欓兘娌℃湁鍖归厤涓�,灏辩敤鍨嬪彿鍚嶅尮閰�
+ //绮剧‘鍖归厤鍜岀矖绯欏尮閰嶉兘娌℃湁鍖归厤鍒板氨杩斿洖閿欒
firstCount = 0;
- if (vmo == null)
- {
- foreach (var item in adaptingManageVmos)
- {
- int commonCount = GetIntersect(input.ModelType, item.Name);
- if (commonCount > firstCount)
- {
- vmo = item;
- firstCount = commonCount;
- }
- }
- }
if (vmo != null)
{
input.MatchingMinorLoss = vmo.Coefficient;
input.MatchingDbId = vmo.ID.ToString();
input.MatchingMaterial = vmo.MaterialName;
input.MatchingModelType = vmo.Name;
+ input.MatchingRunThroughCoefficient = vmo.RunThroughCoefficient;
+ input.MatchingBranchThroughCoefficient = vmo.BranchThroughCoefficient;
return true;
}
return false;
}
//鍥涢�氬尮閰�
- public static bool MatchingFourlink(FourlinkMatchingViewModel input, List<Vmo.FourLinkMainVmo> adaptingManageVmos)
+ public static bool MatchingFourlink(FourlinkMatchingViewModel input, List<Vmo.AssetsFourlinkMainVmo> adaptingManageVmos)
{
if (adaptingManageVmos == null)
{
return true;
}
- Vmo.FourLinkMainVmo vmo = null;
+ 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())
+ if (absoluteMatch.Count > 1)
{
- foreach (var range in absoluteMatch)
+ var allMatchingList = absoluteMatch
+ .Where(x => GetIntersect(x.KeyWord == string.Empty ? x.Name : x.KeyWord, input.ModelType) >= 2)
+ .OrderByDescending(x => GetIntersect(x.KeyWord == string.Empty ? x.Name : x.KeyWord, input.ModelType))
+ .ToList();//鎵惧嚭鐩稿悓瀛楃鍦�2浠ヤ笂骞朵笖杩涜鎺掑簭
+ if (allMatchingList.Count < 1)
+ return false;//閫氳繃鍨嬪彿鍚嶆病鏈夋壘鍒�,鍒欒涓烘病鏈夊尮閰嶅埌
+ foreach (var item in allMatchingList)
{
- int commonCount = GetIntersect(input.ModelType, range.Name);
- if (commonCount > firstCount)
+ if (item.IsDefault)
{
- vmo = range;
- firstCount = commonCount;
+ vmo = item;
}
}
+ vmo = allMatchingList.First();//濡傛灉娌℃湁璁剧疆榛樿鍊�,鍒欓粯璁よ繑鍥炲尮閰嶅瓧绗︽渶澶氱殑涓�鏉℃暟鎹�
+ }
+ else if (absoluteMatch.Count == 1)
+ {
+ vmo = absoluteMatch.First();
}
else
{
//鍖洪棿鍖归厤
- var rangeMatch = adaptingManageVmos.Where(item =>
- {
- 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();
+ var rangeMatch = adaptingManageVmos
+ .Where(item =>
+ input.Caliber == null ||
+ item.Caliber == null ||
+ Math.Abs(Convert.ToInt64(item.Caliber) - Convert.ToInt64(input.Caliber)) <= _caliberTolerance)
+ .ToList();
if (rangeMatch != null && rangeMatch.Count > 0)
{
- var materialList = new List<Vmo.FourLinkMainVmo>();
+ var materialList = new List<Vmo.AssetsFourlinkMainVmo>();
foreach (var range in rangeMatch)
{
//浠ユ潗鏂欎负鏉′欢寮�濮嬪尮閰�
@@ -664,31 +712,26 @@
}
//鐢ㄥ凡缁忕瓫閫夊畬鎴愮殑鍒楄〃涓互鍚嶇О绛涢��
firstCount = 0;
- foreach (var material in materialList)
+ if (materialList.Count < 1)
+ return false;
+ var allMatchingList = materialList
+ .Where(x => GetIntersect(x.KeyWord == string.Empty ? x.Name : x.KeyWord, input.ModelType) >= 2)
+ .OrderByDescending(x => GetIntersect(x.KeyWord == string.Empty ? x.Name : x.KeyWord, input.ModelType))
+ .ToList();//鎵惧嚭鐩稿悓瀛楃鍦�2浠ヤ笂骞朵笖杩涜鎺掑簭
+ if (allMatchingList.Count < 1)
+ return false;//閫氳繃鍨嬪彿鍚嶆病鏈夋壘鍒�,鍒欒涓烘病鏈夊尮閰嶅埌
+ foreach (var item in allMatchingList)
{
- int commonCount = GetIntersect(input.ModelType, material.Name);
- if (commonCount > firstCount)
+ if (item.IsDefault)
{
- vmo = material;
- firstCount = commonCount;
+ vmo = item;
}
}
+ vmo = allMatchingList.First();//濡傛灉娌℃湁璁剧疆榛樿鍊�,鍒欓粯璁よ繑鍥炲尮閰嶅瓧绗︽渶澶氱殑涓�鏉℃暟鎹�
}
}
- //鍙ｅ緞鍜屾潗鏂欓兘娌℃湁鍖归厤涓�,灏辩敤鍨嬪彿鍚嶅尮閰�
+ //绮剧‘鍖归厤鍜岀矖绯欏尮閰嶉兘娌℃湁鍖归厤鍒板氨杩斿洖閿欒
firstCount = 0;
- if (vmo == null)
- {
- foreach (var item in adaptingManageVmos)
- {
- int commonCount = GetIntersect(input.ModelType, item.KeyWord);
- if (commonCount > firstCount)
- {
- vmo = item;
- firstCount = commonCount;
- }
- }
- }
if (vmo != null)
{
input.MatchingMinorLoss = vmo.Coefficient;
@@ -703,13 +746,10 @@
/// <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;
-
+ var a = string.Join("", str1.Intersect(str2)).Count();
return string.Join("", str1.Intersect(str2)).Count();
}
}
--
Gitblit v1.9.3