添加日志记录

PLCDataReader/Device/Information/DeviceStatusInfo.cs

@@ -43,14 +43,15 @@ namespace UAS_PLCDataReader.Device.Infomation
             }
             //查询设备参数信息
             sql.Clear();
-            sql.Append("select dr_updatedate,dc_name,case when dc_type='INQTY' then dr_qty when dc_type='OUTQTY' then dr_okqty end data ");
-            sql.Append("from DEVICEPOLLINGCONFIG left join devicecommand on dpc_dccode = dc_code left join DEVICERUNSTATUS ");
+            sql.Append("select dr_updatedate,dc_name,case when dc_type='INQTY' then dr_qty when dc_type='OUTQTY' then dr_okqty when dc_type='TEMPERATURE' ");
+            sql.Append("then dr_TEMPERATURE when dc_type='PARAM1' then dr_value1 when dc_type='PARAM2' then dr_value2 when dc_type='PARAM3' then dr_value3 end ");
+            sql.Append("data from DEVICEPOLLINGCONFIG left join devicecommand on dpc_dccode = dc_code left join DEVICERUNSTATUS ");
             sql.Append("on dpc_decode = dr_decode where dpc_decode = '" + de_code + "'");
             GridDeivceStatusInfo.DataSource = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
             GridViewDeviceStatusInfo.BestFitColumns();
             sql.Clear();
             //查询设备运行日志
-            sql.Append("select * from DEVICERUNRECORD where drr_decode='"+ de_code + "'");
+            sql.Append("select * from DEVICERUNRECORD where drr_decode='" + de_code + "'");
             GridDeviceRunLog.DataSource = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
             sql.Clear();
             sql.Append("select '接收'||nvl(dpg_receivedatasize,0)||'字节' dpg_receivedatasize,'发送'||nvl(dpg_senddatasize,0)||'字节' dpg_senddatasize");
@@ -64,33 +65,6 @@ namespace UAS_PLCDataReader.Device.Infomation
                 string TimeSpan = dt.Rows[0]["dpg_runtime"].ToString();
                 dpg_runtime.Text = BaseUtil.MinutesToDayTime(int.Parse(TimeSpan == "" ? "0" : TimeSpan));
             }
-            //if (Main.ReturnData.ContainsKey(de_code))
-            //{
-            //    //dnc_ip.Text = Main.ReturnData[de_code].SendCount.ToString();
-            //    //dpg_runtime.Text = BaseUtil.MinutesToDayTime((DateTime.Now - Main.ReturnData[de_code].StartTime).TotalMinutes);
-            //    //dpg_onlinetime.Text = Main.ReturnData[de_code].StartTime.ToString("yyyy-MM-dd HH:mm:ss");
-            //    //dpg_senddatasize.Text = Main.ReturnData[de_code].ReceiveDataSize.ToString();
-            //    Dictionary<string, string> ItemData = Main.ReturnData[de_code].ItemData;
-            //    if (ItemData != null && ItemData.Count > 0)
-            //    {
-            //        foreach (var item in ItemData)
-            //        {
-            //            switch (item.Key)
-            //            {
-            //                case "INQTY":
-            //                    INQTY.Text = item.Value;
-            //                    break;
-            //                case "OUTQTY":
-            //                    OUTQTY.Text = item.Value;
-            //                    break;
-            //                case "TEMPERATURE":
-            //                    break;
-            //                default:
-            //                    break;
-            //            }
-            //        }
-            //    }
-            //}
         }
 
         private void DeviceStatusInfo_KeyDown(object sender, KeyEventArgs e)

PLCDataReader/Main.cs

@@ -581,6 +581,7 @@ namespace UAS_PLCDataReader
                         {
                             ReturnData[Decode].ItemData = ItemData;
                             LogicHandler.UpdateDeviceData(Decode, ItemData);
+                            LogicHandler.DoDeviceDataDiffLog(pl.DeviceCode, pl.DeviceName, Command, pl.CommandCode, User.UserName);
                         }
                         //每次更新轮询的数据
                         ReturnData[Decode].ReceiveDataSize += ReceiveCommandByteSize;