From 5c34ca4f23c702291188f122b05165310b579cbc Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周六, 31 8月 2024 10:03:54 +0800
Subject: [PATCH] 监控上线

---
 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/MonitorHelper.cs |   56 +++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/MonitorHelper.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/MonitorHelper.cs
index c3f927a..6864ea7 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/MonitorHelper.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/MonitorHelper.cs
@@ -6,6 +6,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using static Org.BouncyCastle.Math.EC.ECCurve;
 
 namespace iWare_SCADA_BusinessLogical.Utils
 {
@@ -21,26 +22,59 @@
         /// <returns></returns>
         public static void MonitorTestForOP3501(DataCaptureConfig _dataCaptureConfig, object value, List<DataCaptureColumnConfig> colConfig, WorkPieceLog wplog)
         {
-            try
+            Task.Run(() =>
             {
-                if (_dataCaptureConfig.DataCapturePointCode == "OP3501")
+                try
+                {
+                    if (_dataCaptureConfig.DataCapturePointCode == "OP3501")
+                    {
+                        //璁板綍涓� 瑙﹀彂鐨勭偣浣嶅拰鎵惧埌鐨勪簩缁寸爜鍊�
+                        var str = "";
+                        str = $"OP3501 瑙﹀彂鐨勭偣浣� DbNumber:{_dataCaptureConfig.DbNumber},Offset:{_dataCaptureConfig.Offset},鍊兼槸{value.ToString()}";
+
+                        var col = colConfig.First(o => o.DataCapturePointCode == _dataCaptureConfig.DataCapturePointCode && o.DataCapturePointCname == "浜岀淮鐮�");
+
+                        str += $",鑾峰彇浜岀淮鐮佸�� DbNumber:{col.DbNumber},Offset:{col.Offset},鍊兼槸{wplog.WorkPieceID.ToString()}";
+                        //str += $",鏁翠綋瀵硅薄 wplog鏄瘂JsonConvert.SerializeObject(wplog)}";
+
+                        Log4NetHelper.WriteInfoLog(LogType.MonitorTest, str);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Log4NetHelper.WriteErrorLog(LogType.MonitorTest, "MonitorTestForOP3501寮傚父", ex);
+                }
+            });
+        }
+
+
+        /// <summary>
+        /// 鐩戞帶涓婄嚎
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static void MonitorTestForLine(DataCaptureConfig _dataCaptureConfig, object value, List<DataCaptureColumnConfig> colConfig, WorkPieceLog wplog)
+        {
+            Task.Run(() =>
+            {
+                LogType _LogType = PLCManger.GetLogTypeForOnLine(_dataCaptureConfig.DataCapturePointCode);
+                try
                 {
                     //璁板綍涓� 瑙﹀彂鐨勭偣浣嶅拰鎵惧埌鐨勪簩缁寸爜鍊�
                     var str = "";
-                    str = $"OP3501 瑙﹀彂鐨勭偣浣� DbNumber:{_dataCaptureConfig.DbNumber},Offset:{_dataCaptureConfig.Offset},鍊兼槸{value.ToString()}";
 
-                    var col = colConfig.First(o => o.DataCapturePointCode == _dataCaptureConfig.DataCapturePointCode && o.DataCapturePointCname == "浜岀淮鐮�");
 
-                    str += $",鑾峰彇浜岀淮鐮佸�� DbNumber:{col.DbNumber},Offset:{col.Offset},鍊兼槸{wplog.WorkPieceID.ToString()}";
+                    str += $",涓婄嚎鑾峰彇浜岀淮鐮佸�� ,鍊兼槸{wplog.WorkPieceID.ToString()}";
                     //str += $",鏁翠綋瀵硅薄 wplog鏄瘂JsonConvert.SerializeObject(wplog)}";
 
-                    Log4NetHelper.WriteInfoLog(LogType.MonitorTest, str);
+                    Log4NetHelper.WriteInfoLog(_LogType, str);
+
                 }
-            }
-            catch (Exception ex)
-            {
-                Log4NetHelper.WriteErrorLog(LogType.MonitorTest, "MonitorTestForOP3501寮傚父", ex);
-            }
+                catch (Exception ex)
+                {
+                    Log4NetHelper.WriteErrorLog(_LogType, "MonitorTestForLine寮傚父:" + ex.Message, ex);
+                }
+            });
         }
     }
 }

--
Gitblit v1.9.3