From 96b262bf9aacdcf75ced36a55c4a9805474c2d9a Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 22 8月 2024 09:23:54 +0800
Subject: [PATCH] 优化 OP70读取数据
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/log4net_iWare.config | 34 +++++++++++++++++
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs | 5 ++
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP7009.cs | 45 +++++++++-------------
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/log4net_iWare - 复制用.config | 20 +++++-----
4 files changed, 68 insertions(+), 36 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP7009.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP7009.cs
index cbfd2ca..c42bd85 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP7009.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP7009.cs
@@ -62,19 +62,19 @@
}
while (true)
{
- ThreadStatusMonitor threadStatusMonitor = new ThreadStatusMonitor();
- threadStatusMonitor.Threadcode = DataCapturePointCode;
- threadStatusMonitor.Threadcname = DataCapturePointCname;
- threadStatusMonitor.Threadendtime = DateTime.Now;
- //threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
- threadStatusMonitor.Threadstatue = 0;
- threadStatusMonitor.ThreadId = Thread.CurrentThread.ManagedThreadId.ToString();
+ //ThreadStatusMonitor threadStatusMonitor = new ThreadStatusMonitor();
+ //threadStatusMonitor.Threadcode = DataCapturePointCode;
+ //threadStatusMonitor.Threadcname = DataCapturePointCname;
+ //threadStatusMonitor.Threadendtime = DateTime.Now;
+ ////threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
+ //threadStatusMonitor.Threadstatue = 0;
+ //threadStatusMonitor.ThreadId = Thread.CurrentThread.ManagedThreadId.ToString();
try
{
//_dataCaptureConfig
if (plcService == null || !plcService.IsConnected)
{
- threadStatusMonitor.ErrorMsg = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
+ // threadStatusMonitor.ErrorMsg = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
SystemValue.lbl_Alert_OP1002 = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
SystemValue.PLCServiceReconnect(plcService);
@@ -85,12 +85,7 @@
}
else
{
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭娴嬫爣璁拌鍙杮DateTime.Now} *****0***");
-
-
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭娴嬫爣璁拌鍙杮DateTime.Now}***1****");
-
- threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
+ // threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
wplog.WorkingProcedure = WorkingProcedure;
@@ -114,9 +109,9 @@
var set = wplog.GetType().GetProperty(col.DataCaptureColumnTabelName);
if (set == null)
{
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {WorkingProcedure}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佺敱浜庡瓧娈靛悕娌℃壘鍒帮紝璧嬪�笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝け璐wplog.Id}");
+ Log4NetHelper.WriteErrorLog(LogType.OP7009, $" {WorkingProcedure}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佺敱浜庡瓧娈靛悕娌℃壘鍒帮紝璧嬪�笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝け璐wplog.Id}");
}
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭娴嬫爣璁拌鍙杮DateTime.Now}***2****{col.DataCaptureColumnTabelName} 鍊� {valuecol.ToString() ?? ""}");
+ Log4NetHelper.WriteInfoLog(LogType.OP7009, $" {DataCapturePointCode}宸ュ簭娴嬫爣璁拌鍙杮DateTime.Now}***2****{col.DataCaptureColumnTabelName} 鍊� {valuecol.ToString() ?? ""}");
if (col.DataCaptureColumnTabelName.Contains("Quality"))
{//瀛楁鍚嶅寘鍚玅uality鏄涓烘槸璐ㄩ噺鏁版嵁锛岄兘鏄浆鎹㈡垚string
@@ -129,15 +124,13 @@
}
catch (Exception setex)
{
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {WorkingProcedure}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id}", setex);
+ Log4NetHelper.WriteErrorLog(LogType.OP7009, $" {WorkingProcedure}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id}", setex);
}
}
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭娴嬫爣璁拌鍙杮DateTime.Now}***3****");
-
if (string.IsNullOrEmpty(wplog.QualityOP70To1) && string.IsNullOrEmpty(wplog.QualityOP70To2) && string.IsNullOrEmpty(wplog.QualityOP70To3))
{
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}璐ㄩ噺淇℃伅涓変釜鍊奸兘鏄┖鐨勶細");
+ //Log4NetHelper.WriteInfoLog(LogType.OP7009, $"璇诲彇 {DataCapturePointCode}璐ㄩ噺淇℃伅涓変釜鍊奸兘鏄┖鐨勶細");
continue;
}
@@ -156,13 +149,13 @@
foreach (var item in noFinishWorkPieceProcessList)
{
wplog.WorkPieceID = item.WorkPieceID;
- WorkPieceInfoManager.QualityInfoCompleteForOP70(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- threadStatusMonitor.Threadstatue = 1;
+ WorkPieceInfoManager.QualityInfoCompleteForOP70(wplog, LogType.OP7009);
+ // threadStatusMonitor.Threadstatue = 1;
}
}
else
{
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}璐ㄩ噺淇℃伅涓変釜鍊兼湁鍊硷紝浣嗘槸鑾峰彇OP70鏈粨鏉熺殑宸ヤ欢鍒楄〃涓虹┖锛�");
+ Log4NetHelper.WriteInfoLog(LogType.OP7009, $"璇诲彇 {DataCapturePointCode}璐ㄩ噺淇℃伅涓変釜鍊兼湁鍊硷紝浣嗘槸鑾峰彇OP70鏈粨鏉熺殑宸ヤ欢鍒楄〃涓虹┖锛�");
}
}
@@ -181,18 +174,18 @@
catch (Exception ex)
{
SystemValue.lbl_Alert_OP1002 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}璐ㄩ噺淇℃伅 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}璐ㄩ噺淇℃伅鏃跺紓甯革細", ex);
+ Log4NetHelper.WriteErrorLog(LogType.OP7009, $"璇诲彇 {DataCapturePointCode}璐ㄩ噺淇℃伅鏃跺紓甯革細", ex);
}
finally
{
- WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
+ //WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
}
}
}
else
{
SystemValue.lbl_Alert_OP1002 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode}璐ㄩ噺淇℃伅 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}璐ㄩ噺淇℃伅 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
+ Log4NetHelper.WriteInfoLog(LogType.OP7009, $"{DataCapturePointCode}璐ㄩ噺淇℃伅 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
}
}
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 71f10d2..cfc6b45 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"
@@ -5,9 +5,9 @@
<appSettings>
</appSettings>
<log4net>
- <!-- 瀹氭湡鍒犻櫎鏁版嵁绾跨▼銆愪俊鎭�戞棩蹇�-->
- <appender name="DeleteData_Info" type="log4net.Appender.RollingFileAppender">
- <file value="D:\\Log\\SCADALog\\DeleteData_Info\\" />
+ <!-- 娓呮礂鏈洪噰闆嗘暟鎹嚎绋嬨�愪俊鎭�戞棩蹇�-->
+ <appender name="OP7009_Info" type="log4net.Appender.RollingFileAppender">
+ <file value="D:\\Log\\SCADALog\\OP7009_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="DeleteData_Info" />
+ <loggerToMatch value="OP7009_Info" />
</filter>
<filter type="log4net.Filter.DenyAllFilter" />
</appender>
- <!--瀹氭湡鍒犻櫎鏁版嵁绾跨▼銆愰敊璇�戞棩蹇�-->
- <appender name="DeleteData_Error" type="log4net.Appender.RollingFileAppender">
- <file value="D:\\Log\\SCADALog\\DeleteData_Error\\" />
+ <!--娓呮礂鏈洪噰闆嗘暟鎹嚎绋嬨�愰敊璇�戞棩蹇�-->
+ <appender name="OP7009_Error" type="log4net.Appender.RollingFileAppender">
+ <file value="D:\\Log\\SCADALog\\OP7009_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="DeleteData_Error" />
+ <loggerToMatch value="OP7009_Error" />
</filter>
<filter type="log4net.Filter.DenyAllFilter" />
</appender>
<root>
<level value="ALL"/>
- <appender-ref ref="DeleteData_Info"/>
- <appender-ref ref="DeleteData_Error"/>
+ <appender-ref ref="OP7009_Info"/>
+ <appender-ref ref="OP7009_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 23df449..13ff65a 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/log4net_iWare.config
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/log4net_iWare.config
@@ -5,6 +5,38 @@
<appSettings>
</appSettings>
<log4net>
+ <!-- 娓呮礂鏈洪噰闆嗘暟鎹嚎绋嬨�愪俊鎭�戞棩蹇�-->
+ <appender name="OP7009_Info" type="log4net.Appender.RollingFileAppender">
+ <file value="D:\\Log\\SCADALog\\OP7009_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="OP7009_Info" />
+ </filter>
+ <filter type="log4net.Filter.DenyAllFilter" />
+ </appender>
+ <!--娓呮礂鏈洪噰闆嗘暟鎹嚎绋嬨�愰敊璇�戞棩蹇�-->
+ <appender name="OP7009_Error" type="log4net.Appender.RollingFileAppender">
+ <file value="D:\\Log\\SCADALog\\OP7009_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="OP7009_Error" />
+ </filter>
+ <filter type="log4net.Filter.DenyAllFilter" />
+ </appender>
<!-- 瀹氭湡鍒犻櫎鏁版嵁绾跨▼銆愪俊鎭�戞棩蹇�-->
<appender name="DeleteData_Info" type="log4net.Appender.RollingFileAppender">
<file value="D:\\Log\\SCADALog\\DeleteData_Info\\" />
@@ -525,6 +557,8 @@
</appender>
<root>
<level value="ALL"/>
+ <appender-ref ref="OP7009_Info"/>
+ <appender-ref ref="OP7009_Error"/>
<appender-ref ref="DeleteData_Info"/>
<appender-ref ref="DeleteData_Error"/>
<appender-ref ref="PLCOP80_QC_Info"/>
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs
index cf5eca5..35b5c92 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_Model/Enums.cs
@@ -217,6 +217,11 @@
/// </summary>
DeleteData = 500,
+ /// <summary>
+ /// 娓呮礂鏈洪噰闆嗘暟鎹�
+ /// </summary>
+ OP7009 = 503,
+
}
--
Gitblit v1.9.3