调整节能属性上传

BLV_Studio/EnergySavingAttribute.vb

@@ -32,7 +32,7 @@ Public Class EnergySavingAttribute
         G_loopNameAddr = New Dictionary(Of String, String)
         G_ReportingScenario = nReportingScenario
 
-        Dim li As List(Of MDevNodeMessage) = nReportingScenario.getDateDisposeRuning
+        Dim li As List(Of MDevNodeMessage) = nReportingScenario.getDateDisposeRuning(True)
         For Each item In li
             If G_loopNameAddr.ContainsKey(item.ModalAddress) Then
                 Continue For
@@ -57,6 +57,7 @@ Public Class EnergySavingAttribute
             End If
         Next
 
+        Console.WriteLine(G_DateStr.Count)
 
 
         ' 在 InitializeComponent() 调用之后添加任何初始化。
@@ -118,7 +119,7 @@ Public Class EnergySavingAttribute
             Gcstr = G_loopNameAddr.Keys(i).Substring(0, 3)
             Integer.TryParse(Gcstr, Ginttype)
             Select Case Ginttype
-                Case 24 'pwm调光
+                Case 24, 1 'pwm调光   、继电器
                     li = G_DateStr(2.ToString)
                     PowerInit.AddItem("")
                     PowerInit.Cell(PowerInit.Rows - 1, 2).Text = G_Hotelid
@@ -221,6 +222,7 @@ Public Class EnergySavingAttribute
                         RatioInit.Cell(RatioInit.Rows - 1, 12).Text = ncdic("heat_loss")
                         RatioInit.Cell(RatioInit.Rows - 1, 13).Text = ncdic("remark")
                     End If
+
             End Select
         Next
     End Sub
@@ -373,6 +375,7 @@ Public Class EnergySavingAttribute
             '遍历每一列
             dic = New Dictionary(Of String, Object)
             dic.Add("type", 1)
+            dic.Add("is_carbon", 0)
             If RatioInit.Cell(i, 1).Text.Equals("1") Then
                 dic.Add("push_state", 1)
             Else
@@ -472,11 +475,14 @@ Public Class EnergySavingAttribute
             '遍历每一列
             dic = New Dictionary(Of String, Object)
             dic.Add("type", 0)
+            dic.Add("is_carbon", 0)
             If PowerInit.Cell(i, 1).Text.Equals("1") Then
                 dic.Add("push_state", 1)
             Else
                 dic.Add("push_state", 0)
             End If
+
+
             For j As Integer = 4 To PowerInit.Cols - 1
                 '判断是否为空
                 Dim str As String = PowerInit.Cell(i, j).Text