diff --git a/BPASmartClient.IoT/DataVClient.cs b/BPASmartClient.IoT/DataVClient.cs index c690e40f..d08a6a24 100644 --- a/BPASmartClient.IoT/DataVClient.cs +++ b/BPASmartClient.IoT/DataVClient.cs @@ -65,12 +65,6 @@ namespace BPASmartClient.IoT /// 大屏上报Model /// public DataVAPI.Tool.IOT.IOTDevSXModel iOTDevSXModel = new DataVAPI.Tool.IOT.IOTDevSXModel() { }; - /// - /// 广播 - /// - //public string PubTopic = "/broadcast/" + "grgpECHSL7q" + "/" + "Transit_SetDevice"; - //public string PubTopic = "/broadcast/" + "grgpECHSL7q" + "/" + "Transit_Test_SetDevice"; - /// /// key值 /// diff --git a/BPASmartClient.IoT/Model/DataVReport.cs b/BPASmartClient.IoT/Model/DataVReport.cs index 02d6fcf6..83d93806 100644 --- a/BPASmartClient.IoT/Model/DataVReport.cs +++ b/BPASmartClient.IoT/Model/DataVReport.cs @@ -369,6 +369,10 @@ namespace BPASmartDatavDeviceClient.IoT /// public string BroadcastTopic = "/broadcast/" + "grgpECHSL7q" + "/" + DeviceName + "_SetDevice"; /// + /// 文件上床Topic + /// + public string FileUpLoadTopic = $"/sys/{ProductKey}/{DeviceName}/thing/file/upload/mqtt/init"; + /// /// 订阅主题集合 /// public static List SubTopicList = new List(); diff --git a/BPASmartClient.IoT/Model/IOT/IOTDevModel.cs b/BPASmartClient.IoT/Model/IOT/IOTDevModel.cs index 488125f1..7b52318a 100644 --- a/BPASmartClient.IoT/Model/IOT/IOTDevModel.cs +++ b/BPASmartClient.IoT/Model/IOT/IOTDevModel.cs @@ -66,30 +66,30 @@ namespace DataVAPI.Tool.IOT /// public class IOTDevSXModel { - /// - /// 硬件状态 - /// - public string HardwareStatus { get; set; } - /// - /// 扩展属性 - /// - public string KZSX { get; set; } - /// - /// 基本属性 - /// - public string JBSX { get; set; } + ///// + ///// 硬件状态 + ///// + //public string HardwareStatus { get; set; } + ///// + ///// 扩展属性 + ///// + //public string KZSX { get; set; } + ///// + ///// 基本属性 + ///// + //public string JBSX { get; set; } /// /// 节点状态 /// public string NodeStatus { get; set; } - /// - /// 运行日志 - /// - public string SZXX { get; set; } - /// - /// 运行告警 - /// - public string GJXX { get; set; } + ///// + ///// 运行日志 + ///// + //public string SZXX { get; set; } + ///// + ///// 运行告警 + ///// + //public string GJXX { get; set; } /// /// Model /// @@ -114,87 +114,87 @@ namespace DataVAPI.Tool.IOT return string.Empty; } } - /// - /// 设置基本属性 - /// - /// - /// - public void SetJBSX(DevSX devSX) - { - try - { - JBSX = Tools.JsonConvertTools(devSX); - } - catch (Exception ex) - { - JBSX = string.Empty; - } - } - /// - /// 设置基本属性状态 - /// - /// - /// - public void SetJBSXStatus(DevSXBase sXBase, bool Status) - { - try - { - if (sXBase == null) return; - DevSX dev = Tools.JsonToObjectTools(JBSX); - dev.data?.ForEach(x => - { - if (x.SXMC == sXBase.SXMC && x.SXLX == sXBase.SXLX) - { - x.SXStatus = Status; - } - }); - JBSX = Tools.JsonConvertTools(dev); - } - catch (Exception ex) - { - JBSX = string.Empty; - } - } - /// - /// 设置扩展属性 - /// - /// - public void SetKZSX(DevSX devSX) - { - try - { - KZSX = Tools.JsonConvertTools(devSX); - } - catch (Exception ex) - { - KZSX = string.Empty; - } - } - /// - /// 设置扩展属性状态 - /// - /// - /// - public void SetKZSXStatus(DevSXBase sXBase, bool Status) - { - try - { - if (sXBase == null) return; - DevSX dev = Tools.JsonToObjectTools(KZSX); - dev.data?.ForEach(x => - { - if (x.SXMC == sXBase.SXMC && x.SXLX == sXBase.SXLX) - { - x.SXStatus = Status; - } - }); - KZSX = Tools.JsonConvertTools(dev); - } - catch (Exception ex) - { - KZSX = string.Empty; - } - } + ///// + ///// 设置基本属性 + ///// + ///// + ///// + //public void SetJBSX(DevSX devSX) + //{ + // try + // { + // JBSX = Tools.JsonConvertTools(devSX); + // } + // catch (Exception ex) + // { + // JBSX = string.Empty; + // } + //} + ///// + ///// 设置基本属性状态 + ///// + ///// + ///// + //public void SetJBSXStatus(DevSXBase sXBase, bool Status) + //{ + // try + // { + // if (sXBase == null) return; + // DevSX dev = Tools.JsonToObjectTools(JBSX); + // dev.data?.ForEach(x => + // { + // if (x.SXMC == sXBase.SXMC && x.SXLX == sXBase.SXLX) + // { + // x.SXStatus = Status; + // } + // }); + // JBSX = Tools.JsonConvertTools(dev); + // } + // catch (Exception ex) + // { + // JBSX = string.Empty; + // } + //} + ///// + ///// 设置扩展属性 + ///// + ///// + //public void SetKZSX(DevSX devSX) + //{ + // try + // { + // KZSX = Tools.JsonConvertTools(devSX); + // } + // catch (Exception ex) + // { + // KZSX = string.Empty; + // } + //} + ///// + ///// 设置扩展属性状态 + ///// + ///// + ///// + //public void SetKZSXStatus(DevSXBase sXBase, bool Status) + //{ + // try + // { + // if (sXBase == null) return; + // DevSX dev = Tools.JsonToObjectTools(KZSX); + // dev.data?.ForEach(x => + // { + // if (x.SXMC == sXBase.SXMC && x.SXLX == sXBase.SXLX) + // { + // x.SXStatus = Status; + // } + // }); + // KZSX = Tools.JsonConvertTools(dev); + // } + // catch (Exception ex) + // { + // KZSX = string.Empty; + // } + //} } /// /// 告警消息