fix

WCS.WorkEngineering/Systems/DataCollectionSysyem.cs

@@ -28,28 +28,43 @@ namespace WCS.Service.Systems
 
         protected override bool Do(bool obj)
         {
-            //SqlSugarHelper.Do(db =>
-            //{
-            //    DeviceDataPack pack = new DeviceDataPack();
-            //    pack.Frame = DateTime.Now;
-            //    //pack.
+            SqlSugarHelper.Do(db =>
+            {
+                DeviceDataPack pack = new DeviceDataPack();
+                pack.StationDatas = new DeviceDataCollection<StationData>();
+                pack.StationDatas.Frame = DateTime.Now;
 
-            //    //byte[] bytes = System.Text.Encoding.Default.GetBytes(JsonConvert.SerializeObject(ConvList, null, new JsonSerializerSettings { ReferenceLoopHandling = ReferenceLoopHandling.Ignore }));
+                foreach (var item in ConvList)
+                {
+                    pack.StationDatas.Datas.Append(new StationData()
+                    {
+                        Code = item.Entity.Code,
+                        Frame = DateTime.Now,
+                        D520 = item.Data as WCS_Station520,
+                        D521 = item.Data as WCS_Station521,
+                        D523 = item.Data as WCS_Station523,
 
-            //    var plcData = new WCS_PlcData()
-            //    {
-            //        AddWho = "WCS",
-            //        WAREHOUSE = ServiceHub.WarehouseName,
-            //        CONTENT = JsonConvert.SerializeObject(ConvList, null, new JsonSerializerSettings { ReferenceLoopHandling = ReferenceLoopHandling.Ignore }),
-            //    };
+                    });
+                }
+                pack.Frame = DateTime.Now;
+                //pack.
 
-            //    var a = TypeConversionHelper.SerializeRedisValue(ConvList);
+                //byte[] bytes = System.Text.Encoding.Default.GetBytes(JsonConvert.SerializeObject(ConvList, null, new JsonSerializerSettings { ReferenceLoopHandling = ReferenceLoopHandling.Ignore }));
 
-            //    //对bytes进行数据压缩
-            //    //plcData.CONTENT = bytes.Compress();
+                var plcData = new WCS_PlcData()
+                {
+                    AddWho = "WCS",
+                    WAREHOUSE = ServiceHub.WarehouseName,
+                    CONTENT = JsonConvert.SerializeObject(ConvList, null, new JsonSerializerSettings { ReferenceLoopHandling = ReferenceLoopHandling.Ignore }),
+                };
 
-            //    db.Default.Insertable(plcData).ExecuteCommand();
-            //});
+                var a = TypeConversionHelper.SerializeRedisValue(ConvList);
+
+                //对bytes进行数据压缩
+                //plcData.CONTENT = bytes.Compress();
+
+                db.Default.Insertable(plcData).ExecuteCommand();
+            });
             return true;
         }
     }