ltwork 9 ay önce
ebeveyn
işleme
f16dc15924

+ 33 - 4
B20UVLog/LogPcTask_Biz.cs

@@ -1196,6 +1196,9 @@ namespace B20UVLog
 
         private void IOLogTask()
         {
+          
+            List<IONewModel> ioNewModelList = new List<IONewModel>();
+            DateTime recordTime;
             taskList.Add(Task.Factory.StartNew(() =>
             {
                 while (true)
@@ -1217,15 +1220,41 @@ namespace B20UVLog
                         {
                             continue;
                         }
+                        recordTime = DateTime.Now;
+                        ioNewModelList.Clear();
                         foreach (PlcItemModel plcItem in ioItemLst)
                         {
                             ParsePlcItemData(plcItem, ioRet.Content, 0);
+                            //转化为
+                            IONewModel ioNewModel = new IONewModel();
+                            ioNewModel.IOName = plcItem.PlcItemCode;
+                            if (plcItem.PlcItemCode.Contains("Stage"))
+                            {
+                                ioNewModel.IOType = "Stage";
+                            }
+                            else
+                            {
+                                if (plcItem.PlcItemCode.Contains("IrradiatorInput"))
+                                {
+                                    ioNewModel.IOType = "IrradiatorInput";
+                                }
+                                else
+                                {
+                                    if (plcItem.PlcItemCode.Contains("IrradiatorOutput"))
+                                    {
+                                        ioNewModel.IOType = "IrradiatorOutput";
+                                    }
+                                }
+                            }
+                            ioNewModel.IOValue = Convert.ToInt32(plcItem.Value);
+                            ioNewModel.RecordTime = recordTime;
+                            ioNewModelList.Add(ioNewModel);
                         }
-
+                   
+             
                         //ToDo:把PLC数据插入到数据库中
-                        IOModel axisData = MapPlcItemToObjectProperty<IOModel>(ioItemLst);
-                        axisData.RecordTime = DateTime.Now;
-                        DbHelper.Db.Insertable(axisData).ExecuteCommand();
+                       
+                        DbHelper.Db.Insertable(ioNewModelList).ExecuteCommand();
                 
                     }
             

+ 44 - 0
B20UVLog/Models/IONewModel.cs

@@ -0,0 +1,44 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace B20UVLog.Models
+{
+    [SugarTable("io_new")]
+    public class IONewModel
+    {
+        public IONewModel()
+        {
+
+
+        }
+        /// <summary>
+        /// Desc:
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public int Id { get; set; }
+
+        /// <summary>
+        /// Desc:
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public string EquId { get; set; }
+        public string IOName { get; set; }
+
+        public string IOType { get; set; }
+
+        public int IOValue { get; set; }
+
+        /// <summary>
+        /// Desc:
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public DateTime? RecordTime { get; set; }
+    }
+}

+ 3 - 3
B20UVLog/ViewModels/MainWindowViewModel.cs

@@ -15,9 +15,9 @@ namespace B20UVLog.ViewModels
     {
         public MainWindowViewModel()
         {
-            //LogPcTask_Biz.Instance.Init();
-            //LogPcTask_Biz.Instance.ConnectPlc();
-            //LogPcTask_Biz.Instance.StartPlcLogMonitor();
+            LogPcTask_Biz.Instance.Init();
+            LogPcTask_Biz.Instance.ConnectPlc();
+            LogPcTask_Biz.Instance.StartPlcLogMonitor();
 
         }
         public RelayCommand<object> MenuItemClickCommand