From a36faf95b4bee06626f33a82448f93e364b29ec5 Mon Sep 17 00:00:00 2001
From: tangxu <76880903@qq.com>
Date: 星期六, 08 十月 2022 10:55:01 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/IStation/Service.V4.1
---
Server/IStation.Server.Eta/analy/job/EtaAnalyCronJob.cs | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/Server/IStation.Server.Eta/analy/job/EtaAnalyCronJob.cs b/Server/IStation.Server.Eta/analy/job/EtaAnalyCronJob.cs
index 5f608da..ed4ae51 100644
--- a/Server/IStation.Server.Eta/analy/job/EtaAnalyCronJob.cs
+++ b/Server/IStation.Server.Eta/analy/job/EtaAnalyCronJob.cs
@@ -121,6 +121,10 @@
var station = new Service.Station().GetByID(CorpID, logicTree.LogicID);
if (station == null)
continue;
+ //if (station.ID==)
+ //{
+
+ //}
//鏋勫缓娉电珯涓婁笅鏂�
logicTreeContextItem.LogicName = station.Name;
@@ -143,8 +147,7 @@
monitorPointMappingList?.Select(x => x.MonitorPointID).Distinct().ToList(), Model.eMonitorType.General, Model.Monitor.eCronType.Real);
//鏈�杩戞祴鐐硅褰�
//var monitorRecordList = new Service.MonitorRealRecord().GetLastNormalRecord(CorpID,monitorPointList?.Select(x=>x.ID).ToList());
- var monitorRecordList = MonitorRealRecordHelper.GetLastNormalRealRecord(CorpID,
- monitorPointList?.Select(x => x.ID).ToList());
+ var monitorRecordList = MonitorRealRecordHelper.GetLastNormalRealRecord(CorpID, monitorPointList?.Select(x => x.ID).ToList());
//閬嶅巻绠¤矾
foreach (var pipeLine in pipeLineList)
{
@@ -190,9 +193,6 @@
monitorPointContextItem.DataValue = dataValue;
pipeLineContextItem.MonitorPointContextItems.Add(monitorPointContextItem);
}
-
-
-
}
}
@@ -263,7 +263,7 @@
if (!bol)
{
LogHelper.Info($"鑳芥晥鍒嗘瀽浠诲姟涓紝瀹㈡埛鏍囪瘑锛歿this.CorpID}, 锛堝崟锛夎褰曚繚瀛樺け璐ワ紒");
- }
+ }
}
if (multiList != null && multiList.Count > 0)
{
@@ -281,10 +281,23 @@
LogHelper.Info($"鑳芥晥鍒嗘瀽浠诲姟涓紝瀹㈡埛鏍囪瘑锛歿this.CorpID}, 锛堜笟鍔★級璁板綍淇濆瓨澶辫触锛�");
}
}
+
+ if (this.CorpID==5)
+ {
+ var singleListJson = JsonHelper.Object2Json(singleList);
+ LogHelper.Debug("singleListJson:" + singleListJson);
+
+ var multiListJson = JsonHelper.Object2Json(multiList);
+ LogHelper.Debug("multiListJson:" + multiListJson);
+
+ var logicListJson = JsonHelper.Object2Json(logicList);
+ LogHelper.Debug("logicListJson:" + logicListJson);
+ }
+
});
#endregion
- LogHelper.Info($"瀹㈡埛鏍囪瘑锛歿this.CorpID}, 缁撴潫鑳芥晥鍒嗘瀽锛佺粨璁�:{analyBol.ToString()}");
+ LogHelper.Info($"瀹㈡埛鏍囪瘑锛歿this.CorpID}, 缁撴潫鑳芥晥鍒嗘瀽锛�");
}
catch (Exception ex)
{
--
Gitblit v1.9.3