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/MonitorSet.cs | 20 +++++---------------
1 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/src/Bro.Common.Model/Model/MonitorSet.cs b/src/Bro.Common.Model/Model/MonitorSet.cs
index 6a29c6f..fe435a2 100644
--- a/src/Bro.Common.Model/Model/MonitorSet.cs
+++ b/src/Bro.Common.Model/Model/MonitorSet.cs
@@ -47,6 +47,10 @@
[Description("瑙﹀彂鍊硷紝璁剧疆涓�-999鏃跺彉鍖栧嵆瑙﹀彂")]
public int TriggerValue { get; set; } = -1;
+ [Browsable(false)]
+ [JsonIgnore]
+ public int CurrentValue { get; set; }
+
/// <summary>
/// 浼犲叆鏁版嵁鍦板潃鐨勭储寮� 鎸夌収PLC鐩戝惉鍦板潃浠�0寮�濮嬬殑绱㈠紩闆嗗悎
/// </summary>
@@ -68,32 +72,18 @@
[Category("鍥炰紶璁剧疆")]
[Description("閫氱煡鍦板潃 瀹為檯PLC瀵勫瓨鍣ㄧ殑鍦板潃,10杩涘埗锛屼緥濡� 40012")]
public int NoticeAddress { get; set; } = -1;
-
- //[Browsable(false)]
- //[JsonIgnore]
- //public List<int> InputDatas { get; set; } = new List<int>();
-
+
[Browsable(false)]
[JsonIgnore]
public ProcessResponse Response { get; set; } = new ProcessResponse();
public MonitorSet() { }
- //public MonitorSet(int triggerIndex, int triggerValue, List<int> inputDataIndex, int dataIndex, int noticeIndex)
- //{
- // TriggerIndex = triggerIndex;
- // TriggerValue = triggerValue;
- // InputDataIndex = inputDataIndex;
- // ReplyDataAddress = dataIndex;
- // NoticeAddress = noticeIndex;
- //}
-
public string GetDisplayText()
{
using (var scope = GlobalVar.Container.BeginLifetimeScope())
{
List<ProcessMethodAttribute> methodList = scope.Resolve<List<ProcessMethodAttribute>>();
- //List<IDevice> deviceList = scope.Resolve<List<IDevice>>();
string desc = "";
--
Gitblit v1.8.0