From 7baac1dbfc0b1c677ef263ff037ac81c6d91f5fb Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期日, 22 十二月 2024 12:34:04 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs
index 68d401d..eb1a67e 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs
@@ -40,6 +40,7 @@
var AssetsHydrantMain = new BLL.AssetsHydrantMain();
var AssetsPressmeterMain = new BLL.AssetsPressmeterMain();
var AssetsTranslationMain = new BLL.AssetsTranslationMain();
+ var AssetsCoolingMain = new BLL.AssetsCoolingMain();
try
{
var allPump = Task.Run(async () => await AssetsPumpMain.GetAll()).Result;
@@ -59,6 +60,7 @@
var allHydrantMain = Task.Run(async () => await AssetsHydrantMain.GetAll()).Result;
var allPressmeterMain = Task.Run(async () => await AssetsPressmeterMain.GetAll()).Result;
var allTranslationMain = Task.Run(async () => await AssetsTranslationMain.GetAll()).Result;
+ var allCoolingMain = Task.Run(async () => await AssetsCoolingMain.GetAll()).Result;
//娉靛尮閰�
foreach (var item in assetsAutoMatchingView.Pumps)
{
@@ -111,6 +113,15 @@
foreach (var item in assetsAutoMatchingView.Nozzles)
{
if (MatchingSprinkler(item, allSprinkler))
+ {
+ IsMaching = true;
+ }
+ }
+
+ //鍠峰ご鍖归厤
+ foreach (var item in assetsAutoMatchingView.Coolings)
+ {
+ if (Matching(item, allCoolingMain))
{
IsMaching = true;
}
@@ -290,6 +301,7 @@
InputModel.MatchingCurveQE.Add(new HydroCurvePointViewModel(item.X, item.Y));
}
}
+
return true;
}
return false;
@@ -1424,12 +1436,12 @@
}
Vmo.AssetsTankMainVmo vmo = null;
var nameMatching = tankVmos.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
+ (x.KeyWords != null && x.KeyWords.Any(keyword => GetIntersect(keyword, input.ModelType) >= 1)) ||
+ (x.KeyWords == null || !x.KeyWords.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();
+ (x.KeyWords != null && x.KeyWords.Any(keyword => GetIntersect(keyword, input.ModelType) >= 1)) ||
+ (x.KeyWords == null || !x.KeyWords.Any()) && GetIntersect(x.Name, input.ModelType) >= 1).ToList();
if (nameMatching.Count > 1)
{
--
Gitblit v1.9.3