From 015397f2009fe108820f7754555df93fbd7671e0 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 10 9月 2024 15:13:08 +0800
Subject: [PATCH] 删除不用的文件
---
/dev/null | 145 ------------------------------------------------
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/MonitorHelper.cs | 1
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/iWare_SCADA_BusinessLogical.csproj | 8 --
3 files changed, 1 insertions(+), 153 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP05.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP05.cs
deleted file mode 100644
index 5d8483a..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP05.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-锘縰sing 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>
- /// OP05宸ュ簭鐩戞帶鎵撶爜鏍囪
- /// </summary>
- public class DataCaptureHandler_OP05 : DataCaptureHandler
- {
- public static readonly DataCaptureHandler_OP05 Instance = new DataCaptureHandler_OP05();
-
- public List<DataCaptureConfig> _dataCaptureConfig = new List<DataCaptureConfig>();
- public DataCaptureHandler_OP05() {
- }
-
- public override string WorkingProcedure
- {
- get { return _dataCaptureConfig.FirstOrDefault().WorkingProcedure; }
- }
-
- public override string DataCapturePointCode
- {
- get { return _dataCaptureConfig.FirstOrDefault().DataCapturePointCode; }
- }
- public override string DataCapturePointCname
- {
- get { return _dataCaptureConfig.FirstOrDefault().DataCapturePointCname; }
- }
-
- public override void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
- {
- //try
- //{
- // foreach (var dataCaptureColumnDict in dataCaptureConfig)
- // {
- // switch (dataCaptureColumnDict.DataCapturePointCode)
- // {
- // case "OP0501":
- // //_dataCaptureConfig = dataCaptureColumnDict;
- // IsCaptureflag = true;
- // return;
-
- // }
- // }
- //}
- //catch (Exception ex)
- //{
- // SystemValue._lbl_Alert_OP0501 = $" {RandomHelper.GenerateRandomCode(4)} OP05宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- // Log4NetHelper.WriteErrorLog(LogType.PLCOP05, "鍒锋柊 OP05宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- //}
- }
- public override void DataCaptureStart()
- {
- if(IsCaptureflag)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig.FirstOrDefault());
- if (plcService == null)
- {
- SystemValue.lbl_Alert_OP0501 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌PLC璁惧";
- return;
- }
- if (plcService != null && !plcService.IsConnected)
- {
- plcService.Close();
- plcService.OpenService();
- }
- while (true)
- {
- try
- {
- //_dataCaptureConfig
- if (plcService == null || !plcService.IsConnected)
- {
- SystemValue.lbl_Alert_OP0501 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.FirstOrDefault().WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- plcService.Close();
- plcService.OpenService();
- Thread.Sleep(100);
- continue;
- }
- else
- {
- //涓氬姟浠ｇ爜
- plcService.ReadValuePoint("", "", PLCManger.GetTypeForString(_dataCaptureConfig.FirstOrDefault().DataCaptureColumnType));
-
- }
- SystemValue.lbl_Alert_OP0501 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
-
- }
- catch (Exception ex)
- {
- SystemValue.lbl_Alert_OP0501 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇OP05宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(LogType.PLCOP05, "璇诲彇 OP05宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- }
- }
- }
- else
- {
- SystemValue.lbl_Alert_OP0501 = $" {RandomHelper.GenerateRandomCode(4)} OP05宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
- Log4NetHelper.WriteInfoLog(LogType.PLCOP05, "璇籓P05宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
- }
- }
-
-
- }
-}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP0501.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP0501.cs
deleted file mode 100644
index ce0514b..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP0501.cs
+++ /dev/null
@@ -1,472 +0,0 @@
-锘縰sing iWare_SCADA_BusinessLogical.BLL;
-using iWare_SCADA_BusinessLogical.Utils;
-using iWare_SCADA_Model;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Web.UI.WebControls;
-
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// OP05 鎵撴爣瀹屾垚鏍囪锛岃鍙栧伐鎺ф満涓墦鍗颁簩缁寸爜淇℃伅
- /// </summary>
- public class DataCaptureHandler_OP0501 : DataCaptureHandler
- {
- public static readonly DataCaptureHandler_OP0501 Instance = new DataCaptureHandler_OP0501();
-
- public DataCaptureHandler_OP0501()
- {
- }
-
- 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 void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
- {
-
- }
- private string CheackPath(string path,int type,int time)
- {
- var directory = Path.GetDirectoryName(path);
- if (!Directory.Exists(directory))
- {
- Directory.CreateDirectory(directory);
- }
- if (!File.Exists(path))
- {
- File.Create(path).Close();
- }
-
- string content = "";
- // 鍚屾鏉ユ簮鏁版嵁
- using (StreamReader reader = new StreamReader(path))
- {
- content = reader.ReadToEnd();
-
- Console.WriteLine("璇诲彇鐨勫唴瀹规槸锛�" + content);
- if (content == null || content == "")
- {
- switch (type)
- {
- case 1: content = DateTimeHelper.GetDateTime().AddYears(time).ToString();break;
- case 2: content = DateTimeHelper.GetDateTime().AddMonths(time).ToString();break;
- case 3: content = DateTimeHelper.GetDateTime().AddDays(time).ToString();break;
- case 4: content = DateTimeHelper.GetDateTime().AddHours(time).ToString();break;
- case 5: content = DateTimeHelper.GetDateTime().AddMinutes(time).ToString();break;
- case 6: content = DateTimeHelper.GetDateTime().AddSeconds(time).ToString();break;
- default:
- content = DateTimeHelper.GetDateTime().ToString(); break;
- }
- //content = DateTimeHelper.GetDateTime().AddMinutes(-10).ToString();
- }
-
- }
- return content;
- }
- public override void DataCaptureStart()
- {
- if (IsCaptureflag)
- {
- //// plc杩炴帴
- //var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- //if (plcService == null)
- //{
- // SystemValue.lbl_Alert_OP0501 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
- // return;
- //}
- //if (plcService != null && !plcService.IsConnected)
- //{
- // plcService.Close();
- // plcService.OpenService();
- //}
-
- 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_OP0501 = $" {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_OP0501.Equals("0") && value.ToString().Equals("1"))
- {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
- //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
- //涓氬姟浠ｇ爜
- //璇荤爜瀹屾垚娌″暐涓氬姟鎿嶄綔锛岃幏鍙栦簩缁寸爜锛岀劧鍚庢斁鍒伴槦鍒椾腑
- #region 浠庡伐鎺ф満鑾峰彇鐩稿叧浜岀淮鐮�
- var path = ConfigHelper.GetConfigString("WorkPeiceIDPath");//鎵撶爜鏈烘墦鐮佷簩缁寸爜璺緞
- //鎵弿鍏变韩鐩綍骞跺皢鏂扮殑鏂囦欢鎵弿杩斿洖 涓�鑸妭鎷嶅湪15绉掑乏鍙筹紙鍙互纭涓�涓嬶級
- //鎵弿淇敼鏃堕棿鍦ㄤ笂娆℃壂鎻忔椂闂翠箣鍓�10绉掑埌褰撳墠鏃堕棿鐨勪箣闂寸殑鏂囦欢
- var dataTime = CheackPath(Environment.CurrentDirectory + "\\OP05-LastScapTime.txt",4,-10);
- var scapEndTime = DateTimeHelper.GetDateTime();
- var newFiles = FileHelper.DetectNewFilesCSV(path, 60, Convert.ToDateTime(dataTime), scapEndTime);
-
-
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure),
- $"{_dataCaptureConfig.WorkingProcedure}宸ュ簭璇诲彇宸ユ帶鏈轰腑浜岀淮鐮佷俊鎭紑濮�:{dataTime}");
-
- foreach (System.IO.FileInfo file in newFiles)
- {
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure),
- $"{_dataCaptureConfig.WorkingProcedure}宸ュ簭璇诲彇宸ユ帶鏈轰腑浜岀淮鐮佷俊鎭�,鏂囦欢鍚�:{file.FullName}");
- DataTable dt = null;
- dt = CSVHelper.ReadCSV(file.FullName);
- if (dt == null)
- {
- continue;
- }
- lock (SystemValue.lock5QRcodeList)
- {
- #region 娓呰繃鏈熺紦瀛�
- try
- {
- //娓呰繃鏈熺紦瀛�
- var lstRemoveKey = SystemValue.QRcodeList
- .Where(p => p.Value < DateTimeHelper.GetDateTime().AddMinutes(-600))
- .Select(p => p.Key).ToList();
- if (lstRemoveKey.Count > 0)
- {
- foreach (var key in lstRemoveKey) SystemValue.QRcodeList.Remove(key);
- Log4NetHelper.WriteInfoLog(LogType.PLCOP05, $"娓呴櫎缂撳瓨鏁伴噺锛氾紙{lstRemoveKey.Count}锛� 鍓╀綑缂撳瓨鏁伴噺锛氾紙{SystemValue.QRcodeList.Count}锛�");
- }
- }
- catch (Exception ex)
- {
- Log4NetHelper.WriteErrorLog(LogType.PLCOP05, "娓呴櫎鍛婅鎶ユ枃ID缂撳瓨閿欒锛�", ex);
- }
- #endregion
-
- ////绛涢�夐渶瑕佸鐞嗙殑浜岀淮鐮佷俊鎭�
- //DataRow[] drArr = dt.Select(" 鎵爜缁撴灉='鎴愬姛'"); //鏌ヨ
- //DataTable dtNew = dt.Clone();
- //for (int i = 0; i < drArr.Length; i++)
- //{
- // var now = DateTime.Now;
- // var list = drArr[i]["鏃堕棿"].ToString().Split(':');
- // var d = new DateTime(now.Year, now.Month, now.Day, Convert.ToInt32(list[0]), Convert.ToInt32(list[1]), Convert.ToInt32(list[2]), DateTimeKind.Local);
- // //and 鏃堕棿> '19:19:34:547'
- // if (Convert.ToDateTime(DateTime.Now.ToShortDateString() + " " +drArr[i]["鏃堕棿"]).TimeOfDay> Convert.ToDateTime(DateTime.Now.ToShortDateString() + " 19:19:34:547").TimeOfDay)
- // dtNew.ImportRow(drArr[i]);
- // //鑾峰彇鍒扮殑宸ヤ欢鍙峰紓甯�
- // SystemValue.lbl_Alert_OP0501 = $"{_dataCaptureConfig.WorkingProcedure}宸ュ簭鎵撴爣瀹屾垚鏍囪锛岃鍙栧伐鎺ф満涓墦鍗颁簩缁寸爜淇℃伅锛氥��" + WorkPieceID + "銆戦暱搴﹀紓甯革紝闀垮害涓嶇瓑浜�22浣�";
- // Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure),
- // $"{_dataCaptureConfig.WorkingProcedure}宸ュ簭鎵撴爣瀹屾垚鏍囪锛岃鍙栧伐鎺ф満涓墦鍗颁簩缁寸爜淇℃伅锛氥��" + WorkPieceID + "銆戦暱搴﹀紓甯革紝闀垮害涓嶇瓑浜�22浣�");
- //}
- DataTable newDt = new DataTable();
- var dates = file.Name.Split('-', '.');
- var date = string.Format("{0:D4}-{1:D2}-{2:D2}", int.Parse(dates[0]), int.Parse(dates[1]), int.Parse(dates[2]));
- if (DateTimeHelper.GetDateTime().Date != Convert.ToDateTime(date) && DateTimeHelper.GetDateTime().AddDays(-1).Date != Convert.ToDateTime(date))
- {
- continue;
- }
- DataRow[] filteredRows = new DataRow[dt.Rows.Count];
- if (dt.Rows.Count > 0)
- {
- int j = 0;
- var cache = DataCache.GetCache("OP501-LastTime");
- DateTime? lasttime = null;
- if (cache != null)
- {
- lasttime = Convert.ToDateTime(cache);
- }
-
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure),
- $"{_dataCaptureConfig.WorkingProcedure}宸ュ簭璇诲彇宸ユ帶鏈轰腑浜岀淮鐮佷俊鎭�,宸ヤ欢鏈�鏂版椂闂�:{(cache==null?"鏃犵紦瀛�":cache.ToString())}");
- for (int i = dt.Rows.Count - 1; i >= 0; i--)
- {
- try
- {
- string timeValue = dt.Rows[i]["鏃堕棿"].ToString();
- string[] timeComponents = timeValue.Split(':');
- string correctedTime = string.Format("{0:D2}:{1:D2}:{2:D2}", int.Parse(timeComponents[0]), int.Parse(timeComponents[1]), int.Parse(timeComponents[2]));
- var newTime = date + " " + correctedTime;
- dt.Rows[i]["鏃堕棿"] = newTime;
-
- var currrentTime = Convert.ToDateTime(dt.Rows[i]["鏃堕棿"]);
- if (cache == null)
- {
- if (j == 0)
- {
- lasttime = currrentTime;
- }
- var oldTime = DateTime.Now.AddMinutes(-10);
- if (currrentTime <= oldTime)
- {
- break;
- }
- filteredRows[j] = dt.Rows[i];
- }
- else
- {
- var cacheTime = Convert.ToDateTime(cache);
- if (currrentTime <= cacheTime)
- {
- break;
- }
- filteredRows[j] = dt.Rows[i];
- }
- if (lasttime != null && lasttime < currrentTime)
- {
- lasttime = currrentTime;
- }
- j++;
- }
- catch (Exception ex)
- {
- SystemValue.lbl_Alert_OP0501 = $" {_dataCaptureConfig.WorkingProcedure}鏂囦欢鎵撴爣鏃堕棿寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(LogType.PLCOP05, $" {_dataCaptureConfig.WorkingProcedure}鏂囦欢鎵撴爣鏃堕棿,鍑虹幇寮傚父锛�", ex);
- }
- }
-
- filteredRows = filteredRows.Where(item=>item!=null).ToArray();
- // 璁剧疆缂撳瓨鍊�
- DateTime absoluteExpiration = DateTime.Now.AddDays(30);
- TimeSpan slidingExpiration = TimeSpan.FromMinutes(20);
- if (slidingExpiration == TimeSpan.Zero)
- {
- absoluteExpiration = DateTime.Now.AddDays(30);
- }
- else
- {
- absoluteExpiration = DateTime.MaxValue;
- }
- DataCache.SetCache("OP501-LastTime", lasttime, absoluteExpiration, slidingExpiration);
- if (filteredRows.Count() <= 0)
- {
- return;
- }
- if (file.LastAccessTime < Convert.ToDateTime(dataTime)) continue;
- using (StreamWriter writer = new StreamWriter(Environment.CurrentDirectory + "\\OP05-LastScapTime.txt", false))
- {
- dataTime = file.LastAccessTime.ToString();
- writer.Write(dataTime);
- }
- Log4NetHelper.WriteInfoLog(LogType.PLCOP05, $"璇诲彇鍒皗filteredRows.Count()}琛屾暟鎹紝鏃堕棿鑼冨洿鏄瘂filteredRows[j-1]["鏃堕棿"]}-{filteredRows[0]["鏃堕棿"]}");
- }
-
- //// 宸ヤ欢鍙凤紙浜岀淮鐮佸�硷級
- //string WorkPieceID = dt.Rows[0][""].ToString();
- //if (WorkPieceID.Length != 22)
- //{
- // //鑾峰彇鍒扮殑宸ヤ欢鍙峰紓甯�
- // SystemValue.lbl_Alert_HMI01 = $"{_dataCaptureConfig.WorkingProcedure}宸ュ簭鎵撴爣瀹屾垚鏍囪锛岃鍙栧伐鎺ф満涓墦鍗颁簩缁寸爜淇℃伅锛氥��" + WorkPieceID + "銆戦暱搴﹀紓甯革紝闀垮害涓嶇瓑浜�22浣�";
- // Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure),
- // $"{_dataCaptureConfig.WorkingProcedure}宸ュ簭鎵撴爣瀹屾垚鏍囪锛岃鍙栧伐鎺ф満涓墦鍗颁簩缁寸爜淇℃伅锛氥��" + WorkPieceID + "銆戦暱搴﹀紓甯革紝闀垮害涓嶇瓑浜�22浣�");
- //}
-
-
- //SystemValue.QRcodeList.Add("", DateTimeHelper.GetDateTime());//浜岀淮鐮佹坊鍔犲埌鍒楄〃涓�
-
- WorkPieceLog wplog = new WorkPieceLog();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = "OP05";
- //wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = "cs";
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = CultureInfo.CurrentUICulture.Name;
- wplog.UpdatedTime = DateTimeHelper.GetDateTime();
- wplog.UpdatedUserName = "娴嬭瘯";
- wplog.IsDeleted = false;
- wplog.EquipmentID = "123";
-
- wplog.OnlineTime = DateTimeHelper.GetDateTime();//缁欎笂绾挎椂闂寸敤
-
- wplog.QualityState = 1;
- wplog.ProcessingDuration = 1;
- wplog.MachineToolState = 1;
- wplog.AlertType = 1;
- wplog.WorkPieceNumber = 1;
- wplog.WorkPieceOnlineTime = Convert.ToDateTime(dataTime);
- wplog.WorkPieceOfflineTime = Convert.ToDateTime(dataTime).AddHours(1);
- wplog.WorkPieceStartMachiningTime = Convert.ToDateTime(dataTime);
- wplog.WorkPieceEndMachiningTime = DateTime.Now.AddDays(7);
- wplog.KnifeEdgeNumber = 10;
- wplog.KnifeToolLife = 10;
- wplog.KnifeToolEarlyWarningLife = 3;
- wplog.KnifeToolSurplusLife = 10;
-
- foreach (var item in filteredRows)
- {
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure),
- $"{_dataCaptureConfig.WorkingProcedure}宸ュ簭璇诲彇宸ユ帶鏈轰腑浜岀淮鐮佷俊鎭�,璇诲彇宸ヤ欢浜岀淮鐮�:{item["鎵撴爣鍐呭"].ToString()}");
-
- if (item == null) break;
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkPieceID = item["鎵撴爣鍐呭"].ToString();
- wplog.OfflineTime = Convert.ToDateTime(dataTime);
- wplog.Remarks = item["鏃堕棿"].ToString() + "|" + item["鎵撴爣鍐呭"].ToString() + "|" + item["鎵撴爣鍐呭"].ToString() + "|" + item["鎵爜绛夌骇"].ToString() + "|" + item["鎵爜缁撴灉"].ToString();
- WorkPieceInfoManager.ReadQRcode(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), null, _dataCaptureConfig.IsFeedback);
-
- threadStatusMonitor.Threadstatue = 1;
- }
-
-
- }
- }
-
-
- #endregion
- var fileCount = newFiles.Cast<string>().ToList();
- Log4NetHelper.WriteInfoLog(LogType.PLCOP05, $"鎵弿瀹屾垚锛屽叡鎵弿鍒帮細锛坽fileCount.Count()}锛変釜鏂囦欢");
- }
- //SystemValue.value_OP0501 = value.ToString();
- }
- }
- catch (Exception ex)
- {
- SystemValue.lbl_Alert_OP0501 = $" {_dataCaptureConfig.WorkingProcedure}宸ュ簭鎵撴爣瀹屾垚鏍囪锛岃鍙栧伐鎺ф満涓墦鍗颁簩缁寸爜淇℃伅,鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(LogType.PLCOP05, $" {_dataCaptureConfig.WorkingProcedure}宸ュ簭鎵撴爣瀹屾垚鏍囪锛岃鍙栧伐鎺ф満涓墦鍗颁簩缁寸爜淇℃伅,鍑虹幇寮傚父锛�", ex);
- }
- finally
- {
- WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
- }
- //绾跨▼澶氫箙鎵ц涓�娆★紙涓嶅寘鍚笟鍔″鐞嗘椂闂达級
- if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
- {
- Thread.Sleep(3000);
- }
- else
- {
- Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
- }
- }
- }
- else
- {
- SystemValue.lbl_Alert_OP0501 = $"{_dataCaptureConfig.WorkingProcedure}宸ュ簭鎵撴爣瀹屾垚鏍囪锛岃鍙栧伐鎺ф満涓墦鍗颁簩缁寸爜淇℃伅锛屼笉鍋氭牎楠岋紝璇风‘璁ら厤缃俊鎭紒";
- Log4NetHelper.WriteInfoLog(LogType.PLCOP05, $"{_dataCaptureConfig.WorkingProcedure}宸ュ簭鎵撴爣瀹屾垚鏍囪锛岃鍙栧伐鎺ф満涓墦鍗颁簩缁寸爜淇℃伅锛屼笉鍋氭牎楠岋紝璇风‘璁ら厤缃紓甯�");
- }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- //if (SystemValue.isStartedModel)
- //{
- // #region 浠庡伐鎺ф満鑾峰彇鐩稿叧浜岀淮鐮�
-
-
- // //鎵弿鍏变韩鐩綍骞跺皢鏂扮殑鏂囦欢鎵弿杩斿洖
- // var newFiles = FileHelper.DetectNewFilesCSV("", 10, DateTimeHelper.GetDateTime());
- // foreach (System.IO.FileInfo file in newFiles)
- // {
- // var datatable = CSVHelper.ReadCSV(file.FullName);
- // }
- // lock (SystemValue.lock5QRcodeList)
- // {
- // try
- // {
- // var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- // //娓呰繃鏈熺紦瀛�
- // var lstRemoveKey = SystemValue.QRcodeList
- // .Where(p => p.Value < DateTimeHelper.GetDateTime().AddMinutes(-600))
- // .Select(p => p.Key).ToList();
- // if (lstRemoveKey.Count > 0)
- // {
- // foreach (var key in lstRemoveKey) SystemValue.QRcodeList.Remove(key);
- // Log4NetHelper.WriteInfoLog(LogType.PLCOP05, $"娓呴櫎缂撳瓨鏁伴噺锛氾紙{lstRemoveKey.Count}锛� 鍓╀綑缂撳瓨鏁伴噺锛氾紙{SystemValue.QRcodeList.Count}锛�");
- // }
- // WorkPieceLog wplog = new WorkPieceLog();
- // 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.UpdatedTime = DateTimeHelper.GetDateTime();
- // wplog.UpdatedUserName = DataCapturePointCode;
- // wplog.IsDeleted = false;
- // wplog.EquipmentID= _dataCaptureConfig.EquipmentID;
- // wplog.QualityState = (int)QualityState.OK;
- // wplog.OnlineTime = DateTimeHelper.GetDateTime();//缁欎笂绾挎椂闂寸敤
-
- // wplog.WorkPieceID = WorkPieceID;
- // if (wplog.WorkPieceID.Length != 22)
- // {//鑾峰彇鍒扮殑宸ヤ欢鍙峰紓甯�
- // }
- // else
- // {//鑾峰彇鍏朵粬閰嶇疆鐨勫緟閲囬泦椤�
-
- // //foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
- // //{
- // // var valuecol = plcService.ReadValuePoint(col.DbNumber, col.Offset, col.DataCaptureColumnLength.Value, PLCManger.GetTypeForString(col.DataCaptureColumnType));
- // // wplog.GetType().GetProperty(col.DataCaptureColumnTabelName).SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
-
- // //}
- // }
- // //璇诲彇浜岀淮鐮佸悗鏇存柊鏁版嵁搴�
- // var info = WorkPieceInfoManager.ReadQRcode(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), plcService, _dataCaptureConfig.IsFeedback);
-
- // }
- // catch (Exception ex)
- // {
- // Log4NetHelper.WriteErrorLog(LogType.PLCOP05, "娓呴櫎鍛婅鎶ユ枃ID缂撳瓨閿欒锛�", ex);
- // }
-
- // if (SystemValue.QRcodeList.ContainsKey(WorkPieceID))
- // {
- // SystemValue.QRcodeList[WorkPieceID] = DateTimeHelper.GetDateTime();
- // }
- // else
- // {
- // SystemValue.QRcodeList.Add(WorkPieceID, DateTimeHelper.GetDateTime());//浜岀淮鐮佹坊鍔犲埌鍒楄〃涓�
- // }
-
- // }
-
- // #endregion
- //}
- //else
- //{
-
-
- //}
- }
-
- }
-}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP0502.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP0502.cs
deleted file mode 100644
index 6078bde..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP0502.cs
+++ /dev/null
@@ -1,191 +0,0 @@
-锘縰sing iWare_SCADA_BusinessLogical.BLL;
-using iWare_SCADA_BusinessLogical.Utils;
-using iWare_SCADA_Model;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// 璇荤爜瀹屾垚鏍囪锛岃鍙栧伐鎺ф満涓鍙栦簩缁寸爜淇℃伅
- /// </summary>
- public class DataCaptureHandler_OP0502 : DataCaptureHandler
- {
- public static readonly DataCaptureHandler_OP0502 Instance = new DataCaptureHandler_OP0502();
-
- public DataCaptureHandler_OP0502()
- {
- }
- 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 void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
- {
-
- }
- public override void DataCaptureStart()
- {
- if (IsCaptureflag)
- {
- // plc杩炴帴
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- if (plcService == null)
- {
- SystemValue.lbl_Alert_OP0501 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
- return;
- }
- if (plcService != null && !plcService.IsConnected)
- {
- plcService.Close();
- plcService.OpenService();
- }
-
- while (true)
- {
- try
- {
- if (plcService == null || !plcService.IsConnected)
- {
- SystemValue.lbl_Alert_OP0502 = $" {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_OP0502.Equals("0") && value.ToString().Equals("1"))
- {
- #region 浠庡伐鎺ф満鑾峰彇鐩稿叧浜岀淮鐮�
- //鎵撶爜鏈烘墦鐮佷簩缁寸爜璺緞
- var path = ConfigHelper.GetConfigString("WorkPeiceIDPath");
-
- //鎵弿鍏变韩鐩綍骞跺皢鏂扮殑鏂囦欢鎵弿杩斿洖 涓�鑸妭鎷嶅湪15绉掑乏鍙筹紙鍙互纭涓�涓嬶級
- var newFiles = FileHelper.DetectNewFilesCSV(path, 10, DateTimeHelper.GetDateTime(), DateTimeHelper.GetDateTime());
- foreach (System.IO.FileInfo file in newFiles)
- {
- DataTable dt = null;
- dt = CSVHelper.ReadCSV(file.FullName);
- if (dt == null)
- {
- continue;
- }
- lock (SystemValue.lock5QRcodeList)
- {
- #region 娓呰繃鏈熺紦瀛�
- try
- {
- //娓呰繃鏈熺紦瀛�
- var lstRemoveKey = SystemValue.QRcodeList
- .Where(p => p.Value < DateTimeHelper.GetDateTime().AddMinutes(-600))
- .Select(p => p.Key).ToList();
- if (lstRemoveKey.Count > 0)
- {
- foreach (var key in lstRemoveKey) SystemValue.QRcodeList.Remove(key);
- Log4NetHelper.WriteInfoLog(LogType.PLCOP05, $"娓呴櫎缂撳瓨鏁伴噺锛氾紙{lstRemoveKey.Count}锛� 鍓╀綑缂撳瓨鏁伴噺锛氾紙{SystemValue.QRcodeList.Count}锛�");
- }
- }
- catch (Exception ex)
- {
- Log4NetHelper.WriteErrorLog(LogType.PLCOP05, "娓呴櫎鍛婅鎶ユ枃ID缂撳瓨閿欒锛�", ex);
- }
- #endregion
- // 宸ヤ欢鍙凤紙浜岀淮鐮佸�硷級
- string WorkPieceID = dt.Rows[0][""].ToString();
- if (WorkPieceID.Length != 22)
- {
- //鑾峰彇鍒扮殑宸ヤ欢鍙峰紓甯�
- SystemValue.lbl_Alert_OP0502 = $"{_dataCaptureConfig.WorkingProcedure}宸ュ簭璇荤爜瀹屾垚鏍囪锛岃鍙栧伐鎺ф満涓鍙栦簩缁寸爜淇℃伅锛氥��" + WorkPieceID + "銆戦暱搴﹀紓甯革紝闀垮害涓嶇瓑浜�22浣�";
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure),
- $"{_dataCaptureConfig.WorkingProcedure}宸ュ簭璇荤爜瀹屾垚鏍囪锛岃鍙栧伐鎺ф満涓鍙栦簩缁寸爜淇℃伅锛氥��" + WorkPieceID + "銆戦暱搴﹀紓甯革紝闀垮害涓嶇瓑浜�22浣�");
- }
-
- if (SystemValue.QRcodeList.ContainsKey(WorkPieceID))
- {
- // 瀛樺湪娓呯悊缂撳瓨
- SystemValue.QRcodeList.Remove(WorkPieceID);
- }
- else
- {
- // 涓嶅瓨鍦ㄥ弽棣圥LC
- var col = colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode).ToList();
- if (col.Count == 0)
- {
- SystemValue.lbl_Alert_OP0502 = $"{_dataCaptureConfig.WorkingProcedure}宸ュ簭璇荤爜瀹屾垚鏍囪锛岃鍙栧伐鎺ф満涓鍙栦簩缁寸爜淇℃伅涓嶅瓨鍦�,璇峰厛閰嶇疆鏁版嵁鏀堕泦鐐瑰浜庡瓧娈佃〃淇℃伅锛�";
- Log4NetHelper.WriteErrorLog(LogType.PLCOP05, $"{_dataCaptureConfig.WorkingProcedure}宸ュ簭璇荤爜瀹屾垚鏍囪锛岃鍙栧伐鎺ф満涓鍙栦簩缁寸爜淇℃伅涓嶅瓨鍦�,璇峰厛閰嶇疆鏁版嵁鏀堕泦鐐瑰浜庡瓧娈佃〃淇℃伅锛�");
- }
- plcService.WriteValuePoint(col[0].DbNumber, col[0].Offset, col[0].DataCaptureColumnTabelName);
-
- }
-
-
- SystemValue.QRcodeList.Add("", DateTimeHelper.GetDateTime());//浜岀淮鐮佹坊鍔犲埌鍒楄〃涓�
-
- //WorkPieceLog wplog = new WorkPieceLog();
- //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.UpdatedTime = DateTimeHelper.GetDateTime();
- //wplog.UpdatedUserName = DataCapturePointCode;
- //wplog.IsDeleted = false;
- //wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
-
- //wplog.OnlineTime = DateTimeHelper.GetDateTime();//缁欎笂绾挎椂闂寸敤
-
- //wplog.WorkPieceID = dt.Rows[0][""].ToString();
-
- // 璇诲彇浜岀淮鐮佸悗鏇存柊鏁版嵁搴�
- // var info = WorkPieceInfoManager.ReadQRcode(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), plcService, _dataCaptureConfig.IsFeedback);
-
- }
- }
- #endregion
- }
- SystemValue.value_OP0502 = value.ToString();
- }
- }
- catch (Exception ex)
- {
- SystemValue.lbl_Alert_OP0502 = $" {_dataCaptureConfig.WorkingProcedure}宸ュ簭璇荤爜瀹屾垚鏍囪锛岃鍙栧伐鎺ф満涓鍙栦簩缁寸爜淇℃伅,鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(LogType.PLCOP05, $" {_dataCaptureConfig.WorkingProcedure}宸ュ簭璇荤爜瀹屾垚鏍囪锛岃鍙栧伐鎺ф満涓鍙栦簩缁寸爜淇℃伅,鍑虹幇寮傚父锛�", ex);
- }
-
- //绾跨▼澶氫箙鎵ц涓�娆★紙涓嶅寘鍚笟鍔″鐞嗘椂闂达級
- if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
- {
- Thread.Sleep(5000);
- }
- else
- {
- Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
- }
- }
- }
- else
- {
- SystemValue.lbl_Alert_OP0502 = $"{_dataCaptureConfig.WorkingProcedure}宸ュ簭璇荤爜瀹屾垚鏍囪锛岃鍙栧伐鎺ф満涓鍙栦簩缁寸爜淇℃伅锛屼笉鍋氭牎楠岋紝璇风‘璁ら厤缃俊鎭紒";
- Log4NetHelper.WriteInfoLog(LogType.PLCOP05, $"{_dataCaptureConfig.WorkingProcedure}宸ュ簭璇荤爜瀹屾垚鏍囪锛岃鍙栧伐鎺ф満涓鍙栦簩缁寸爜淇℃伅锛屼笉鍋氭牎楠岋紝璇风‘璁ら厤缃紓甯�");
- }
- }
- }
-}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP0503.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP0503.cs
deleted file mode 100644
index 60f680b..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP0503.cs
+++ /dev/null
@@ -1,151 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using iWare_SCADA_Model;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using iWare_SCADA_BusinessLogical.Utils;
-using System.Threading;
-using iWare_SCADA_BusinessLogical.BLL;
-
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// 宸ヤ欢鎺ㄥ嚭鏍囪锛岀‘璁ゅ伐浠舵槸鍚﹁鎺ㄥ嚭锛堜笉鍚堟牸锛�
- /// </summary>
- public class DataCaptureHandler_OP0503 : DataCaptureHandler
- {
- public static readonly DataCaptureHandler_OP0503 Instance = new DataCaptureHandler_OP0503();
-
- public DataCaptureHandler_OP0503()
- {
- }
- 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 void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
- {
-
- }
- public override void DataCaptureStart()
- {
- if (IsCaptureflag)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- if (plcService == null)
- {
- SystemValue.lbl_Alert_OP0503 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
- return;
- }
- if (plcService != null && !plcService.IsConnected)
- {
- plcService.Close();
- plcService.OpenService();
- }
- while (true)
- {
- try
- {
- if (plcService == null || !plcService.IsConnected)
- {
- SystemValue.lbl_Alert_OP0503 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- plcService.Close();
- plcService.OpenService();
- Thread.Sleep(100);
- continue;
- }
- else
- {
- object value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
-
- if (SystemValue.value_OP0503.Equals("0") && value.ToString().Equals("1"))
- {
- string WorkPieceID = "";
- string HowToExit = "";
-
- foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
- {
- switch (col.DataCaptureColumnTabelName)
- {
- case "WorkPieceID":
- WorkPieceID = plcService.ReadValuePoint(col.DbNumber, col.Offset, PLCManger.GetTypeForString(col.DataCaptureColumnType)).ToString();
- break;
- case "HowToExit":
- HowToExit = plcService.WriteValuePoint(col.DbNumber, col.Offset, PLCManger.GetTypeForString(col.DataCaptureColumnType)).ToString();
- break;
- default:
- break;
- }
- }
-
- if (WorkPieceID.Length != 22)
- {
- SystemValue.lbl_Alert_OP0503 = $"宸ヤ欢鎺ㄥ嚭鏍囪锛岀‘璁ゅ伐浠跺彿锛氥��" + WorkPieceID + "銆戦暱搴﹀紓甯革紝闀垮害涓嶇瓑浜�22浣�";
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"宸ヤ欢鎺ㄥ嚭鏍囪锛岀‘璁ゅ伐浠跺彿锛氥��" + WorkPieceID + "銆戦暱搴﹀紓甯革紝闀垮害涓嶇瓑浜�22浣�");
- }
- else
- {
- WorkPieceLog wplog = new WorkPieceLog();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkPieceID = WorkPieceID;
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
-
- if ("NOOK".Equals(HowToExit))
- {
- // NOOK閫�鍑�
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.WorkPiecePushOff(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- }
- else if("SPC".Equals(HowToExit))
- {
-
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.WorkPieceSPCPushOff(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- }
- }
- }
-
- SystemValue.value_OP0503 = value.ToString();
- }
- }
- catch (Exception ex)
- {
- SystemValue.lbl_Alert_OP0503 = $"璇诲彇{WorkingProcedure}宸ュ簭宸ヤ欢鎺ㄥ嚭鏍囪锛岀‘璁ゅ伐浠舵槸鍚﹁鎺ㄥ嚭鐩戞帶锛屽嚭鐜板紓甯革紝璇锋煡鐪嬫棩蹇楋紒";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇{WorkingProcedure}宸ュ簭宸ヤ欢鎺ㄥ嚭鏍囪锛岀‘璁ゅ伐浠舵槸鍚﹁鎺ㄥ嚭鐩戞帶锛屾暟鎹椂寮傚父锛�", ex);
- }
-
- //绾跨▼澶氫箙鎵ц涓�娆★紙涓嶅寘鍚笟鍔″鐞嗘椂闂达級
- if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
- {
- Thread.Sleep(5000);
- }
- else
- {
- Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
- }
- }
- }
- else
- {
- SystemValue.lbl_Alert_OP0503 = $"璇诲彇{WorkingProcedure}宸ュ簭宸ヤ欢鎺ㄥ嚭鏍囪锛岀‘璁ゅ伐浠舵槸鍚﹁鎺ㄥ嚭鐩戞帶锛岃纭閰嶇疆淇℃伅锛�";
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇{WorkingProcedure}宸ュ簭宸ヤ欢鎺ㄥ嚭鏍囪锛岀‘璁ゅ伐浠舵槸鍚﹁鎺ㄥ嚭鐩戞帶锛岃纭鏄惁閰嶇疆寮傚父");
- }
- }
- }
-}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP0504.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP0504.cs
deleted file mode 100644
index e756c7c..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP0504.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-锘縰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;
-
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// 涓嬫枡鏍囪锛岀‘璁ゅ伐浠禣P05宸ュ簭宸插畬鎴�
- /// </summary>
- public class DataCaptureHandler_OP0504 : DataCaptureHandler
- {
- public static readonly DataCaptureHandler_OP0504 Instance = new DataCaptureHandler_OP0504();
-
- public DataCaptureHandler_OP0504()
- {
- }
- 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 void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
- {
-
- }
- public override void DataCaptureStart()
- {
- if (IsCaptureflag)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- if (plcService == null)
- {
- SystemValue.lbl_Alert_OP0504 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
- return;
- }
- if (plcService != null && !plcService.IsConnected)
- {
- plcService.Close();
- plcService.OpenService();
- }
- while (true)
- {
- try
- {
- if (plcService == null || !plcService.IsConnected)
- {
- SystemValue.lbl_Alert_OP0504 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
- plcService.Close();
- plcService.OpenService();
- Thread.Sleep(100);
- continue;
- }
- else
- {
- object value = plcService.ReadValuePoint(_dataCaptureConfig.DbNumber, _dataCaptureConfig.Offset, PLCManger.GetTypeForString(_dataCaptureConfig.DataCaptureColumnType));
-
- if (SystemValue.value_OP0504.Equals("0") && value.ToString().Equals("1"))
- {
- string WorkPieceID = "";
-
- foreach (var col in colConfig.Where(o => o.DataCapturePointCode == DataCapturePointCode))
- {
- switch (col.DataCaptureColumnTabelName)
- {
- case "WorkPieceID":
- WorkPieceID = plcService.ReadValuePoint(col.DbNumber, col.Offset, PLCManger.GetTypeForString(col.DataCaptureColumnType)).ToString();
- break;
- default:
- break;
- }
- }
-
- if (WorkPieceID.Length != 22)
- {
- SystemValue.lbl_Alert_OP0504 = $"宸ヤ欢鎺ㄥ嚭鏍囪锛岀‘璁ゅ伐浠跺彿锛氥��" + WorkPieceID + "銆戦暱搴﹀紓甯革紝闀垮害涓嶇瓑浜�22浣�";
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"宸ヤ欢鎺ㄥ嚭鏍囪锛岀‘璁ゅ伐浠跺彿锛氥��" + WorkPieceID + "銆戦暱搴﹀紓甯革紝闀垮害涓嶇瓑浜�22浣�");
- }
- else
- {
- // OP05宸ュ簭瀹屾垚
- WorkPieceLog wplog = new WorkPieceLog();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkPieceID = WorkPieceID;
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.Remarks = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.IsDeleted = false;
-
- //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
- WorkPieceInfoManager.WorkingProcedureComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
- }
- }
-
- SystemValue.value_OP0503 = value.ToString();
- }
-
-
- }
- catch (Exception ex)
- {
- SystemValue.lbl_Alert_OP0504 = $"璇诲彇{WorkingProcedure}宸ュ簭涓嬫枡鏍囪纭宸ヤ欢宸ュ簭宸插畬鎴愮洃鎺э紝鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇{WorkingProcedure}宸ュ簭涓嬫枡鏍囪纭宸ヤ欢宸ュ簭宸插畬鎴愮洃鎺э紝鏁版嵁鏃跺紓甯革細", ex);
- }
-
- if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
- {
- Thread.Sleep(5000);
- }
- else
- {
- Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
- }
- }
- }
- else
- {
- SystemValue.lbl_Alert_OP0504 = $"璇诲彇{WorkingProcedure}宸ュ簭涓嬫枡鏍囪纭宸ヤ欢宸ュ簭宸插畬鎴愮洃鎺э紝璇风‘璁ら厤缃俊鎭紒";
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇{WorkingProcedure}宸ュ簭涓嬫枡鏍囪纭宸ヤ欢宸ュ簭宸插畬鎴愮洃鎺э紝璇风‘璁ゆ槸鍚﹂厤缃紓甯�");
- }
- }
- }
-}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP0506.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP0506.cs
deleted file mode 100644
index 2dca900..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP0506.cs
+++ /dev/null
@@ -1,178 +0,0 @@
-锘�//using iWare_SCADA_BusinessLogical.BLL;
-//using iWare_SCADA_BusinessLogical.BLL.Important;
-//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 System.Web.UI.WebControls;
-
-//namespace iWare_SCADA_BusinessLogical
-//{
-// /// <summary>
-// /// OP05 璁惧淇℃伅閲囬泦
-// /// </summary>
-// public class DataCaptureHandler_OP0506 : DataCaptureHandler
-// {
-// public static readonly DataCaptureHandler_OP0506 Instance = new DataCaptureHandler_OP0506();
-
-// public DataCaptureHandler_OP0506()
-// {
-// }
-
-// 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 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.CreatedUserName = DataCapturePointCode;
-// SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref wplog, DataCapturePointCode, DataCapturePointCname);
-// wplog.CreatedTime = DateTimeHelper.GetDateTime();
-// wplog.IsDeleted = false;
-
-
-// wplog.WorkPieceID = WorkPieceID;
-// wplog.EquipmentID = _dataCaptureConfig.EquipmentID;
-// wplog.UpdatedTime = DateTimeHelper.GetDateTime();
-// wplog.UpdatedUserName = DataCapturePointCode;
-// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
-// WorkPiecePushOffManager.WorkPiecePushOff(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
-
-// return;
-// }
-// if (IsCaptureflag)
-// {
-// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
-// if (plcService == null)
-// {
-// SystemValue.lbl_Alert_OP0506 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
-// return;
-// }
-// if (plcService != null && !plcService.IsConnected)
-// {
-// plcService.Close();
-// plcService.OpenService();
-// }
-// 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_OP0506 = $" {RandomHelper.GenerateRandomCode(4)} {_dataCaptureConfig.WorkingProcedure} PLC杩炴帴宸叉柇寮�锛屾鍦ㄥ皾璇曟墦寮�!";
-// plcService.Close();
-// plcService.OpenService();
-// Thread.Sleep(100);
-// continue;
-// }
-// else
-// {
-// //涓氬姟浠ｇ爜
-// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
-// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
-// wplog.WorkingProcedure = WorkingProcedure;
-// wplog.EquipmentID = WorkingProcedure;
-// wplog.MonitoringPoint = DataCapturePointCode;
-// //wplog.CreatedUserName = DataCapturePointCode;
-// SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref wplog, DataCapturePointCode, DataCapturePointCname);
-// wplog.CreatedTime = DateTimeHelper.GetDateTime();
-// wplog.UpdatedTime = DateTimeHelper.GetDateTime();
-// wplog.UpdatedUserName = Environment.MachineName + "鑷姩";
-// wplog.OnlineTime = DateTimeHelper.GetDateTime();
-// 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(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭璁惧閲囬泦 璇诲彇宸ヤ欢鐮佸姩鎬佺敱浜庡瓧娈靛悕娌℃壘鍒帮紝璧嬪�笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝け璐wplog.Id}");
-// }
-// set.SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
-// }
-// catch (Exception setex)
-// {
-// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭璁惧閲囬泦 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id}", setex);
-// }
-// }
-// WorkPieceInfoManager.EquipmentMonitor(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
-// threadStatusMonitor.Threadstatue = 1;
-
-// }
-// SystemValue.lbl_Alert_OP0506 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
-
-// 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_OP0506 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭鐩戞帶璁惧閲囬泦 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭鐩戞帶璁惧閲囬泦鏁版嵁鏃跺紓甯革細", ex);
-// }
-// catch (Exception ex)
-// {
-// SystemValue.lbl_Alert_OP0506 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭鐩戞帶璁惧閲囬泦 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭鐩戞帶璁惧閲囬泦鏁版嵁鏃跺紓甯革細", ex);
-// }
-// finally
-// {
-// WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
-// }
-// }
-// }
-// else
-// {
-// SystemValue.lbl_Alert_OP0506 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode}宸ュ簭鐩戞帶璁惧閲囬泦 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
-// Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇粄DataCapturePointCode}宸ュ簭鐩戞帶璁惧閲囬泦 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
-// }
-// }
-
-// }
-//}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP0507.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP0507.cs
deleted file mode 100644
index 55bb7b1..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP0507.cs
+++ /dev/null
@@ -1,195 +0,0 @@
-锘�//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>
-// /// OP05 鍛婅鐩戞帶
-// /// </summary>
-// public class DataCaptureHandler_OP0507 : DataCaptureHandler
-// {
-// public static readonly DataCaptureHandler_OP0507 Instance = new DataCaptureHandler_OP0507();
-
-// public DataCaptureHandler_OP0507()
-// {
-// }
-
-// 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 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.CreatedUserName = DataCapturePointCode;
-// SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref wplog, DataCapturePointCode, DataCapturePointCname);
-// wplog.CreatedTime = DateTimeHelper.GetDateTime();
-// wplog.IsDeleted = false;
-
-
-// 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.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_OP0507 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
-// return;
-// }
-// if (plcService != null && !plcService.IsConnected)
-// {
-// plcService.Close();
-// plcService.OpenService();
-// }
-// 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_OP0507 = $" {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_OP0507.Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
-// {//褰撲笂涓�鏍囪浣�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.CreatedUserName = DataCapturePointCode;
-// SystemBussinessHelper.SetWorkPieceLogMiddleForCreatedUserName(ref wplog, DataCapturePointCode, DataCapturePointCname);
-// wplog.CreatedTime = DateTimeHelper.GetDateTime();
-// 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(WorkingProcedure), $" {WorkingProcedure}宸ュ簭鍛婅鐩戞帶 璇诲彇宸ヤ欢鐮佸姩鎬佺敱浜庡瓧娈靛悕娌℃壘鍒帮紝璧嬪�笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝け璐wplog.Id}");
-// }
-// set.SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
-// }
-// catch (Exception setex)
-// {
-// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {WorkingProcedure}宸ュ簭鍛婅鐩戞帶 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id}", setex);
-// }
-// }
-// //if(wplog.FailureType.Length>0)
-// {
-// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
-// WorkPieceInfoManager.AlertMonitor(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
-// threadStatusMonitor.Threadstatue = 1;
-// }
-
-
-
-
-// }
-// SystemValue.value_OP0507 = value.ToString();
-
-
-// }
-// SystemValue.lbl_Alert_OP0507 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
-
-// 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_OP0507 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅鏃跺紓甯革細", ex);
-// }
-// catch (Exception ex)
-// {
-// SystemValue.lbl_Alert_OP0507 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅鏃跺紓甯革細", ex);
-// }
-// finally
-// {
-// WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
-// }
-// }
-// }
-// else
-// {
-// SystemValue.lbl_Alert_OP0507 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
-// Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇粄DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
-// }
-// }
-
-// }
-//}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP1001.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP1001.cs
deleted file mode 100644
index 1527ab1..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP1001.cs
+++ /dev/null
@@ -1,154 +0,0 @@
-锘縰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;
-
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// OP10璇荤爜瀹屾垚鏍囪
- /// </summary>
- public class DataCaptureHandler_OP1001: DataCaptureHandler
- {
- public static readonly DataCaptureHandler_OP1001 Instance = new DataCaptureHandler_OP1001();
-
- public DataCaptureHandler_OP1001()
- {
- }
-
- 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 void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
- {
- //try
- //{
- // foreach (var dataCaptureColumnDict in dataCaptureConfig)
- // {
- // switch (dataCaptureColumnDict.DataCapturePointCode)
- // {
- // case "OP1001":
- // //_dataCaptureConfig = dataCaptureColumnDict;
- // IsCaptureflag = true;
- // return;
-
- // }
- // }
- //}
- //catch (Exception ex)
- //{
- // SystemValue.lbl_Alert_OP1001 = $" {RandomHelper.GenerateRandomCode(4)} OP05宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- // Log4NetHelper.WriteErrorLog(LogType.PLCOP05, "鍒锋柊 OP05宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
- //}
- }
-
- public override void DataCaptureStart()
- {
- if (IsCaptureflag)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- if (plcService == null)
- {
- SystemValue.lbl_Alert_OP1001 = $"{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_OP1001 = $" {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_OP1001.Equals("0") && value.ToString().Equals("1"))
- {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
- //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
- //涓氬姟浠ｇ爜
- WorkPieceLog wplog = new WorkPieceLog();
- wplog.WorkingProcedure = "OP10";
- wplog.EquipmentID = "OP10";
- wplog.Remarks = "OP10";
- wplog.MonitoringPoint = "OP1001";
- 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.ReadQRcode(wplog, LogType.PLCOP10, plcService, _dataCaptureConfig.IsFeedback);
-
-
- //鍒ゆ柇鏄惁璺冲簭锛屼笂涓�宸ュ簭璐ㄩ噺鏄惁鍚堟牸
-
-
-
- //鍙嶉缁橮LC锛屽啓鍏�
-
-
- }
- SystemValue.value_OP1001 = value.ToString();
-
-
- }
- SystemValue.lbl_Alert_OP1001 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
- if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
- {
- Thread.Sleep(5000);
- }
- else
- {
- Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
- }
-
- }
- catch (Exception ex)
- {
- SystemValue.lbl_Alert_OP1001 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭涓婄嚎鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(LogType.PLCOP05, $"璇诲彇 {DataCapturePointCode}宸ュ簭涓婄嚎鏁版嵁鏃跺紓甯革細", ex);
- }
- }
- }
- else
- {
- SystemValue.lbl_Alert_OP1001 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode}宸ュ簭涓婄嚎鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
- Log4NetHelper.WriteInfoLog(LogType.PLCOP10, $"{DataCapturePointCode}涓婄嚎鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
- }
- }
-
- }
-}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP1002.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP1002.cs
deleted file mode 100644
index 301f057..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP1002.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-锘縰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 System.Web.UI.WebControls;
-
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// OP10娴嬭瘯瀹屾垚鏍囪 锛圤P10锛�
- /// </summary>
- public class DataCaptureHandler_OP1002: DataCaptureHandler
- {
- public static readonly DataCaptureHandler_OP1002 Instance = new DataCaptureHandler_OP1002();
-
- public DataCaptureHandler_OP1002()
- {
- }
-
- 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 void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
- {
- }
-
- public override void DataCaptureStart()
- {
- if (IsCaptureflag)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- if (plcService == null)
- {
- SystemValue.lbl_Alert_OP1002 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{WorkingProcedure}鐨凱LC璁惧";
- return;
- }
- if (plcService != null && !plcService.IsConnected)
- {
- plcService.Close();
- plcService.OpenService();
- }
- 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_OP1002 = $" {RandomHelper.GenerateRandomCode(4)} {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_OP1002.Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
- {//褰撲笂涓�鏍囪浣�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.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.UpdatedTime = DateTimeHelper.GetDateTime();
- wplog.UpdatedUserName = "鑷姩";
- wplog.OnlineTime = DateTimeHelper.GetDateTime();
- wplog.IsDeleted = false;
- wplog.QualityType = QualityType.Online.ToString();
-
- 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(WorkingProcedure), $" {WorkingProcedure}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佺敱浜庡瓧娈靛悕娌℃壘鍒帮紝璧嬪�笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝け璐wplog.Id}");
- }
- set.SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
- }
- catch (Exception setex)
- {
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {WorkingProcedure}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id}", setex);
- }
- }
- //#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_OP1002 = value.ToString();
-
-
- }
- SystemValue.lbl_Alert_OP1002 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
- if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
- {
- Thread.Sleep(5000);
- }
- else
- {
- Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
- }
-
- }
- catch (Exception ex)
- {
- SystemValue.lbl_Alert_OP1002 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}璐ㄩ噺淇℃伅 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}璐ㄩ噺淇℃伅鏃跺紓甯革細", ex);
- }
- finally
- {
- WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
- }
- }
- }
- else
- {
- SystemValue.lbl_Alert_OP1002 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode}璐ㄩ噺淇℃伅 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}璐ㄩ噺淇℃伅 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
- }
- }
-
- }
-}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP1003.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP1003.cs
deleted file mode 100644
index 948434c..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP1003.cs
+++ /dev/null
@@ -1,172 +0,0 @@
-锘縰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;
-
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// OP10娴嬭瘯瀹屾垚鏍囪 锛圤P40锛�
- /// </summary>
- public class DataCaptureHandler_OP1003 : DataCaptureHandler
- {
- public static readonly DataCaptureHandler_OP1003 Instance = new DataCaptureHandler_OP1003();
-
- public DataCaptureHandler_OP1003()
- {
- }
-
- 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 void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
- {
- }
-
- public override void DataCaptureStart()
- {
- if (IsCaptureflag)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- if (plcService == null)
- {
- SystemValue.lbl_Alert_OP1003 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{WorkingProcedure}鐨凱LC璁惧";
- return;
- }
- if (plcService != null && !plcService.IsConnected)
- {
- plcService.Close();
- plcService.OpenService();
- }
- 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_OP1003 = $" {RandomHelper.GenerateRandomCode(4)} {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_OP1003.Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
- {//褰撲笂涓�鏍囪浣�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.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.UpdatedTime = DateTimeHelper.GetDateTime();
- wplog.UpdatedUserName = "鑷姩";
- wplog.OnlineTime = DateTimeHelper.GetDateTime();
- 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(WorkingProcedure), $" {WorkingProcedure}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佺敱浜庡瓧娈靛悕娌℃壘鍒帮紝璧嬪�笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝け璐wplog.Id}");
- }
- set.SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
- }
- catch (Exception setex)
- {
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {WorkingProcedure}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id}", setex);
- }
- }
- if (wplog.WorkPieceID.Length != 22)
- {//鑾峰彇鍒扮殑宸ヤ欢鍙峰紓甯�
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {WorkingProcedure}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佹暟鎹椂寮傚父锛�");
- 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();
-
-
- }
- SystemValue.lbl_Alert_OP1003 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
- if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
- {
- Thread.Sleep(5000);
- }
- else
- {
- Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
- }
-
- }
- catch (Exception ex)
- {
- SystemValue.lbl_Alert_OP1003 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}璐ㄩ噺淇℃伅 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}璐ㄩ噺淇℃伅鏃跺紓甯革細", ex);
- }
- finally
- {
- WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
- }
- }
- }
- else
- {
- SystemValue.lbl_Alert_OP1003 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode}璐ㄩ噺淇℃伅 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}璐ㄩ噺淇℃伅 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
- }
- }
-
- }
-}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP1004.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP1004.cs
deleted file mode 100644
index 2218e7c..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP1004.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-锘縰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;
-
-namespace iWare_SCADA_BusinessLogical
-{
- /// <summary>
- /// OP10/OP40鎺ㄥ嚭鏍囪
- /// </summary>
- public class DataCaptureHandler_OP1004: DataCaptureHandler
- {
- public static readonly DataCaptureHandler_OP1004 Instance = new DataCaptureHandler_OP1004();
-
- public DataCaptureHandler_OP1004()
- {
- }
-
- 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 void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
- {
- }
-
- public override void DataCaptureStart()
- {
- if (IsCaptureflag)
- {
- var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
- if (plcService == null)
- {
- SystemValue.lbl_Alert_OP1004 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
- return;
- }
- if (plcService != null && !plcService.IsConnected)
- {
- plcService.Close();
- plcService.OpenService();
- }
- 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_OP1004 = $" {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_OP1004.Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
- {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
- //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
- //涓氬姟浠ｇ爜 1.鍙栨帹鍑烘爣璁帮紝2鍙栨帹鍑哄師鍥狅紙1锛歯ok锛�2鍜�3锛歴pc锛�4锛氱姸鎬佷笉鏄� 锛夛紝3 鍙栨帹鍑轰簩缁寸爜
- WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
- wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
- wplog.WorkingProcedure = WorkingProcedure;
- wplog.EquipmentID = WorkingProcedure;
- wplog.MonitoringPoint = DataCapturePointCode;
- wplog.CreatedTime = DateTimeHelper.GetDateTime();
- wplog.CreatedUserName = DataCapturePointCode;
- wplog.UpdatedTime = DateTimeHelper.GetDateTime();
- wplog.UpdatedUserName = "鑷姩";
- wplog.OnlineTime = DateTimeHelper.GetDateTime();
- 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(WorkingProcedure), $" {WorkingProcedure}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佺敱浜庡瓧娈靛悕娌℃壘鍒帮紝璧嬪�笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝け璐wplog.Id}");
- }
- set.SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
- }
- catch (Exception setex)
- {
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {WorkingProcedure}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id}", setex);
- }
- }
- if (wplog.OP10Flag != 1 && wplog.OP10Flag != 2 && wplog.OP10Flag != 3)
- {//鑾峰彇鍒扮殑宸ヤ欢鍙峰紓甯�
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {WorkingProcedure}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佹暟鎹畕wplog.WorkPieceID}鎺ㄥ嚭鍘熷洜[{wplog.OP10Flag}]寮傚父");
- wplog.Remarks = $"鎺ㄥ嚭鍘熷洜[{wplog.OP10Flag}]寮傚父";
- }
- if (wplog.OP10Flag == 1)
- {
- WorkPieceInfoManager.WorkPiecePushOff(wplog, LogType.PLCOP10);
- threadStatusMonitor.Threadstatue = 1;
- }
- //else if (wplog.OP10Flag == 2 || wplog.OP10Flag == 3)
- else
- {
- WorkPieceInfoManager.WorkPieceSPCPushOff(wplog, LogType.PLCOP10);
- threadStatusMonitor.Threadstatue = 1;
- }
-
-
-
-
-
- }
- SystemValue.value_OP1004 = value.ToString();
-
-
- }
- SystemValue.lbl_Alert_OP1004 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
- if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
- {
- Thread.Sleep(5000);
- }
- else
- {
- Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
- }
-
- }
- catch (Exception ex)
- {
- SystemValue.lbl_Alert_OP1004 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode}鎺ㄥ嚭淇℃伅 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
- Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}鎺ㄥ嚭淇℃伅 鏁版嵁鏃跺紓甯革細", ex);
- }
- finally
- {
- WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
- }
- }
- }
- else
- {
- SystemValue.lbl_Alert_OP1004 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode}鎺ㄥ嚭淇℃伅 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛侊紒";
- Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}鎺ㄥ嚭淇℃伅 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
- }
- }
-
- }
-}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP1005.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP1005.cs
deleted file mode 100644
index 9456aab..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP1005.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-锘�//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>
-// /// OP10宸ュ簭瀹屾垚鏍囪
-// /// </summary>
-// public class DataCaptureHandler_OP1005: DataCaptureHandler
-// {
-// public static readonly DataCaptureHandler_OP1005 Instance = new DataCaptureHandler_OP1005();
-
-// public DataCaptureHandler_OP1005()
-// {
-// }
-
-// 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 void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
-// {
-// }
-
-// public override void DataCaptureStart()
-// {
-// if (IsCaptureflag)
-// {
-// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
-// if (plcService == null)
-// {
-// SystemValue.lbl_Alert_OP1005 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
-// return;
-// }
-// if (plcService != null && !plcService.IsConnected)
-// {
-// plcService.Close();
-// plcService.OpenService();
-// }
-// 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_OP1005 = $" {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_OP1005.Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
-// {//褰撲笂涓�鏍囪浣�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.CreatedTime = DateTimeHelper.GetDateTime();
-// wplog.CreatedUserName = DataCapturePointCode;
-// wplog.UpdatedTime = DateTimeHelper.GetDateTime();
-// wplog.UpdatedUserName = Environment.MachineName+"鑷姩";
-// wplog.OnlineTime = DateTimeHelper.GetDateTime();
-// 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(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鐩戞帶瀹屾垚鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佺敱浜庡瓧娈靛悕娌℃壘鍒帮紝璧嬪�笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝け璐wplog.Id}");
-// }
-// set.SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
-// }
-// catch (Exception setex)
-// {
-// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鐩戞帶瀹屾垚鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id}", setex);
-// }
-// }
-// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
-// WorkPieceInfoManager.WorkingProcedureComplete(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
-// threadStatusMonitor.Threadstatue = 1;
-
-
-// //鍒ゆ柇鏄惁璺冲簭锛屼笂涓�宸ュ簭璐ㄩ噺鏄惁鍚堟牸
-
-// //鍙嶉缁橮LC锛屽啓鍏�
-
-
-// }
-// SystemValue.value_OP1005 = value.ToString();
-
-
-// }
-// SystemValue.lbl_Alert_OP1005 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
-// if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
-// {
-// Thread.Sleep(5000);
-// }
-// else
-// {
-// Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
-// }
-
-// }
-// catch (Exception ex)
-// {
-// SystemValue.lbl_Alert_OP1005 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭瀹屾垚鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}宸ュ簭瀹屾垚鏍囪鏁版嵁鏃跺紓甯革細", ex);
-// }
-// finally
-// {
-// WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
-// }
-// }
-// }
-// else
-// {
-// SystemValue.lbl_Alert_OP1005 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭瀹屾垚鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
-// Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"{DataCapturePointCode}宸ュ簭瀹屾垚鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
-// }
-// }
-
-// }
-//}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP1006.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP1006.cs
deleted file mode 100644
index e354be7..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP1006.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-锘�//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>
-// /// OP10璁惧淇℃伅閲囬泦
-// /// </summary>
-// public class DataCaptureHandler_OP1006: DataCaptureHandler
-// {
-// public static readonly DataCaptureHandler_OP1006 Instance = new DataCaptureHandler_OP1006();
-
-// public DataCaptureHandler_OP1006()
-// {
-// }
-
-// 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 void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
-// {
-// }
-
-// public override void DataCaptureStart()
-// {
-// if (IsCaptureflag)
-// {
-// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
-// if (plcService == null)
-// {
-// SystemValue.lbl_Alert_OP1006 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
-// return;
-// }
-// if (plcService != null && !plcService.IsConnected)
-// {
-// plcService.Close();
-// plcService.OpenService();
-// }
-// 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_OP1006 = $" {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_OP1006.Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
-// {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
-// //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
-// //涓氬姟浠ｇ爜
-// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
-// wplog.Id = Yitter.IdGenerator.YitIdHelper.NextId();
-// wplog.WorkingProcedure = WorkingProcedure;
-// wplog.EquipmentID = WorkingProcedure;
-// wplog.MonitoringPoint = DataCapturePointCode;
-// wplog.CreatedTime = DateTimeHelper.GetDateTime();
-// wplog.CreatedUserName = DataCapturePointCode;
-// wplog.UpdatedTime = DateTimeHelper.GetDateTime();
-// wplog.UpdatedUserName = Environment.MachineName+"鑷姩";
-// wplog.OnlineTime = DateTimeHelper.GetDateTime();
-// 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(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佺敱浜庡瓧娈靛悕娌℃壘鍒帮紝璧嬪�笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝け璐wplog.Id}");
-// }
-// set.SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
-// }
-// catch (Exception setex)
-// {
-// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {DataCapturePointCode}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id}", setex);
-// }
-// }
-// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
-// WorkPieceInfoManager.EquipmentMonitor(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
-// threadStatusMonitor.Threadstatue = 1;
-
-
-// //鍒ゆ柇鏄惁璺冲簭锛屼笂涓�宸ュ簭璐ㄩ噺鏄惁鍚堟牸
-
-// //鍙嶉缁橮LC锛屽啓鍏�
-
-
-// }
-// //SystemValue.value_OP1006 = value.ToString();
-
-
-// }
-// SystemValue.lbl_Alert_OP1006 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
-// if (!_dataCaptureConfig.DataCaptureFrequency.HasValue || _dataCaptureConfig.DataCaptureFrequency < 10)
-// {
-// Thread.Sleep(5000);
-// }
-// else
-// {
-// Thread.Sleep(_dataCaptureConfig.DataCaptureFrequency.Value);
-// }
-
-// }
-// catch (Exception ex)
-// {
-// SystemValue.lbl_Alert_OP1006 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭璁惧閲囬泦 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-// Log4NetHelper.WriteErrorLog(LogType.PLCOP05, $"{DataCapturePointCode}宸ュ簭璁惧閲囬泦鏁版嵁鏃跺紓甯革細", ex);
-// }
-// finally
-// {
-// WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
-// }
-// }
-// }
-// else
-// {
-// SystemValue.lbl_Alert_OP1006 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode}宸ュ簭璁惧閲囬泦 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
-// Log4NetHelper.WriteInfoLog(LogType.PLCOP05, $"{DataCapturePointCode}宸ュ簭璁惧閲囬泦鏁版嵁 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
-// }
-// }
-
-// }
-//}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP1007.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP1007.cs
deleted file mode 100644
index 2272d6f..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP1007.cs
+++ /dev/null
@@ -1,190 +0,0 @@
-锘�//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>
-// /// OP10 鍛婅鐩戞帶
-// /// </summary>
-// public class DataCaptureHandler_OP1007: DataCaptureHandler
-// {
-// public static readonly DataCaptureHandler_OP1007 Instance = new DataCaptureHandler_OP1007();
-
-// public DataCaptureHandler_OP1007()
-// {
-// }
-
-// 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 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.CreatedTime = DateTimeHelper.GetDateTime();
-// wplog.CreatedUserName = DataCapturePointCode;
-// wplog.IsDeleted = false;
-
-
-// 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.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_OP1007 = $"{RandomHelper.GenerateRandomCode(4)} 娌℃湁鎵惧埌{_dataCaptureConfig.WorkingProcedure}鐨凱LC璁惧";
-// return;
-// }
-// if (plcService != null && !plcService.IsConnected)
-// {
-// plcService.Close();
-// plcService.OpenService();
-// }
-// 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_OP1007 = $" {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_OP1007.Equals("FALSE") && value.ToString().ToUpper().Equals("TRUE"))
-// {//褰撲笂涓�鏍囪浣�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.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(WorkingProcedure), $" {WorkingProcedure}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佺敱浜庡瓧娈靛悕娌℃壘鍒帮紝璧嬪�笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝け璐wplog.Id}");
-// }
-// set.SetValue(wplog, valuecol);//缁欏姩鎬佸瓧娈佃祴鍊�
-// }
-// catch (Exception setex)
-// {
-// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $" {WorkingProcedure}宸ュ簭鐩戞帶璇荤爜鏍囪 璇诲彇宸ヤ欢鐮佸姩鎬佽祴鍊笺�恵WorkingProcedure ?? "绌哄瓧绗︿覆"}銆戝紓甯竰wplog.Id}", setex);
-// }
-// }
-// //鏇存柊WorkPieceInfo琛ㄤ互鍙婃彃鍏orkPieceLog琛ㄥ拰WorkPieceInfoLog琛�
-// WorkPieceInfoManager.AlertMonitor(wplog, PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure));
-// threadStatusMonitor.Threadstatue = 1;
-
-
-
-
-// }
-// SystemValue.value_OP1007 = value.ToString();
-
-
-// }
-// SystemValue.lbl_Alert_OP1007 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
-
-// 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_OP1007 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅鏃跺紓甯革細", ex);
-// }
-// catch (Exception ex)
-// {
-// SystemValue.lbl_Alert_OP1007 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇{DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-// Log4NetHelper.WriteErrorLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇诲彇 {DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅鏃跺紓甯革細", ex);
-// }
-// finally
-// {
-// WorkPieceInfoManager.ThreadMonitor(threadStatusMonitor);
-// }
-// }
-// }
-// else
-// {
-// SystemValue.lbl_Alert_OP1007 = $" {RandomHelper.GenerateRandomCode(4)} {DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
-// Log4NetHelper.WriteInfoLog(PLCManger.GetLogTypeForWorkingProcedure(WorkingProcedure), $"璇粄DataCapturePointCode}宸ュ簭璁惧鍛婅淇℃伅 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
-// }
-// }
-
-// }
-//}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP2001.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP2001.cs
deleted file mode 100644
index eba045a..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP2001.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-锘�//using iWare_SCADA_BusinessLogical.BLL;
-//using iWare_SCADA_BusinessLogical.BLL.Important;
-//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>
-// /// OP20璇荤爜瀹屾垚鏍囪
-// /// </summary>
-// public class DataCaptureHandler_OP2001: DataCaptureHandler
-// {
-// public static readonly DataCaptureHandler_OP2001 Instance = new DataCaptureHandler_OP2001();
-
-// public DataCaptureHandler_OP2001()
-// {
-// }
-
-// 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 void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
-// {
-// //try
-// //{
-// // foreach (var dataCaptureColumnDict in dataCaptureConfig)
-// // {
-// // switch (dataCaptureColumnDict.DataCapturePointCode)
-// // {
-// // case "OP2001":
-// // //_dataCaptureConfig = dataCaptureColumnDict;
-// // IsCaptureflag = true;
-// // return;
-
-// // }
-// // }
-// //}
-// //catch (Exception ex)
-// //{
-// // SystemValue._lbl_Alert_OP2001 = $" {RandomHelper.GenerateRandomCode(4)} OP05宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-// // Log4NetHelper.WriteErrorLog(LogType.PLCOP05, "鍒锋柊 OP05宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
-// //}
-// }
-
-// public override void DataCaptureStart()
-// {
-// if (IsCaptureflag)
-// {
-// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
-// if (plcService == null)
-// {
-// SystemValue._lbl_Alert_OP2001 = $"{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_OP2001 = $" {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_OP2001.Equals("0") && value.ToString().Equals("1"))
-// {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
-// //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
-// //涓氬姟浠ｇ爜
-// WorkPieceLog wplog = new WorkPieceLog();
-// wplog.WorkingProcedure = "OP20";
-// wplog.EquipmentID = "OP20";
-// wplog.Remarks = "OP20";
-// wplog.MonitoringPoint = "OP2001";
-// 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琛�
-// ReadQRcodeManager.ReadQRcode(wplog, LogType.PLCOP20, plcService, _dataCaptureConfig.IsFeedback);
-
-
-// //鍒ゆ柇鏄惁璺冲簭锛屼笂涓�宸ュ簭璐ㄩ噺鏄惁鍚堟牸
-
-
-
-// //鍙嶉缁橮LC锛屽啓鍏�
-
-
-// }
-// SystemValue.value_OP2001 = value.ToString();
-
-
-// }
-// SystemValue._lbl_Alert_OP2001 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
-
-// }
-// catch (Exception ex)
-// {
-// SystemValue._lbl_Alert_OP2001 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇OP05宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-// Log4NetHelper.WriteErrorLog(LogType.PLCOP05, "璇诲彇 OP05宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
-// }
-// }
-// }
-// else
-// {
-// SystemValue._lbl_Alert_OP2001 = $" {RandomHelper.GenerateRandomCode(4)} OP20宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
-// Log4NetHelper.WriteInfoLog(LogType.PLCOP20, "璇籓P20宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
-// }
-// }
-
-// }
-//}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP2002.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP2002.cs
deleted file mode 100644
index 9b987c1..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP2002.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-锘�//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>
-// /// OP20娴嬭瘯瀹屾垚鏍囪
-// /// </summary>
-// public class DataCaptureHandler_OP2002: DataCaptureHandler
-// {
-// public static readonly DataCaptureHandler_OP2002 Instance = new DataCaptureHandler_OP2002();
-
-// public DataCaptureHandler_OP2002()
-// {
-// }
-
-// 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 void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
-// {
-// //try
-// //{
-// // foreach (var dataCaptureColumnDict in dataCaptureConfig)
-// // {
-// // switch (dataCaptureColumnDict.DataCapturePointCode)
-// // {
-// // case "OP2001":
-// // //_dataCaptureConfig = dataCaptureColumnDict;
-// // IsCaptureflag = true;
-// // return;
-
-// // }
-// // }
-// //}
-// //catch (Exception ex)
-// //{
-// // SystemValue._lbl_Alert_OP2001 = $" {RandomHelper.GenerateRandomCode(4)} OP05宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-// // Log4NetHelper.WriteErrorLog(LogType.PLCOP05, "鍒锋柊 OP05宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
-// //}
-// }
-
-// public override void DataCaptureStart()
-// {
-// if (IsCaptureflag)
-// {
-// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
-// if (plcService == null)
-// {
-// SystemValue._lbl_Alert_OP2001 = $"{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_OP2001 = $" {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_OP2001.Equals("0") && value.ToString().Equals("1"))
-// {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
-// //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
-// //涓氬姟浠ｇ爜
-// WorkPieceLogMiddle wplog = new WorkPieceLogMiddle();
-// wplog.WorkingProcedure = "OP20";
-// wplog.EquipmentID = "OP20";
-// wplog.Remarks = "OP20";
-// wplog.MonitoringPoint = "OP2002";
-// 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;
-// }
-// }
-
-// #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, LogType.PLCOP20);
-
-
-
-// }
-// SystemValue.value_OP2001 = value.ToString();
-
-
-// }
-// SystemValue._lbl_Alert_OP2001 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
-
-// }
-// catch (Exception ex)
-// {
-// SystemValue._lbl_Alert_OP2001 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇OP05宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-// Log4NetHelper.WriteErrorLog(LogType.PLCOP05, "璇诲彇 OP05宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
-// }
-// }
-// }
-// else
-// {
-// SystemValue._lbl_Alert_OP2001 = $" {RandomHelper.GenerateRandomCode(4)} OP05宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
-// Log4NetHelper.WriteInfoLog(LogType.PLCOP05, "璇籓P05宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
-// }
-// }
-
-// }
-//}
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP2003.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP2003.cs
deleted file mode 100644
index 2e45f2f..0000000
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/DataCaptureHandler/DataCaptureHandler_OP2003.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-锘�//using iWare_SCADA_BusinessLogical.BLL;
-//using iWare_SCADA_BusinessLogical.BLL.Important;
-//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>
-// /// OP20鎺ㄥ嚭鏍囪
-// /// </summary>
-// public class DataCaptureHandler_OP2003: DataCaptureHandler
-// {
-// public static readonly DataCaptureHandler_OP2003 Instance = new DataCaptureHandler_OP2003();
-
-// public DataCaptureHandler_OP2003()
-// {
-// }
-
-// 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 void RefreshDataList(List<DataCaptureConfig> dataCaptureConfig)
-// {
-// //try
-// //{
-// // foreach (var dataCaptureColumnDict in dataCaptureConfig)
-// // {
-// // switch (dataCaptureColumnDict.DataCapturePointCode)
-// // {
-// // case "OP2001":
-// // //_dataCaptureConfig = dataCaptureColumnDict;
-// // IsCaptureflag = true;
-// // return;
-
-// // }
-// // }
-// //}
-// //catch (Exception ex)
-// //{
-// // SystemValue._lbl_Alert_OP2001 = $" {RandomHelper.GenerateRandomCode(4)} OP05宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-// // Log4NetHelper.WriteErrorLog(LogType.PLCOP05, "鍒锋柊 OP05宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
-// //}
-// }
-
-// public override void DataCaptureStart()
-// {
-// if (IsCaptureflag)
-// {
-// var plcService = PLCManger.GetSinglePLCService(_dataCaptureConfig);
-// if (plcService == null)
-// {
-// SystemValue._lbl_Alert_OP2001 = $"{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_OP2001 = $" {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_OP2001.Equals("0") && value.ToString().Equals("1"))
-// {//褰撲笂涓�鏍囪浣�0锛屽綋鍓嶈幏鍙栨爣璁颁负1鏃讹紝
-// //瑙﹀彂鎿嶄綔, 骞剁粰闈欐�佸彉閲忚祴鍊间负1
-// //涓氬姟浠ｇ爜
-// WorkPieceLog wplog = new WorkPieceLog();
-// wplog.WorkingProcedure = "OP20";
-// wplog.EquipmentID = "OP20";
-// wplog.Remarks = "OP20";
-// wplog.MonitoringPoint = "OP2003";
-// 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琛�
-// ReadQRcodeManager.ReadQRcode(wplog, LogType.PLCOP20, plcService, _dataCaptureConfig.IsFeedback);
-
-
-// //鍒ゆ柇鏄惁璺冲簭锛屼笂涓�宸ュ簭璐ㄩ噺鏄惁鍚堟牸
-
-// //鍙嶉缁橮LC锛屽啓鍏�
-
-
-// }
-// SystemValue.value_OP2001 = value.ToString();
-
-
-// }
-// SystemValue._lbl_Alert_OP2001 = $"abcdefg:{RandomHelper.GenerateRandomCode(4)}";
-
-// }
-// catch (Exception ex)
-// {
-// SystemValue._lbl_Alert_OP2001 = $" {RandomHelper.GenerateRandomCode(4)} 璇诲彇OP05宸ュ簭鐩戞帶鎵撶爜鏍囪 鍑虹幇寮傚父锛岃鏌ョ湅鏃ュ織锛�";
-// Log4NetHelper.WriteErrorLog(LogType.PLCOP05, "璇诲彇 OP05宸ュ簭鐩戞帶鎵撶爜鏍囪鏁版嵁鏃跺紓甯革細", ex);
-// }
-// }
-// }
-// else
-// {
-// SystemValue._lbl_Alert_OP2001 = $" {RandomHelper.GenerateRandomCode(4)} OP05宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭閰嶇疆淇℃伅锛�";
-// Log4NetHelper.WriteInfoLog(LogType.PLCOP05, "璇籓P05宸ュ簭鐩戞帶鎵撶爜鏍囪 涓嶅仛鏍￠獙锛岃纭鏄惁閰嶇疆寮傚父");
-// }
-// }
-
-// }
-//}
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 5db4e79..3c66585 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/MonitorHelper.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/MonitorHelper.cs
@@ -85,6 +85,7 @@
WorkingProcedure = _dataCaptureConfig.WorkingProcedure,
CreatedTime = DateTime.Now,
CreatedUserName = _dataCaptureConfig.DataCapturePointCode,
+ DataCapturePointCname = _dataCaptureConfig.DataCapturePointCname,
MyRemarks = "",
Remarks = pieceLogTypeEnum.ToString(),
PieceLogType = (int)pieceLogTypeEnum,
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/iWare_SCADA_BusinessLogical.csproj b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/iWare_SCADA_BusinessLogical.csproj
index e82b2f9..a001515 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/iWare_SCADA_BusinessLogical.csproj
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/iWare_SCADA_BusinessLogical.csproj
@@ -108,11 +108,6 @@
<Compile Include="DataCaptureHandlerV2\AlertMonitor.cs" />
<Compile Include="DataCaptureHandlerV2\DataCaptureHandler_OP6002.cs" />
<Compile Include="DataCaptureHandler\DataCaptureHandler.cs" />
- <Compile Include="DataCaptureHandler\DataCaptureHandler_OP0506.cs" />
- <Compile Include="DataCaptureHandler\DataCaptureHandler_OP0507.cs" />
- <Compile Include="DataCaptureHandler\DataCaptureHandler_OP1005.cs" />
- <Compile Include="DataCaptureHandler\DataCaptureHandler_OP1006.cs" />
- <Compile Include="DataCaptureHandler\DataCaptureHandler_OP1007.cs" />
<Compile Include="DataCaptureHandler\DataCaptureHandler_OP3501.cs" />
<Compile Include="DataCaptureHandler\DataCaptureHandler_OP3503.cs" />
<Compile Include="DataCaptureHandler\DataCaptureHandler_OP3504.cs" />
@@ -124,12 +119,9 @@
<Compile Include="DataCaptureHandler\DataCaptureHandler_OP3004.cs" />
<Compile Include="DataCaptureHandler\DataCaptureHandler_OP3003.cs" />
<Compile Include="DataCaptureHandler\DataCaptureHandler_OP3001.cs" />
- <Compile Include="DataCaptureHandler\DataCaptureHandler_OP2002.cs" />
- <Compile Include="DataCaptureHandler\DataCaptureHandler_OP2003.cs" />
<Compile Include="DataCaptureHandler\DataCaptureHandler_OP2006.cs" />
<Compile Include="DataCaptureHandler\DataCaptureHandler_OP2005.cs" />
<Compile Include="DataCaptureHandler\DataCaptureHandler_OP2004.cs" />
- <Compile Include="DataCaptureHandler\DataCaptureHandler_OP2001.cs" />
<Compile Include="DataCaptureHandler\DataCaptureHandler_OP3502.cs" />
<Compile Include="DataCaptureHandler\DataCaptureHandler_OP3505.cs" />
<Compile Include="DataCaptureHandler\DataCaptureHandler_OP3506.cs" />
--
Gitblit v1.9.3