From 4cc04639fbadde3a7f3b9875353df0d90fc09043 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期六, 18 一月 2020 14:33:40 +0800
Subject: [PATCH] 节前备份
---
HDL_ON/Entity/Function/Function.cs | 81 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 77 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 6d2f2e6..01ea686 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -1,5 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
+using Newtonsoft.Json.Linq;
namespace HDL_ON.Entity
{
@@ -28,25 +29,29 @@
/// </summary>
public string funcClassification;
/// <summary>
+ /// 鏄惁鏀惰棌
+ /// </summary>
+ public bool collection = false;
+ /// <summary>
/// 鍔熻兘ID
/// </summary>
public string sid;
/// <summary>
/// 澶囨敞
/// </summary>
- public string Name;
+ public string name;
/// <summary>
/// 淇濆瓨鏁版嵁鏃剁殑鏂囦欢鍚�
/// </summary>
- public string SavePath = "";
+ public string savePath = "";
/// <summary>
/// A鍗忚鏁版嵁鏍煎紡
/// </summary>
- public string A_Protocol;
+ public string a_Protocol_Namespace = "HDL";
/// <summary>
/// bus鍗忚鏁版嵁鏍煎紡
/// </summary>
- public string Bus_Protocol;
+ public string bus_Data;
/// <summary>
/// 鎴块棿ID鍒楄〃
/// 璇ュ姛鑳芥坊鍔犲埌鍒版埧闂村垪琛�
@@ -57,5 +62,73 @@
/// </summary>
public string lastState = "";
+
+
+
+ /// <summary>
+ /// 鑾峰彇A鍗忚鎺у埗瀛楃涓�
+ /// </summary>
+ /// <param name="command">鎺у埗鍛戒护锛歸rite锛宺ead</param>
+ /// <returns></returns>
+ public virtual JObject GetSendJObject(string command)
+ {
+ var sendJob = new JObject { { "Namespace", a_Protocol_Namespace }, { "Command", command }, { "Type", "device" }, };
+ var data = new JObject { { "sid", sid } };
+ sendJob.Add("", data);
+ return sendJob;
+ }
+ /// <summary>
+ /// bus鏃ф暟鎹殑瀛愮綉ID
+ /// </summary>
+ public byte bus_SubnetId
+ {
+ get
+ {
+ var sss = JObject.Parse(bus_Data);
+ var subnetId = Convert.ToByte(sss.GetValue("SubnetID").ToString());
+ return subnetId;
+ }
+ }
+
+ /// <summary>
+ /// bus鏃ф暟鎹殑璁惧ID
+ /// </summary>
+ public byte bus_DeviceId
+ {
+ get
+ {
+ var sss = JObject.Parse(bus_Data);
+ var deviceId = Convert.ToByte(sss.GetValue("DeviceID").ToString());
+ return deviceId;
+ }
+ }
+ /// <summary>
+ /// bus鏃ф暟鎹殑鍥炶矾ID
+ /// </summary>
+ public byte bus_LoopId
+ {
+ get
+ {
+ var sss = JObject.Parse(bus_Data);
+ var loopId = Convert.ToByte(sss.GetValue("LoopID").ToString());
+ return loopId;
+ }
+ }
+
+ public string bus_DeviceType = "";
+
+ public string GetBusId ()
+ {
+ string busId = "";
+ if(!string.IsNullOrEmpty(bus_Data))
+ {
+ var sss = JObject.Parse(bus_Data);
+ var subnetId = sss.GetValue("SubnetID").ToString();
+ var deviceId = sss.GetValue("DeviceID").ToString();
+ var loopId = sss.GetValue("LoopID").ToString();
+ busId = subnetId + "_" + deviceId + "_" + loopId;
+ }
+ return busId;
+ }
}
}
--
Gitblit v1.8.0