From dc054fdab657fc1ed91be0c81cc5c1e8f76117f0 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 05 9月 2024 07:43:51 +0800
Subject: [PATCH] 优化
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/SystemValue.cs | 4
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1003.cs | 70 ++++++++++-------
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/MonitorHelper.cs | 36 ++++----
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/SystemBussinessHelper.cs | 2
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1002.cs | 52 +++++++-----
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/DataCaptureHandler_01.cs | 49 +++++++----
6 files changed, 124 insertions(+), 89 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/SystemValue.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/SystemValue.cs
index 54574ba..c5aa581 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/SystemValue.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/BLL/SystemValue.cs
@@ -446,11 +446,11 @@
/// <summary>
/// OP10宸ュ簭娴嬭瘯瀹屾垚鏍囪鍊�
/// </summary>
- public static string value_OP1002 = string.Empty;
+ public static string value_OP1002 = "FALSE";//娉ㄦ剰锛氶粯璁ゆ槸FALSE 銆怑ditby shaocx,2024-09-05銆�
/// <summary>
/// OP10宸ュ簭鎺ㄥ嚭鏍囪鍊�
/// </summary>
- public static string value_OP1003 = string.Empty;
+ public static string value_OP1003 = "FALSE";//娉ㄦ剰锛氶粯璁ゆ槸FALSE 銆怑ditby shaocx,2024-09-05銆�
/// <summary>
/// OP10宸ュ簭SPC鎺ㄥ嚭鏍囪鍊�
/// </summary>
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 ea0b238..953c0c3 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
@@ -106,7 +106,7 @@
//plcService.Close();
//plcService.OpenService();
}
- string value_01 = "";
+ string value_01 = "FALSE";//娉ㄦ剰锛氶粯璁ゆ槸FALSE 銆怑ditby shaocx,2024-09-05銆�
while (true)
{
threadStatusMonitor.ErrorMsg = "";
@@ -135,7 +135,9 @@
object value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
WorkPieceLog wplog = null;
- if (value.ToString().ToUpper().Equals("TRUE"))
+
+ var value_bool = value.ToString().ToUpper().Equals("TRUE");
+ if (value_bool)
{
wplog = new WorkPieceLog();
wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
@@ -175,33 +177,42 @@
//鐩戞帶涓婄嚎
MonitorHelper.MonitorTestForLine(_dataCaptureConfig, value, colConfig, wplog.WorkPieceID);
}
+ if (wplog != null)
+ {
+ var isRight = SystemBussinessHelper.ValidateIsRightWorkPieceID(wplog.WorkPieceID);
+ if (isRight)
+ {
+ #region 澶勭悊涓氬姟
- if (value_01.ToUpper().Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
- {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
- //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
- //涓氬姟浠ｇ爜
- threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
+ if (value_01.ToUpper().Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
+ {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
+ //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
+ //涓氬姟浠ｇ爜
+ threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
- //鐗规畩澶勭悊OP50 銆怑ditby shaocx,2024-08-16銆�
- string sideValue = GetSideForOP50(plcService, wplog);
- wplog.MonitoringPoint += sideValue;
- //wplog.CreatedUserName = wplog.MonitoringPoint;
- SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref wplog, wplog.MonitoringPoint, DataCapturePointCname);
+ //鐗规畩澶勭悊OP50 銆怑ditby shaocx,2024-08-16銆�
+ string sideValue = GetSideForOP50(plcService, wplog);
+ wplog.MonitoringPoint += sideValue;
+ //wplog.CreatedUserName = wplog.MonitoringPoint;
+ SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref wplog, wplog.MonitoringPoint, DataCapturePointCname);
- //璇诲彇浜岀淮鐮佸悗鏇存柊鏁版嵁搴�
- WorkPieceInfoManager.ReadQRcode(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), plcService, _dataCaptureConfig.IsFeedback);
+ //璇诲彇浜岀淮鐮佸悗鏇存柊鏁版嵁搴�
+ WorkPieceInfoManager.ReadQRcode(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), plcService, _dataCaptureConfig.IsFeedback);
- threadStatusMonitor.Threadstatue = 1;
+ threadStatusMonitor.Threadstatue = 1;
+ }
+ value_01 = value.ToString();
+
+ #endregion
+ }
}
- value_01 = value.ToString();
-
}
threadStatusMonitor.Remarks = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
{
- threadStatusMonitor.ThreadFrequency = 1000;
- Thread.Sleep(1000);
+ threadStatusMonitor.ThreadFrequency = 700;
+ Thread.Sleep(700);
}
else
{
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1002.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1002.cs
index 62749a9..bc52240 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1002.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1002.cs
@@ -93,7 +93,8 @@
Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭娴嬫爣璁拌鍙杮DateTime.Now}*****01****{stopwatch.ElapsedMilliseconds}");
WorkPieceLogMiddle wplog = null;
- if (value.ToString().ToUpper().Equals("TRUE"))
+ var value_bool = value.ToString().ToUpper().Equals("TRUE");
+ if (value_bool)
{
threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
wplog = new WorkPieceLogMiddle();
@@ -142,43 +143,52 @@
//鐩戞帶涓婄嚎
MonitorHelper.MonitorTestForLine(_dataCaptureConfig, value, colConfig, wplog.WorkPieceID);
}
+ if (wplog != null)
+ {
+ var isRight = SystemBussinessHelper.ValidateIsRightWorkPieceID(wplog.WorkPieceID);
+ if (isRight)
+ {
+ #region 涓氬姟澶勭悊
- if (SystemValue.value_OP1002.ToUpper().Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
- {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
- //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
- //涓氬姟浠ｇ爜
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭娴嬫爣璁拌鍙杮DateTime.Now}***1****");
+ if (SystemValue.value_OP1002.ToUpper().Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
+ {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
+ //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
+ //涓氬姟浠ｇ爜
+ Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭娴嬫爣璁拌鍙杮DateTime.Now}***1****");
- //#region 宸ユ帶鏈鸿鍙栬川閲忎俊鎭�
+ //#region 宸ユ帶鏈鸿鍙栬川閲忎俊鎭�
- ////鎵弿鍏变韩鐩綍骞跺皢鏂扮殑鏂囦欢鎵弿杩斿洖
- //var newFiles = FileHelper.DetectNewFilesCSV("", 10, DateTimeHelper.GetDateTime(), DateTimeHelper.GetDateTime());
- //foreach (System.IO.FileInfo file in newFiles)
- //{
- // var datatable = CSVHelper.ReadCSV(file.FullName);
- //}
+ ////鎵弿鍏变韩鐩綍骞跺皢鏂扮殑鏂囦欢鎵弿杩斿洖
+ //var newFiles = FileHelper.DetectNewFilesCSV("", 10, DateTimeHelper.GetDateTime(), DateTimeHelper.GetDateTime());
+ //foreach (System.IO.FileInfo file in newFiles)
+ //{
+ // var datatable = CSVHelper.ReadCSV(file.FullName);
+ //}
- //#endregion
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭娴嬫爣璁拌鍙杮DateTime.Now}***3****");
+ //#endregion
+ Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭娴嬫爣璁拌鍙杮DateTime.Now}***3****");
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.QualityInfoComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- threadStatusMonitor.Threadstatue = 1;
+ //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+ WorkPieceInfoManager.QualityInfoComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+ threadStatusMonitor.Threadstatue = 1;
+ }
+ SystemValue.value_OP1002 = value.ToString();
+
+ #endregion
+ }
}
- SystemValue.value_OP1002 = value.ToString();
-
}
SystemValue.lbl_Alert_OP1002 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
{
- Thread.Sleep(5000);
+ Thread.Sleep(700);
}
else
{
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1003.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1003.cs
index 8655dd1..6b2dc90 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1003.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandlerV2/Special/DataCaptureHandler_OP1003.cs
@@ -89,8 +89,10 @@
var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
stopwatch.Stop();
Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭娴嬫爣璁拌鍙杮DateTime.Now}*****01****{stopwatch.ElapsedMilliseconds}*****{value.ToString().ToUpper()}**");
+
WorkPieceLogMiddle wplog = null;
- if (value.ToString().ToUpper().Equals("TRUE"))
+ var value_bool = value.ToString().ToUpper().Equals("TRUE");
+ if (value_bool)
{
threadStatusMonitor.Threadlastmodifytime = DateTime.Now;
wplog = new WorkPieceLogMiddle();
@@ -136,42 +138,52 @@
//鐩戞帶涓婄嚎
MonitorHelper.MonitorTestForLine(_dataCaptureConfig, value, colConfig, wplog.WorkPieceID);
}
- if (SystemValue.value_OP1003.ToUpper().Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
- {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
- //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
- //涓氬姟浠ｇ爜
+ if (wplog != null)
+ {
+ var isRight = SystemBussinessHelper.ValidateIsRightWorkPieceID(wplog.WorkPieceID);
+ if (isRight)
+ {
+ #region 涓氬姟澶勭悊
- if (wplog.WorkPieceID.Length != 22)
- {//鑾峰彇鍒扮殑宸ヤ欢鍙峰紓甯�
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佹暟鎹椂寮傚父锛�");
- continue;
+ if (SystemValue.value_OP1003.ToUpper().Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
+ {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
+ //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
+ //涓氬姟浠ｇ爜
+
+ if (wplog.WorkPieceID.Length != 22)
+ {//鑾峰彇鍒扮殑宸ヤ欢鍙峰紓甯�
+ Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佹暟鎹椂寮傚父锛�");
+ continue;
+ }
+
+ //#region 宸ユ帶鏈鸿鍙栬川閲忎俊鎭�
+
+
+ ////鎵弿鍏变韩鐩綍骞跺皢鏂扮殑鏂囦欢鎵弿杩斿洖
+ //var newFiles = FileHelper.DetectNewFilesCSV("", 10, DateTimeHelper.GetDateTime(), DateTimeHelper.GetDateTime());
+ //foreach (System.IO.FileInfo file in newFiles)
+ //{
+ // var datatable = CSVHelper.ReadCSV(file.FullName);
+ //}
+
+ //#endregion
+
+
+ //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+ WorkPieceInfoManager.QualityInfoComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+ threadStatusMonitor.Threadstatue = 1;
+ }
+ SystemValue.value_OP1003 = value.ToString();
+
+ #endregion
}
-
- //#region 宸ユ帶鏈鸿鍙栬川閲忎俊鎭�
-
-
- ////鎵弿鍏变韩鐩綍骞跺皢鏂扮殑鏂囦欢鎵弿杩斿洖
- //var newFiles = FileHelper.DetectNewFilesCSV("", 10, DateTimeHelper.GetDateTime(), DateTimeHelper.GetDateTime());
- //foreach (System.IO.FileInfo file in newFiles)
- //{
- // var datatable = CSVHelper.ReadCSV(file.FullName);
- //}
-
- //#endregion
-
-
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.QualityInfoComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- threadStatusMonitor.Threadstatue = 1;
}
- SystemValue.value_OP1003 = value.ToString();
-
}
SystemValue.lbl_Alert_OP1003 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
{
- Thread.Sleep(5000);
+ Thread.Sleep(700);
}
else
{
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 cbd170b..00b509a 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/MonitorHelper.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/MonitorHelper.cs
@@ -73,25 +73,27 @@
//涓嶆甯哥殑鐮佸啓鍏ユ暟鎹簱
var isRight = SystemBussinessHelper.ValidateIsRightWorkPieceID(workPieceID);
+ PieceLogTypeEnum pieceLogTypeEnum = PieceLogTypeEnum.姝ｅ父;
if (isRight == false)
{
- WorkPieceLog workPieceLog = new WorkPieceLog()
- {
- Id = Yitter.IdGenerator.YitIdHelper.NextId(),
- WorkPieceID = workPieceID,
- WorkingProcedure = _dataCaptureConfig.WorkingProcedure,
- CreatedTime = DateTime.Now,
- CreatedUserName = _dataCaptureConfig.DataCapturePointCode,
- MyRemarks = "璇荤爜鍊煎紓甯�",
- Remarks = "璇荤爜鍊煎紓甯�",
- PieceLogType = (int)PieceLogTypeEnum.璇荤爜鍊煎紓甯�,
- PieceLogTypeName = PieceLogTypeEnum.璇荤爜鍊煎紓甯�.ToString()
- };
- using (DbModel db = new DbModel())
- {
- db.WorkPieceLog.Add(workPieceLog);
- db.SaveChanges();
- }
+ pieceLogTypeEnum = PieceLogTypeEnum.璇荤爜鍊煎紓甯�;
+ }
+ WorkPieceLog workPieceLog = new WorkPieceLog()
+ {
+ Id = Yitter.IdGenerator.YitIdHelper.NextId(),
+ WorkPieceID = workPieceID,
+ WorkingProcedure = _dataCaptureConfig.WorkingProcedure,
+ CreatedTime = DateTime.Now,
+ CreatedUserName = _dataCaptureConfig.DataCapturePointCode,
+ MyRemarks = "",
+ Remarks = pieceLogTypeEnum.ToString(),
+ PieceLogType = (int)pieceLogTypeEnum,
+ PieceLogTypeName = pieceLogTypeEnum.ToString()
+ };
+ using (DbModel db = new DbModel())
+ {
+ db.WorkPieceLog.Add(workPieceLog);
+ db.SaveChanges();
}
}
catch (Exception ex)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/SystemBussinessHelper.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/SystemBussinessHelper.cs
index e80b66e..9c6d13c 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/SystemBussinessHelper.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/SystemBussinessHelper.cs
@@ -59,7 +59,7 @@
var n_workPieceID = workPieceID.Trim();
if (n_workPieceID.Length == 22)
{
- if (n_workPieceID.IndexOf("ERROR") > -1)
+ if (n_workPieceID.ToUpper().IndexOf("ERROR") > -1)
{
return false;
}
--
Gitblit v1.9.3