From e75ccccb370b47305c6eadb321efb27c86cdd28b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 30 十一月 2021 09:57:24 +0800
Subject: [PATCH] 合并
---
HDL_ON/Entity/Function/SecurityAlarm.cs | 63 ++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 18 deletions(-)
diff --git a/HDL_ON/Entity/Function/SecurityAlarm.cs b/HDL_ON/Entity/Function/SecurityAlarm.cs
index 6260cba..a460369 100644
--- a/HDL_ON/Entity/Function/SecurityAlarm.cs
+++ b/HDL_ON/Entity/Function/SecurityAlarm.cs
@@ -13,11 +13,7 @@
{
public SecurityAlarm()
{
- pushConfigs.Add(new SecurityPushConfig()
- {
- pushMethod = "APP",
- pushTarget = new List<string>() { UserInfo.Current.ID }
- });
+
}
/// <summary>
@@ -35,7 +31,7 @@
/// <summary>
/// 瀹夐槻寤舵椂
/// </summary>
- public string delay;
+ public string delay ="0";
/// <summary>
/// 鐘舵��
/// 甯冮槻:enable
@@ -94,6 +90,17 @@
var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
FileUtlis.Files.WriteFileByBytes(savePath, ssd);
}
+ /// <summary>
+ /// 鍒锋柊鏈湴鏁版嵁
+ /// </summary>
+ /// <returns></returns>
+ public SecurityAlarm RefeshData()
+ {
+ var dataBytes = FileUtlis.Files.ReadFile(savePath);
+ var dataString = System.Text.Encoding.UTF8.GetString(dataBytes);
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<SecurityAlarm>(dataString);
+ return temp;
+ }
/// <summary>
/// 淇濆瓨瀹夐槻淇℃伅
@@ -101,8 +108,22 @@
public string SaveInfo()
{
HttpServerRequest hsr = new HttpServerRequest();
- this.noticeConfig.enable = true;
- this.noticeConfig.noticeContent = Language.StringByID(StringId.SecurityAlarmTipString).Replace("{0}", name);
+ if (string.IsNullOrEmpty(this.noticeConfig.noticeContent))
+ {
+ this.noticeConfig.noticeContent = Language.StringByID(StringId.SecurityAlarmTipString).Replace("{0}", name);
+ }
+ if (this.noticeConfig.enable)
+ {
+ if (this.pushConfigs.Count == 0)
+ {
+ pushConfigs.Add(new SecurityPushConfig()
+ {
+ pushMethod = "APP",
+ pushTarget = new List<string>() { UserInfo.Current.ID }
+ });
+ }
+ }
+
if (string.IsNullOrEmpty(sid))
{
NewSid();
@@ -260,16 +281,16 @@
public List<SecurityInputCondition> condition = new List<SecurityInputCondition>();
/// <summary>
- /// 鍒ゆ柇鏉′欢
- /// </summary>
- public string comparator = "=";
-
- /// <summary>
/// 鍔犲叆杈撳叆鏉′欢
/// 鏈湴鍒ゆ柇浣跨敤
/// </summary>
- [Newtonsoft.Json.JsonIgnore]
- public bool addCondition = false;
+ //[Newtonsoft.Json.JsonIgnore]
+ //public bool addCondition = false;
+
+ /// <summary>
+ /// 鍒ゆ柇鏉′欢
+ /// </summary>
+ public string comparator = "=";
[Newtonsoft.Json.JsonIgnore]
Function _function = null;
@@ -459,12 +480,18 @@
/// </summary>
public List<SecurityOutputStatus> status = new List<SecurityOutputStatus>();
+
/// <summary>
/// 鍔犲叆杈撳叆鏉′欢
/// 鏈湴鍒ゆ柇浣跨敤
/// </summary>
+ //[Newtonsoft.Json.JsonIgnore]
+ //public bool addCondition = false;
+
[Newtonsoft.Json.JsonIgnore]
- public bool addCondition = false;
+ public string name = "";
+ [Newtonsoft.Json.JsonIgnore]
+ public string RoomName = "";
[Newtonsoft.Json.JsonIgnore]
Function _function = null;
@@ -515,7 +542,7 @@
}
}else if(target_type == "1")
{
-
+ text = Language.StringByID(StringId.Open);
}
return text;
@@ -539,7 +566,7 @@
/// <summary>
/// 鏄惁寮�鍚�氱煡
/// </summary>
- public bool enable;
+ public bool enable = true;
/// <summary>
/// 閫氱煡鍐呭
/// </summary>
--
Gitblit v1.8.0