From a8ccc992964272f6a74631e8c164e8c91e5cb6d4 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 12 十月 2024 16:47:29 +0800
Subject: [PATCH] 处理冲突
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingHelper.cs | 490 ++++++++++++++++++++++++++----------------------------
1 files changed, 236 insertions(+), 254 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..8d000ed 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
{
@@ -13,8 +14,9 @@
private const double _powerTolerance = 0.05;
//璧勪骇鑷姩鍖归厤
- 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 +25,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,7 +160,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();
@@ -205,37 +214,35 @@
var absoluteMatch = adaptingManageVmos.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)
+ 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.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)
+ .ToList();
if (rangeMatch != null && rangeMatch.Count > 0)
{
var materialList = new List<Vmo.AssetsValveMainVmo>();
@@ -258,31 +265,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;
- }
- }
- }
if (vmo != null)
{
input.MatchingMinorLoss = vmo.Coefficient;
@@ -305,63 +307,67 @@
return true;
}
Vmo.AssetsPipeMainVmo vmo = null;
- int StartCount = 0;
+ 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)
@@ -400,42 +406,40 @@
}
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 ||
+ 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.AssetsElbowMainVmo>();
@@ -458,31 +462,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.Name);
- if (commonCount > firstCount)
- {
- vmo = item;
- firstCount = commonCount;
- }
- }
- }
if (vmo != null)
{
input.MatchingMinorLoss = vmo.Coefficient;
@@ -503,42 +502,40 @@
}
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.AssetsThreelinkMainVmo>();
@@ -561,31 +558,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.Name);
- if (commonCount > firstCount)
- {
- vmo = item;
- firstCount = commonCount;
- }
- }
- }
if (vmo != null)
{
input.MatchingMinorLoss = vmo.Coefficient;
@@ -606,42 +598,40 @@
}
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.AssetsFourlinkMainVmo>();
@@ -664,31 +654,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,9 +688,6 @@
/// <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;
--
Gitblit v1.9.3