From dbc11dad71dd51b98a79186491bf5d8440a30278 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 01 十二月 2022 09:35:10 +0800
Subject: [PATCH] 修复监测记录SrcTime
---
Calculation/IStation.Calculation.Handle/MonitorHandleHelper.cs | 81 ++++++++++++++++++----------------------
1 files changed, 36 insertions(+), 45 deletions(-)
diff --git a/Calculation/IStation.Calculation.Handle/MonitorHandleHelper.cs b/Calculation/IStation.Calculation.Handle/MonitorHandleHelper.cs
index f604978..52f4222 100644
--- a/Calculation/IStation.Calculation.Handle/MonitorHandleHelper.cs
+++ b/Calculation/IStation.Calculation.Handle/MonitorHandleHelper.cs
@@ -42,24 +42,21 @@
{
if (lastRecord != null)
{
- if (lastRecord.SrcTime != null && receiveRecord.SrcTime != null)
+ if (lastRecord.SrcTime == receiveRecord.SrcTime)
{
- if (lastRecord.SrcTime.Value == receiveRecord.SrcTime.Value)
+ //鐩稿悓鏃堕棿缁欏嚭浜嗙浉鍚屽��
+ if (lastRecord.SrcValue == receiveRecord.SrcValue)
{
- //鐩稿悓鏃堕棿缁欏嚭浜嗙浉鍚屽��
- if (lastRecord.SrcValue == receiveRecord.SrcValue)
+ var real_slot = Model.Monitor.RealSlot.ToModel(monitor.CronParas);
+ if (real_slot == null)
{
- var real_slot = Model.Monitor.RealSlot.ToModel(monitor.CronParas);
- if (real_slot == null)
- {
- real_slot = new Model.Monitor.RealSlot();
- }
- if (!real_slot.UpdateWhenChanged)
- {
- return record;
- }
- dataStatus.Add(MonitorRecord.Status_Supplement);
+ real_slot = new Model.Monitor.RealSlot();
}
+ if (!real_slot.UpdateWhenChanged)
+ {
+ return record;
+ }
+ dataStatus.Add(MonitorRecord.Status_Supplement);
}
}
}
@@ -390,7 +387,7 @@
Model.MonitorPoint monitor,
Model.Signal_SignalType signal,
Model.MonitorBasicRecord lastRecord,
- DateTime? srcTime,
+ DateTime srcTime,
string srcValue,
List<string> dataStatus
)
@@ -408,24 +405,21 @@
{
if (lastRecord != null)
{
- if (lastRecord.SrcTime != null && srcTime != null)
+ if (lastRecord.SrcTime == srcTime)
{
- if (lastRecord.SrcTime.Value == srcTime.Value)
+ //鐩稿悓鏃堕棿缁欏嚭浜嗙浉鍚屽��
+ if (lastRecord.SrcValue == srcValue)
{
- //鐩稿悓鏃堕棿缁欏嚭浜嗙浉鍚屽��
- if (lastRecord.SrcValue == srcValue)
+ var real_slot = Model.Monitor.RealSlot.ToModel(monitor.CronParas);
+ if (real_slot == null)
{
- var real_slot = Model.Monitor.RealSlot.ToModel(monitor.CronParas);
- if (real_slot == null)
- {
- real_slot = new Model.Monitor.RealSlot();
- }
- if (!real_slot.UpdateWhenChanged)
- {
- return default;
- }
- dataStatus.Add(MonitorRecord.Status_Supplement);
+ real_slot = new Model.Monitor.RealSlot();
}
+ if (!real_slot.UpdateWhenChanged)
+ {
+ return default;
+ }
+ dataStatus.Add(MonitorRecord.Status_Supplement);
}
}
}
@@ -720,7 +714,7 @@
Model.MonitorPoint monitor,
Model.Signal_SignalType signal,
Func<Model.MonitorBasicRecord> getLastRecord,
- DateTime? srcTime,
+ DateTime srcTime,
string srcValue,
List<string> dataStatus
)
@@ -740,24 +734,21 @@
lastRecord = getLastRecord();
if (lastRecord != null)
{
- if (lastRecord.SrcTime != null && srcTime != null)
+ if (lastRecord.SrcTime == srcTime)
{
- if (lastRecord.SrcTime.Value == srcTime.Value)
+ //鐩稿悓鏃堕棿缁欏嚭浜嗙浉鍚屽��
+ if (lastRecord.SrcValue == srcValue)
{
- //鐩稿悓鏃堕棿缁欏嚭浜嗙浉鍚屽��
- if (lastRecord.SrcValue == srcValue)
+ var real_slot = Model.Monitor.RealSlot.ToModel(monitor.CronParas);
+ if (real_slot == null)
{
- var real_slot = Model.Monitor.RealSlot.ToModel(monitor.CronParas);
- if (real_slot == null)
- {
- real_slot = new Model.Monitor.RealSlot();
- }
- if (!real_slot.UpdateWhenChanged)
- {
- return default;
- }
- dataStatus.Add(MonitorRecord.Status_Supplement);
+ real_slot = new Model.Monitor.RealSlot();
}
+ if (!real_slot.UpdateWhenChanged)
+ {
+ return default;
+ }
+ dataStatus.Add(MonitorRecord.Status_Supplement);
}
}
}
@@ -1068,7 +1059,7 @@
(
Model.MonitorPoint monitor,
Model.Signal_SignalType signal,
- DateTime? srcTime,
+ DateTime srcTime,
string srcValue,
DateTime dataTime,
string dataValue,
--
Gitblit v1.9.3