From de80413b078879297adb59b588b41febf7f798cd Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 03 9月 2024 15:16:56 +0800
Subject: [PATCH] 优化
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8007.cs | 340 ++++++++++++++++++++++++++++----------------------------
1 files changed, 170 insertions(+), 170 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8007.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8007.cs
index b2f42c0..57a0685 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8007.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP8007.cs
@@ -1,195 +1,195 @@
-锘縰sing iWare_SCADA_BusinessLogical.BLL;
-using iWare_SCADA_BusinessLogical.Utils;
-using iWare_SCADA_Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
+锘�//using iWare_SCADA_BusinessLogical.BLL;
+//using iWare_SCADA_BusinessLogical.Utils;
+//using iWare_SCADA_Model;
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using System.Threading;
+//using System.Threading.Tasks;
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// OP80 鍛婅鐩戞帶
- /// </summary>
- public class DataCaptureHandler_OP8007: DataCaptureHandler
- {
- public static readonly DataCaptureHandler_OP8007 Instance = new DataCaptureHandler_OP8007();
+//namespace iWare_SCADA_BusinessLogical
+//{
+// /// <summary>
+// /// OP80 鍛婅鐩戞帶
+// /// </summary>
+// public class DataCaptureHandler_OP8007: DataCaptureHandler
+// {
+// public static readonly DataCaptureHandler_OP8007 Instance = new DataCaptureHandler_OP8007();
- public DataCaptureHandler_OP8007()
- {
- }
+// public DataCaptureHandler_OP8007()
+// {
+// }
- public override string WorkingProcedure
- {
- get { return _dataCaptureConfig.WorkingProcedure; }
- }
+// public override string WorkingProcedure
+// {
+// get { return _dataCaptureConfig.WorkingProcedure; }
+// }
- public override string DataCapturePointCode
- {
- get { return _dataCaptureConfig.DataCapturePointCode; }
- }
- public override string DataCapturePointCname
- {
- get { return _dataCaptureConfig.DataCapturePointCname; }
- }
+// public override string DataCapturePointCode
+// {
+// get { return _dataCaptureConfig.DataCapturePointCode; }
+// }
+// public override string DataCapturePointCname
+// {
+// get { return _dataCaptureConfig.DataCapturePointCname; }
+// }
- public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
- {
- //try
- //{
- // foreach (var dataCaptureColumnDict in dataCaptureConfig)
- // {
- // switch (dataCaptureColumnDict.DataCapturePointCode)
- // {
- // case "OP8007":
- // //_dataCaptureConfig = dataCaptureColumnDict;
- // IsCaptureflag = true;
- // return;
+// public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
+// {
+// //try
+// //{
+// // foreach (var dataCaptureColumnDict in dataCaptureConfig)
+// // {
+// // switch (dataCaptureColumnDict.DataCapturePointCode)
+// // {
+// // case "OP8007":
+// // //_dataCaptureConfig = dataCaptureColumnDict;
+// // IsCaptureflag = true;
+// // return;
- // }
- // }
- //}
- //catch (Exception ex)
- //{
- // SystemValue._lbl_Alert_OP8007 = $" {RandomHelper.GenerateRandomCode(4)} OP80宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- // Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "鍒锋柊 OP80宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- //}
- }
+// // }
+// // }
+// //}
+// //catch (Exception ex)
+// //{
+// // SystemValue._lbl_Alert_OP8007 = $" {RandomHelper.GenerateRandomCode(4)} OP80宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// // Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "鍒锋柊 OP80宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// //}
+// }
- public override void DataCaptureStart()
- {
- if (SystemValue.isStartedModel)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
+// public override void DataCaptureStart()
+// {
+// if (SystemValue.isStartedImitateModel)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.IsDeleted = false;
- wplog.WorkPieceID = WorkPieceID;
- wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
- wplog.UpdatedTime = DateTimeHelper.GetDateTime();
- wplog.UpdatedUserName = DataCapturePointCode;
+// wplog.WorkPieceID = WorkPieceID;
+// wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
+// wplog.UpdatedTime = DateTimeHelper.GetDateTime();
+// wplog.UpdatedUserName = DataCapturePointCode;
- wplog.AlertTime = DateTime.Now;
- Random ran = new Random();
- //wplog.FailureType = "1101"+ ran.Next(0,100);
- wplog.AlertMsg = "娴嬭瘯鍛婅 1101";
+// wplog.AlertTime = DateTime.Now;
+// Random ran = new Random();
+// //wplog.FailureType = "1101"+ ran.Next(0,100);
+// wplog.AlertMsg = "娴嬭瘯鍛婅 1101";
- wplog.EquipmentCurrentState = ((int)EnumEquipmentCurrentStateDisplay.鐢熶骇).ToString();
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.AlertMonitor(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+// wplog.EquipmentCurrentState = ((int)EnumEquipmentCurrentStateDisplay.鐢熶骇).ToString();
+// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+// WorkPieceInfoManager.AlertMonitor(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- return;
- }
- if (IsCaptureflag)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- if (plcService == null)
- {
- SystemValue.lbl_Alert_OP8007 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
- return;
- }
- if (plcService != null && !plcService.IsConnected)
- {
- plcService.Close();
- plcService.OpenService();
- }
- while (true)
- {
- try
- {
- //_dataCaptureConfig
- if (plcService == null || !plcService.IsConnected)
- {
- SystemValue.lbl_Alert_OP8007 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- plcService.Close();
- plcService.OpenService();
- Thread.Sleep(100);
- continue;
- }
- else
- {
- var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
- if (SystemValue.value_OP8007.Equals("0") && value.ToString().Equals("1"))
- {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
- //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
- //涓氬姟浠ｇ爜
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.WorkPieceID = "123456";
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
- foreach (var col in colConfig)
- {
- switch(col.DbNumber+ col.Offset)
- {
- case "":
- var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, PLCManger.GetTypeForString(col.DataCaptureColumnType));
- wplog.WorkPieceID = valuecol.ToString();
- break;
- }
- }
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.AlertMonitor(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+// return;
+// }
+// if (IsCaptureflag)
+// {
+// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+// if (plcService == null)
+// {
+// SystemValue.lbl_Alert_OP8007 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
+// return;
+// }
+// if (plcService != null && !plcService.IsConnected)
+// {
+// plcService.Close();
+// plcService.OpenService();
+// }
+// while (true)
+// {
+// try
+// {
+// //_dataCaptureConfig
+// if (plcService == null || !plcService.IsConnected)
+// {
+// SystemValue.lbl_Alert_OP8007 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
+// plcService.Close();
+// plcService.OpenService();
+// Thread.Sleep(100);
+// continue;
+// }
+// else
+// {
+// var value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
+// if (SystemValue.value_OP8007.Equals("0") && value.ToString().Equals("1"))
+// {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
+// //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
+// //涓氬姟浠ｇ爜
+// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
+// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
+// wplog.WorkingProcedure = WorkingProcedure;
+// wplog.EquipmentID = WorkingProcedure;
+// wplog.Remarks = WorkingProcedure;
+// wplog.MonitoringPoint = DataCapturePointCode;
+// wplog.WorkPieceID = "123456";
+// wplog.CreatedTime = DateTimeHelper.GetDateTime();
+// wplog.CreatedUserName = DataCapturePointCode;
+// wplog.IsDeleted = false;
+// foreach (var col in colConfig)
+// {
+// switch(col.DbNumber+ col.Offset)
+// {
+// case "":
+// var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, PLCManger.GetTypeForString(col.DataCaptureColumnType));
+// wplog.WorkPieceID = valuecol.ToString();
+// break;
+// }
+// }
+// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+// WorkPieceInfoManager.AlertMonitor(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- //鍒ゆ柇鏄惁璺冲簭锛屼笂涓�宸ュ簭璐ㄩ噺鏄惁鍚堟牸
+// //鍒ゆ柇鏄惁璺冲簭锛屼笂涓�宸ュ簭璐ㄩ噺鏄惁鍚堟牸
- //鍙嶉缁橮LC锛屽啓鍏�
+// //鍙嶉缁橮LC锛屽啓鍏�
- }
- //SystemValue.value_OP8007 = value.ToString();
+// }
+// //SystemValue.value_OP8007 = value.ToString();
- }
- SystemValue.lbl_Alert_OP8007 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
+// }
+// SystemValue.lbl_Alert_OP8007 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
- if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
- {
- Thread.Sleep(5000);
- }
- else
- {
- Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
- }
+// if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
+// {
+// Thread.Sleep(5000);
+// }
+// else
+// {
+// Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
+// }
- }
- catch (System.Data.Entity.Validation.DbEntityValidationException ex)
- {
- SystemValue.lbl_Alert_OP8007 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- }
- catch (Exception ex)
- {
- SystemValue.lbl_Alert_OP8007 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- }
- }
- }
- else
- {
- SystemValue.lbl_Alert_OP8007 = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇粄WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
- }
- }
+// }
+// catch (System.Data.Entity.Validation.DbEntityValidationException ex)
+// {
+// SystemValue.lbl_Alert_OP8007 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// }
+// catch (Exception ex)
+// {
+// SystemValue.lbl_Alert_OP8007 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇诲彇 {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
+// }
+// }
+// }
+// else
+// {
+// SystemValue.lbl_Alert_OP8007 = $" {RandomHelper.GenerateRandomCode(4)} {WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
+// Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), "璇粄WorkingProcedure}宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
+// }
+// }
- }
-}
+// }
+//}
--
Gitblit v1.9.3