优化回路上传页面、节能属性上传页面、限制内部预留服务

BLV_Studio/Test/GridTest/ReportingScenario.vb

@@ -59,6 +59,28 @@ Public Class ReportingScenario
     Public Function getDateDisposeRuning() As List(Of MDevNodeMessage)
         Return DateDisposeRuning(Tgrd, TDevicemodel)
     End Function
+    Public Function getDevloop() As Dictionary(Of String, String)
+        Dim dic As New Dictionary(Of String, String)
+        Dim devAddr, NodeLoop As String
+        Dim strbuf As String()
+        For Each Dev In TDevicemodel
+            If String.IsNullOrEmpty(Dev.Value.Desc.DevInterface) OrElse Dev.Value.Desc.DevInterface.Equals("VirtualObject") Then Continue For
+            For Each DevNode In Dev.Value.Nodes
+
+                If Not String.IsNullOrEmpty(DevNode.DEV_TYPE_DATA) Then
+                    devAddr = GetActionDeviceAddr(Dev.Value, DevNode.Name).ToString
+                    NodeLoop = DevNode.DEV_TYPE_DATA.PadLeft(3, "0") & devAddr.PadLeft(3, "0") & "000"
+                    If dic.ContainsKey(NodeLoop) Then Continue For
+                    strbuf = Dev.Key.Split(vbLf)
+                    dic.Add(NodeLoop, strbuf(2))
+
+                End If
+
+            Next
+
+        Next
+        Return Dic
+    End Function
     Public Function DateDisposeRuning(_grd As FlexCell.Grid， _Devicemodel As Dictionary(Of String， DeviceModel)) As List(Of MDevNodeMessage)
         If IsNothing(_grd) Then Return Nothing
         Dim ACtabRange As CtabRange
@@ -72,7 +94,9 @@ Public Class ReportingScenario
         For Each Dev In _Devicemodel                '遍历设备
 
             For Each DevNode In Dev.Value.Nodes '遍历设备下属子节点
+
                 Dim devAddr As String = GetActionDeviceAddr(Dev.Value, DevNode.Name).ToString
+
                 If DevNode.Interface.Equals("DO") OrElse DevNode.Interface.Equals("LIGHT") Then     '判断是否为输出设备
                     If DevNode.DEV_TYPE_DATA.Equals("4") Then       '服务设备节点特殊处理