驱动更新

IOT-CS · Aug 18, 2022 · 1d9473a · 1d9473a
1 parent 5c65256
commit 1d9473a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 30 deletions.
diff --git a/src/IOTCS.EdgeGateway.Plugins/ModbusDriver/ModbusTcpDriver.cs b/src/IOTCS.EdgeGateway.Plugins/ModbusDriver/ModbusTcpDriver.cs
@@ -91,14 +91,7 @@ public string Run(string deviceID, string groupID)
             {
                 List<DataNodeDto> list = new List<DataNodeDto>();
                 var locations = _dataLocations.Where(w => w.ParentId == groupID);
-                var cts = new CancellationTokenSource();
-                Parallel.ForEach(locations, new ParallelOptions
-                {
-                    CancellationToken = cts.Token,
-                    MaxDegreeOfParallelism = Environment.ProcessorCount,
-                    TaskScheduler = TaskScheduler.Default
-                },
-                (d, state) =>
+                foreach (var d in locations)
                 {
                     byte station = 1;
                     string address = string.Empty;
@@ -114,7 +107,7 @@ public string Run(string deviceID, string groupID)
                         case "string":
                             _busTcpClient.Station = station;
                             var sResult = _busTcpClient.ReadString(address, Convert.ToUInt16(d.NodeLength));
-                            DataNodeDto stringNode = new DataNodeDto 
+                            DataNodeDto stringNode = new DataNodeDto
                             {
                                 FieldName = d.DisplayName,
                                 NodeId = d.NodeAddress,
@@ -196,7 +189,7 @@ public string Run(string deviceID, string groupID)
                             list.Add(floatNode);
                             break;
                     }
-                });
+                }
 
                 result = JsonConvert.SerializeObject(list);
                 list.Clear();

diff --git a/src/IOTCS.EdgeGateway.Plugins/SiemensDriver/SiemensS71200NetDriver.cs b/src/IOTCS.EdgeGateway.Plugins/SiemensDriver/SiemensS71200NetDriver.cs
@@ -91,16 +91,8 @@ public string Run(string deviceID, string groupID)
             {
                 List<DataNodeDto> list = new List<DataNodeDto>();
                 var locations = _dataLocations.Where(w => w.ParentId == groupID);
-                var cts = new CancellationTokenSource();
-                Parallel.ForEach(locations, new ParallelOptions
+                foreach (var d in locations)
                 {
-                    CancellationToken = cts.Token,
-                    MaxDegreeOfParallelism = Environment.ProcessorCount,
-                    TaskScheduler = TaskScheduler.Default
-                },
-                (d, state) =>
-                {
-                    //并行读取所有数据
                     switch (d.NodeType)
                     {
                         case "string":
@@ -181,7 +173,7 @@ public string Run(string deviceID, string groupID)
                             list.Add(floatNode);
                             break;
                     }
-                });
+                }
 
                 result = JsonConvert.SerializeObject(list);
                 list.Clear();

diff --git a/src/IOTCS.EdgeGateway.Plugins/SiemensDriver/SiemensS71500NetDriver.cs b/src/IOTCS.EdgeGateway.Plugins/SiemensDriver/SiemensS71500NetDriver.cs
@@ -90,16 +90,8 @@ public string Run(string deviceID, string groupID)
             {
                 List<DataNodeDto> list = new List<DataNodeDto>();
                 var locations = _dataLocations.Where(w => w.ParentId == deviceID);
-                var cts = new CancellationTokenSource();
-                Parallel.ForEach(locations, new ParallelOptions
+                foreach (var d in locations)
                 {
-                    CancellationToken = cts.Token,
-                    MaxDegreeOfParallelism = Environment.ProcessorCount,
-                    TaskScheduler = TaskScheduler.Default
-                },
-                (d, state) =>
-                {
-                    //并行读取所有数据
                     switch (d.NodeType)
                     {
                         case "string":
@@ -180,7 +172,7 @@ public string Run(string deviceID, string groupID)
                             list.Add(floatNode);
                             break;
                     }
-                });
+                }
 
                 result = JsonConvert.SerializeObject(list);
                 list.Clear();