From 1d5b344c8be498c9989f3fe2e9846b1dcc919cb8 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 06 八月 2024 17:29:23 +0800
Subject: [PATCH] 累计运行时长更新
---
IStation.Service/02-model/00-basic/02-config/ScheduleConfig.cs | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/IStation.Service/02-model/00-basic/02-config/ScheduleConfig.cs b/IStation.Service/02-model/00-basic/02-config/ScheduleConfig.cs
index c0d878b..512ae93 100644
--- a/IStation.Service/02-model/00-basic/02-config/ScheduleConfig.cs
+++ b/IStation.Service/02-model/00-basic/02-config/ScheduleConfig.cs
@@ -16,13 +16,16 @@
/// <param name="rhs"></param>
public ScheduleConfig(ScheduleConfig rhs)
{
- //this.PriorityOrderFlagList = rhs.PriorityOrderFlagList?.ToList();
+ this.MinOpenCount = rhs.MinOpenCount;
+ this.MaxOpenCount = rhs.MaxOpenCount;
this.MustOpenFlagList = rhs.MustOpenFlagList?.ToList();
this.MustCloseFlagList = rhs.MustCloseFlagList?.ToList();
this.ForbiddenFlagCombineList = rhs.ForbiddenFlagCombineList?.ToList();
this.AssociativeFlagCombineList = rhs.AssociativeFlagCombineList?.ToList();
+ this.SameSectionFlagCombineList = rhs.SameSectionFlagCombineList?.ToList();
this.WaterSupplyLimitList = rhs.WaterSupplyLimitList?.ToList();
this.FrequencyLimitList = rhs.FrequencyLimitList?.ToList();
+ this.FlagCumulativeRuntimeDict = new Dictionary<int, double>();
}
/// <summary>
@@ -31,15 +34,28 @@
/// <param name="rhs"></param>
public void Reset(ScheduleConfig rhs)
{
- //this.PriorityOrderFlagList = rhs.PriorityOrderFlagList?.ToList();
+ this.MinOpenCount = rhs.MinOpenCount;
+ this.MaxOpenCount = rhs.MaxOpenCount;
this.MustOpenFlagList = rhs.MustOpenFlagList?.ToList();
this.MustCloseFlagList = rhs.MustCloseFlagList?.ToList();
this.ForbiddenFlagCombineList = rhs.ForbiddenFlagCombineList?.ToList();
this.AssociativeFlagCombineList = rhs.AssociativeFlagCombineList?.ToList();
+ this.SameSectionFlagCombineList = rhs.SameSectionFlagCombineList?.ToList();
this.WaterSupplyLimitList = rhs.WaterSupplyLimitList?.ToList();
this.FrequencyLimitList = rhs.FrequencyLimitList?.ToList();
+ this.FlagCumulativeRuntimeDict = new Dictionary<int, double>();
}
+
+ /// <summary>
+ /// 鏈�灏忓紑娉垫暟閲�
+ /// </summary>
+ public int MinOpenCount { get; set; }
+
+ /// <summary>
+ /// 鏈�澶у紑娉垫暟閲�
+ /// </summary>
+ public int MaxOpenCount { get; set; }
/// <summary>
/// 蹇呭紑娉靛垪琛�
@@ -52,14 +68,19 @@
public List<int> MustCloseFlagList { get; set; }
/// <summary>
- /// 绂佺敤娉电粍鍚�
+ /// 绂佺敤娉电粍鍚堝垪琛�
/// </summary>
public List<List<int>> ForbiddenFlagCombineList { get; set; }
/// <summary>
- /// 鍏宠仈娉电粍鍚�
+ /// 鍏宠仈娉电粍鍚堝垪琛�
/// </summary>
public List<List<int>> AssociativeFlagCombineList { get; set; }
+
+ /// <summary>
+ /// 鍚屾娉电粍鍚堝垪琛�
+ /// </summary>
+ public List<List<int>> SameSectionFlagCombineList { get; set; }
/// <summary>
/// 渚涙按闄愬埗鍒楄〃
@@ -71,13 +92,11 @@
/// </summary>
public List<FrequencyLimit> FrequencyLimitList { get; set; }
-
-
-
/// <summary>
- /// 浼樺厛搴︽帓搴�
+ /// 娉电疮璁¤繍琛屾椂闀垮瓧鍏�
/// </summary>
- // public List<int> PriorityOrderFlagList { get; set; }
+ public Dictionary<int, double> FlagCumulativeRuntimeDict { get; set; }
+
/// <summary>
///
@@ -92,7 +111,6 @@
{
return this.MemberwiseClone();
}
+
}
-
-
}
\ No newline at end of file
--
Gitblit v1.9.3