From 2a55eedc9ba903c6a0b9cab8fa5ddc8fee9682aa Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 02 9月 2024 09:22:26 +0800
Subject: [PATCH] 显示  [StringLength(50)]         public string DataCapturePointCname { get; set; }

---
 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3505.cs |  348 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 174 insertions(+), 174 deletions(-)

diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3505.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3505.cs
index 4425913..97596c1 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3505.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP3505.cs
@@ -1,193 +1,193 @@
-锘縰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>
-    /// OP35 宸ュ簭瀹屾垚
-    /// </summary>
-    public class DataCaptureHandler_OP3505: DataCaptureHandler
-    {
-        public static readonly DataCaptureHandler_OP3505 Instance = new DataCaptureHandler_OP3505();
+//namespace iWare_SCADA_BusinessLogical
+//{
+//    /// <summary>
+//    /// OP35 宸ュ簭瀹屾垚
+//    /// </summary>
+//    public class DataCaptureHandler_OP3505: DataCaptureHandler
+//    {
+//        public static readonly DataCaptureHandler_OP3505 Instance = new DataCaptureHandler_OP3505();
 
-        public DataCaptureHandler_OP3505()
-        {
-        }
+//        public DataCaptureHandler_OP3505()
+//        {
+//        }
 
-        public override string WorkingProcedure
-        {
-            get { return _dataCaptureConfig.WorkingProcedure; }
-        }
+//        public override string WorkingProcedure
+//        {
+//            get { return _dataCaptureConfig.WorkingProcedure; }
+//        }
 
-        public override string DataCapturePointCode
-        {
-            get { return _dataCaptureConfig.WorkingProcedure; }
-        }
-        public override string DataCapturePointCname
-        {
-            get { return _dataCaptureConfig.DataCapturePointCname; }
-        }
+//        public override string DataCapturePointCode
+//        {
+//            get { return _dataCaptureConfig.WorkingProcedure; }
+//        }
+//        public override string DataCapturePointCname
+//        {
+//            get { return _dataCaptureConfig.DataCapturePointCname; }
+//        }
 
 
-        public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
-        {
-        }
+//        public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
+//        {
+//        }
 
-        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.WorkPieceID = "123456";
-                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.WorkPieceID = "123456";
+//                wplog.CreatedTime = DateTimeHelper.GetDateTime();
+//                wplog.CreatedUserName = DataCapturePointCode;
+//                wplog.IsDeleted = false;
+
+                
+//                wplog.WorkPieceID = WorkPieceID;
+//                wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
+//                wplog.UpdatedTime = DateTimeHelper.GetDateTime();
+//                wplog.UpdatedUserName = DataCapturePointCode;
+//                //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+//                WorkPieceInfoManager.WorkingProcedureComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+
+//                return;
+//            }
+//            if (IsCaptureflag)
+//            {
+//                var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
+//                if (plcService == null)
+//                {
+//                    SystemValue.lbl_Alert_OP3505 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{DataCapturePointCode}鐨凱LC璁惧";
+//                    return;
+//                }
+//                if (plcService != null && !plcService.IsConnected)
+//                {
+//                    plcService.Close();
+//                    plcService.OpenService();
+//                }
+//                SystemValue.lbl_Alert_OP3501 = $"{RandomHelper.GenerateRandomCode(4)} 寮�濮嬮噰闆唟DataCapturePointCode}鐨凱LC璁惧";
+//                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();
+//                    try
+//                    {
+//                        //_dataCaptureConfig
+//                        if (plcService == null || !plcService.IsConnected)
+//                        {
+//                            SystemValue.lbl_Alert_OP3505 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode} 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_OP3005.Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
+//                            {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
+//                             //瑙﹀彂鎿嶄綔,  骞剁粰闈欐�佸彉閲忚祴鍊间负1
+//                             //涓氬姟浠g爜
+//                                Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(_dataCaptureConfig.WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鑾峰彇鍒颁笅绾挎爣蹇椾綅");
+
+//                                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;
+//                                foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
+//                                {
+//                                    try
+//                                    {
+
+//                                        var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
+//                                        //wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
+//                                        var set = wplog.GetType().GetProperty(col.DataCaptureColumnTabelName);
+//                                        if (set == null)
+//                                        {
+//                                            Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(_dataCaptureConfig.WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佺敱浜庡瓧娈靛悕娌℃壘鍒帮紝璧嬪�笺�恵_dataCaptureConfig.WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝け璐wplog.Id}");
+//                                        }
+//                                        set.SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
+//                                    }
+//                                    catch(Exception setex)
+//                                    {
+//                                        Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(_dataCaptureConfig.WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵_dataCaptureConfig.WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id},璧嬪�煎垪鍚峓{col.DataCaptureColumnTabelName ?? "绌哄瓧绗︿覆"}]", setex);
+//                                    }
+//                                }
+//                                //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
+//                                WorkPieceInfoManager.WorkingProcedureComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
+//                                threadStatusMonitor.Threadstatue = 1;
 
 
-                wplog.WorkPieceID = WorkPieceID;
-                wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
-                wplog.UpdatedTime = DateTimeHelper.GetDateTime();
-                wplog.UpdatedUserName = DataCapturePointCode;
-                //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
-                WorkPieceInfoManager.WorkingProcedureComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
-
-                return;
-            }
-            if (IsCaptureflag)
-            {
-                var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
-                if (plcService == null)
-                {
-                    SystemValue.lbl_Alert_OP3505 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{DataCapturePointCode}鐨凱LC璁惧";
-                    return;
-                }
-                if (plcService != null && !plcService.IsConnected)
-                {
-                    plcService.Close();
-                    plcService.OpenService();
-                }
-                SystemValue.lbl_Alert_OP3501 = $"{RandomHelper.GenerateRandomCode(4)} 寮�濮嬮噰闆唟DataCapturePointCode}鐨凱LC璁惧";
-                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();
-                    try
-                    {
-                        //_dataCaptureConfig
-                        if (plcService == null || !plcService.IsConnected)
-                        {
-                            SystemValue.lbl_Alert_OP3505 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode} 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_OP3005.Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
-                            {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
-                             //瑙﹀彂鎿嶄綔,  骞剁粰闈欐�佸彉閲忚祴鍊间负1
-                             //涓氬姟浠g爜
-                                Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(_dataCaptureConfig.WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鑾峰彇鍒颁笅绾挎爣蹇椾綅");
-
-                                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;
-                                foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
-                                {
-                                    try
-                                    {
-
-                                        var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
-                                        //wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
-                                        var set = wplog.GetType().GetProperty(col.DataCaptureColumnTabelName);
-                                        if (set == null)
-                                        {
-                                            Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(_dataCaptureConfig.WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佺敱浜庡瓧娈靛悕娌℃壘鍒帮紝璧嬪�笺�恵_dataCaptureConfig.WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝け璐wplog.Id}");
-                                        }
-                                        set.SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
-                                    }
-                                    catch(Exception setex)
-                                    {
-                                        Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(_dataCaptureConfig.WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵_dataCaptureConfig.WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id},璧嬪�煎垪鍚峓{col.DataCaptureColumnTabelName ?? "绌哄瓧绗︿覆"}]", setex);
-                                    }
-                                }
-                                //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
-                                WorkPieceInfoManager.WorkingProcedureComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
-                                threadStatusMonitor.Threadstatue = 1;
-
-
-                                //鍒ゆ柇鏄惁璺冲簭锛屼笂涓�宸ュ簭璐ㄩ噺鏄惁鍚堟牸
+//                                //鍒ゆ柇鏄惁璺冲簭锛屼笂涓�宸ュ簭璐ㄩ噺鏄惁鍚堟牸
 
 
 
-                                //鍙嶉缁橮LC锛屽啓鍏�
+//                                //鍙嶉缁橮LC锛屽啓鍏�
 
 
-                            }
-                            SystemValue.value_OP3505 = value.ToString();
+//                            }
+//                            SystemValue.value_OP3505 = value.ToString();
 
 
-                        }
-                        SystemValue.lbl_Alert_OP3505 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
+//                        }
+//                        SystemValue.lbl_Alert_OP3505 = $"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_OP3505 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}涓嬬嚎鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-                        Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}涓嬬嚎鏍囪鏁版嵁鏃跺紓甯革細", ex);
-                    }
-                    catch (Exception ex)
-                    {
-                        SystemValue.lbl_Alert_OP3505 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}涓嬬嚎鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-                        Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
-                    }
-                    finally
-                    {
-                        WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
-                    }
-                }
-            }
-            else
-            {
-                SystemValue.lbl_Alert_OP3505 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode}涓嬬嚎鏍囪 涓嶅仛鏍¢獙锛岃纭閰嶇疆淇℃伅锛�";
-                Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇粄DataCapturePointCode}涓嬬嚎鏍囪 涓嶅仛鏍¢獙锛岃纭鏄惁閰嶇疆寮傚父");
-            }
-        }
+//                    }
+//                    catch (System.Data.Entity.Validation.DbEntityValidationException ex)
+//                    {
+//                        SystemValue.lbl_Alert_OP3505 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}涓嬬嚎鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+//                        Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}涓嬬嚎鏍囪鏁版嵁鏃跺紓甯革細", ex);
+//                    }
+//                    catch (Exception ex)
+//                    {
+//                        SystemValue.lbl_Alert_OP3505 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{WorkingProcedure}涓嬬嚎鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
+//                        Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
+//                    }
+//                    finally
+//                    {
+//                        WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
+//                    }
+//                }
+//            }
+//            else
+//            {
+//                SystemValue.lbl_Alert_OP3505 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode}涓嬬嚎鏍囪 涓嶅仛鏍¢獙锛岃纭閰嶇疆淇℃伅锛�";
+//                Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇粄DataCapturePointCode}涓嬬嚎鏍囪 涓嶅仛鏍¢獙锛岃纭鏄惁閰嶇疆寮傚父");
+//            }
+//        }
 
-    }
-}
+//    }
+//}

--
Gitblit v1.9.3