From b6eea38032902e76b708c3555ee152e1ee137409 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周六, 31 8月 2024 14:00:07 +0800
Subject: [PATCH] 1
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/log4net_iWare.config | 102 ++++++++++++++++++++++++++++++++++
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs | 5 +
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/MonitorHelper.cs | 4
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/log4net_iWare - 复制用.config | 16 ++--
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_01.cs | 2
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs | 11 +++
6 files changed, 129 insertions(+), 11 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_01.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_01.cs
index 783d32c..7de6746 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_01.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_01.cs
@@ -174,7 +174,7 @@
//鐩戞帶娴嬭瘯鏁版嵁锛屾ā鎷燂紝娴嬭瘯
MonitorHelper.MonitorTestForOP3501(_dataCaptureConfig, value, colConfig, wplog);
//鐩戞帶涓婄嚎
- MonitorHelper.MonitorTestForLine(_dataCaptureConfig, value, colConfig, wplog);
+ MonitorHelper.MonitorTestForLine(_dataCaptureConfig, value, colConfig, wplog.WorkPieceID);
//鐗规畩澶勭悊OP50 銆怑ditby shaocx,2024-08-16銆�
string sideValue = GetSideForOP50(plcService, wplog);
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs
index 9b0a460..3866743 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_02.cs
@@ -20,6 +20,7 @@
using File = System.IO.File;
using Spire.Additions.Xps.Schema;
using log4net;
+using static Org.BouncyCastle.Math.EC.ECCurve;
namespace iWare_SCADA_BusinessLogical
{
@@ -248,6 +249,16 @@
try
{
+ switch (DataCapturePointCode)
+ {
+ case "OP2002A":
+ case "OP2002B":
+ case "OP2002C":
+ //鐩戞帶涓婄嚎
+ MonitorHelper.MonitorTestForLine(_dataCaptureConfig, value, colConfig, logMiddle.WorkPieceID);
+ break;
+ }
+
if (WorkingProcedure.Equals("OP30"))
{
var time = DateTimeHelper.GetDateTime();
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 6864ea7..dcaed5a 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/MonitorHelper.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/MonitorHelper.cs
@@ -53,7 +53,7 @@
/// </summary>
/// <param name="value"></param>
/// <returns></returns>
- public static void MonitorTestForLine(DataCaptureConfig _dataCaptureConfig, object value, List<DataCaptureColumnConfig> colConfig, WorkPieceLog wplog)
+ public static void MonitorTestForLine(DataCaptureConfig _dataCaptureConfig, object value, List<DataCaptureColumnConfig> colConfig, string workPieceID)
{
Task.Run(() =>
{
@@ -64,7 +64,7 @@
var str = "";
- str += $",涓婄嚎鑾峰彇浜岀淮鐮佸�� ,鍊兼槸{wplog.WorkPieceID.ToString()}";
+ str += $",涓婄嚎鑾峰彇浜岀淮鐮佸�� ,鍊兼槸{workPieceID}";
//str += $",鏁翠綋瀵硅薄 wplog鏄瘂JsonConvert.SerializeObject(wplog)}";
Log4NetHelper.WriteInfoLog(_LogType, str);
diff --git "a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/log4net_iWare - \345\244\215\345\210\266\347\224\250.config" "b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/log4net_iWare - \345\244\215\345\210\266\347\224\250.config"
index fd59844..d129ba1 100644
--- "a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/log4net_iWare - \345\244\215\345\210\266\347\224\250.config"
+++ "b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/log4net_iWare - \345\244\215\345\210\266\347\224\250.config"
@@ -6,8 +6,8 @@
</appSettings>
<log4net>
<!-- 鐩戞帶OP50鍝釜闈㈢嚎绋嬨�愪俊鎭�戞棩蹇�-->
- <appender name="OP1003_Info" type="log4net.Appender.RollingFileAppender">
- <file value="D:\\Log\\SCADALog\\OP1003_Info\\" />
+ <appender name="OP2002C_Info" type="log4net.Appender.RollingFileAppender">
+ <file value="D:\\Log\\SCADALog\\OP2002C_Info\\" />
<appendToFile value="true" />
<rollingStyle value="Date" />
<staticLogFileName value="false" />
@@ -17,13 +17,13 @@
<param name="ConversionPattern" value="%n娑堟伅鏃堕棿锛�%d [%t] %n娑堟伅绾у埆锛�%-5p %n娑� 鎭� 绫伙細%c [%x] %n%m %n "/>
</layout>
<filter type="log4net.Filter.LoggerMatchFilter">
- <loggerToMatch value="OP1003_Info" />
+ <loggerToMatch value="OP2002C_Info" />
</filter>
<filter type="log4net.Filter.DenyAllFilter" />
</appender>
<!--鐩戞帶OP50鍝釜闈㈢嚎绋嬨�愰敊璇�戞棩蹇�-->
- <appender name="OP1003_Error" type="log4net.Appender.RollingFileAppender">
- <file value="D:\\Log\\SCADALog\\OP1003_Error\\" />
+ <appender name="OP2002C_Error" type="log4net.Appender.RollingFileAppender">
+ <file value="D:\\Log\\SCADALog\\OP2002C_Error\\" />
<appendToFile value="true" />
<rollingStyle value="Date" />
<staticLogFileName value="false" />
@@ -33,14 +33,14 @@
<param name="ConversionPattern" value="%n寮傚父鏃堕棿锛�%d [%t] %n寮傚父绾у埆锛�%-5p %n寮� 甯� 绫伙細%c [%x] %n%m %n "/>
</layout>
<filter type="log4net.Filter.LoggerMatchFilter">
- <loggerToMatch value="OP1003_Error" />
+ <loggerToMatch value="OP2002C_Error" />
</filter>
<filter type="log4net.Filter.DenyAllFilter" />
</appender>
<root>
<level value="ALL"/>
- <appender-ref ref="OP1003_Info"/>
- <appender-ref ref="OP1003_Error"/>
+ <appender-ref ref="OP2002C_Info"/>
+ <appender-ref ref="OP2002C_Error"/>
</root>
</log4net>
</configuration>
\ No newline at end of file
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/log4net_iWare.config b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/log4net_iWare.config
index 974215b..c9351e4 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/log4net_iWare.config
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/log4net_iWare.config
@@ -939,8 +939,110 @@
</filter>
<filter type="log4net.Filter.DenyAllFilter" />
</appender>
+ <!-- 鐩戞帶OP50鍝釜闈㈢嚎绋嬨�愪俊鎭�戞棩蹇�-->
+ <appender name="OP2002A_Info" type="log4net.Appender.RollingFileAppender">
+ <file value="D:\\Log\\SCADALog\\OP2002A_Info\\" />
+ <appendToFile value="true" />
+ <rollingStyle value="Date" />
+ <staticLogFileName value="false" />
+ <datePattern value="yyyy-MM-dd.LOG" />
+ <layout type="log4net.Layout.PatternLayout">
+ <!--杈撳嚭鏍煎紡-->
+ <param name="ConversionPattern" value="%n娑堟伅鏃堕棿锛�%d [%t] %n娑堟伅绾у埆锛�%-5p %n娑� 鎭� 绫伙細%c [%x] %n%m %n "/>
+ </layout>
+ <filter type="log4net.Filter.LoggerMatchFilter">
+ <loggerToMatch value="OP2002A_Info" />
+ </filter>
+ <filter type="log4net.Filter.DenyAllFilter" />
+ </appender>
+ <!--鐩戞帶OP50鍝釜闈㈢嚎绋嬨�愰敊璇�戞棩蹇�-->
+ <appender name="OP2002A_Error" type="log4net.Appender.RollingFileAppender">
+ <file value="D:\\Log\\SCADALog\\OP2002A_Error\\" />
+ <appendToFile value="true" />
+ <rollingStyle value="Date" />
+ <staticLogFileName value="false" />
+ <datePattern value="yyyy-MM-dd.LOG" />
+ <layout type="log4net.Layout.PatternLayout">
+ <!--杈撳嚭鏍煎紡-->
+ <param name="ConversionPattern" value="%n寮傚父鏃堕棿锛�%d [%t] %n寮傚父绾у埆锛�%-5p %n寮� 甯� 绫伙細%c [%x] %n%m %n "/>
+ </layout>
+ <filter type="log4net.Filter.LoggerMatchFilter">
+ <loggerToMatch value="OP2002A_Error" />
+ </filter>
+ <filter type="log4net.Filter.DenyAllFilter" />
+ </appender>
+ <!-- 鐩戞帶OP50鍝釜闈㈢嚎绋嬨�愪俊鎭�戞棩蹇�-->
+ <appender name="OP2002B_Info" type="log4net.Appender.RollingFileAppender">
+ <file value="D:\\Log\\SCADALog\\OP2002B_Info\\" />
+ <appendToFile value="true" />
+ <rollingStyle value="Date" />
+ <staticLogFileName value="false" />
+ <datePattern value="yyyy-MM-dd.LOG" />
+ <layout type="log4net.Layout.PatternLayout">
+ <!--杈撳嚭鏍煎紡-->
+ <param name="ConversionPattern" value="%n娑堟伅鏃堕棿锛�%d [%t] %n娑堟伅绾у埆锛�%-5p %n娑� 鎭� 绫伙細%c [%x] %n%m %n "/>
+ </layout>
+ <filter type="log4net.Filter.LoggerMatchFilter">
+ <loggerToMatch value="OP2002B_Info" />
+ </filter>
+ <filter type="log4net.Filter.DenyAllFilter" />
+ </appender>
+ <!--鐩戞帶OP50鍝釜闈㈢嚎绋嬨�愰敊璇�戞棩蹇�-->
+ <appender name="OP2002B_Error" type="log4net.Appender.RollingFileAppender">
+ <file value="D:\\Log\\SCADALog\\OP2002B_Error\\" />
+ <appendToFile value="true" />
+ <rollingStyle value="Date" />
+ <staticLogFileName value="false" />
+ <datePattern value="yyyy-MM-dd.LOG" />
+ <layout type="log4net.Layout.PatternLayout">
+ <!--杈撳嚭鏍煎紡-->
+ <param name="ConversionPattern" value="%n寮傚父鏃堕棿锛�%d [%t] %n寮傚父绾у埆锛�%-5p %n寮� 甯� 绫伙細%c [%x] %n%m %n "/>
+ </layout>
+ <filter type="log4net.Filter.LoggerMatchFilter">
+ <loggerToMatch value="OP2002B_Error" />
+ </filter>
+ <filter type="log4net.Filter.DenyAllFilter" />
+ </appender>
+ <!-- 鐩戞帶OP50鍝釜闈㈢嚎绋嬨�愪俊鎭�戞棩蹇�-->
+ <appender name="OP2002C_Info" type="log4net.Appender.RollingFileAppender">
+ <file value="D:\\Log\\SCADALog\\OP2002C_Info\\" />
+ <appendToFile value="true" />
+ <rollingStyle value="Date" />
+ <staticLogFileName value="false" />
+ <datePattern value="yyyy-MM-dd.LOG" />
+ <layout type="log4net.Layout.PatternLayout">
+ <!--杈撳嚭鏍煎紡-->
+ <param name="ConversionPattern" value="%n娑堟伅鏃堕棿锛�%d [%t] %n娑堟伅绾у埆锛�%-5p %n娑� 鎭� 绫伙細%c [%x] %n%m %n "/>
+ </layout>
+ <filter type="log4net.Filter.LoggerMatchFilter">
+ <loggerToMatch value="OP2002C_Info" />
+ </filter>
+ <filter type="log4net.Filter.DenyAllFilter" />
+ </appender>
+ <!--鐩戞帶OP50鍝釜闈㈢嚎绋嬨�愰敊璇�戞棩蹇�-->
+ <appender name="OP2002C_Error" type="log4net.Appender.RollingFileAppender">
+ <file value="D:\\Log\\SCADALog\\OP2002C_Error\\" />
+ <appendToFile value="true" />
+ <rollingStyle value="Date" />
+ <staticLogFileName value="false" />
+ <datePattern value="yyyy-MM-dd.LOG" />
+ <layout type="log4net.Layout.PatternLayout">
+ <!--杈撳嚭鏍煎紡-->
+ <param name="ConversionPattern" value="%n寮傚父鏃堕棿锛�%d [%t] %n寮傚父绾у埆锛�%-5p %n寮� 甯� 绫伙細%c [%x] %n%m %n "/>
+ </layout>
+ <filter type="log4net.Filter.LoggerMatchFilter">
+ <loggerToMatch value="OP2002C_Error" />
+ </filter>
+ <filter type="log4net.Filter.DenyAllFilter" />
+ </appender>
<root>
<level value="ALL"/>
+ <appender-ref ref="OP2002C_Info"/>
+ <appender-ref ref="OP2002C_Error"/>
+ <appender-ref ref="OP2002B_Info"/>
+ <appender-ref ref="OP2002B_Error"/>
+ <appender-ref ref="OP2002A_Info"/>
+ <appender-ref ref="OP2002A_Error"/>
<appender-ref ref="OP1003_Info"/>
<appender-ref ref="OP1003_Error"/>
<appender-ref ref="OP1002_Info"/>
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs
index c6db01e..170bae0 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs
@@ -287,6 +287,11 @@
/// </summary>
OP1003 = 519,
+
+ OP2002A = 520,
+ OP2002B = 521,
+ OP2002C = 522,
+
}
public enum WorkingProcedureForHMI
--
Gitblit v1.9.3