From 1c4426810c71eead57084be8a18ade8d314dd8c4 Mon Sep 17 00:00:00 2001
From: patrick <patrick.xu@broconcentric.com>
Date: 星期二, 10 十二月 2019 14:24:31 +0800
Subject: [PATCH] 1. 重构项目
---
src/Bro.Common.Model/Model/WarningSet.cs | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/src/Bro.Common.Model/Model/WarningSet.cs b/src/Bro.Common.Model/Model/WarningSet.cs
index b9fe282..fd0765d 100644
--- a/src/Bro.Common.Model/Model/WarningSet.cs
+++ b/src/Bro.Common.Model/Model/WarningSet.cs
@@ -1,4 +1,5 @@
锘縰sing Bro.Common.Helper;
+using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -14,28 +15,37 @@
/// </summary>
public class WarningSet : IComplexDisplay
{
- [Category("璀︽姤璁剧疆")]
- [Description("璀︽姤浣嶇储寮�")]
- public int WaringIndex { get; set; }
+ [Category("绱㈠紩璁剧疆")]
+ [Description("璀︽姤绱㈠紩鈥斺�斿瓧绱㈠紩")]
+ public int WarningIndex_Word { get; set; }
- [Category("璀︽姤璁剧疆")]
+ [Category("绱㈠紩璁剧疆")]
+ [Description("璀︽姤绱㈠紩鈥斺�斾綅绱㈠紩")]
+ public int WarningIndex_Bit { get; set; }
+
+ [Category("瑙﹀彂璁剧疆")]
+ [Description("true锛氶珮鐢靛钩瑙﹀彂鎶ヨ false锛氫綆鐢靛钩瑙﹀彂鎶ヨ")]
+ public bool TriggerValue { get; set; } = true;
+
+ [Category("璀︽姤鍐呭")]
[Description("璀︽姤浠ｇ爜")]
public string WarningCode { get; set; }
- [Category("璀︽姤璁剧疆")]
+ [Category("璀︽姤鍐呭")]
[Description("璀︽姤鎻忚堪")]
public string WarningDescription { get; set; }
- [Category("璀︽姤璁剧疆")]
+ [Category("绾у埆璁剧疆")]
[Description("璀︽姤绾у埆")]
public int WarningLvl { get; set; } = 0;
- [Description("鎶ヨ宸ヤ綅")]
- public int WorkPosition { get; set; } = 0;
+ [Browsable(false)]
+ [JsonIgnore]
+ public bool CurrentStatus { get; set; } = false;
public string GetDisplayText()
{
- return WaringIndex + "-" + WarningCode + "-" + WarningDescription + "-" + WorkPosition;
+ return $"{WarningIndex_Word}:{WarningIndex_Bit}-{WarningCode}-{WarningDescription}";
}
}
}
--
Gitblit v1.8.0