From 0ee75b88cfe03e46289de0de96e8ed4580c797d3 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期二, 27 九月 2022 14:04:21 +0800 Subject: [PATCH] Merge branch 'Dev-Branch' into dev--wxr --- HDL_ON/Entity/Function/Function.cs | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs index 176e38a..0096799 100644 --- a/HDL_ON/Entity/Function/Function.cs +++ b/HDL_ON/Entity/Function/Function.cs @@ -109,13 +109,13 @@ /// </summary> /// <param name="key"></param> /// <returns></returns> - public string GetAttrState(string key) + public string GetAttrState(string key , string defaultValue = "0") { //涓�绾ф煡璇eyValue鍊� var attrState = attributes.Find((s) => s.key == key.ToString()); if (attrState == null) { - return "0"; + return defaultValue; } if (string.IsNullOrEmpty(attrState.state)) { @@ -1512,6 +1512,10 @@ #region 鑳芥簮 /// <summary> + /// 閫嗗彉鍣� + /// </summary> + public const string Inverter = "energy.inverter"; + /// <summary> /// 鑳芥簮妯″潡 /// </summary> public const string EnergyStandard = "energy.standard"; -- Gitblit v1.8.0