From 5241a8f6377dfd1618610dd15fd05ed6f51c8ba2 Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期三, 16 十二月 2020 11:19:45 +0800
Subject: [PATCH] 1. 添加默认流程和默认产品功能 2. 修改批量建立检测项功能

---
 src/Bro.Process/ProcessControl.cs |   57 ++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/src/Bro.Process/ProcessControl.cs b/src/Bro.Process/ProcessControl.cs
index 29d3170..359e771 100644
--- a/src/Bro.Process/ProcessControl.cs
+++ b/src/Bro.Process/ProcessControl.cs
@@ -21,7 +21,7 @@
 using System.Threading.Tasks;
 using static Bro.Common.Helper.EnumHelper;
 
-namespace Bro.Process
+namespace Bro.Process  
 {
     [Process("", DeviceAttributeType.Device)]
     public partial class ProcessControl : IProcess
@@ -32,8 +32,8 @@
             #region AutoFac娉ㄥ唽
             GlobalVar.Builder.RegisterInstance(this).As<IProcess>().ExternallyOwned();
             GlobalVar.Builder.RegisterInstance(IConfig).As<IProcessConfig>().ExternallyOwned();
-            GlobalVar.Builder.RegisterInstance(DeviceCollection).ExternallyOwned();
-            GlobalVar.Builder.RegisterInstance(ProcessMethodCollection).ExternallyOwned();
+            GlobalVar.Builder.RegisterInstance(DeviceCollection);
+            GlobalVar.Builder.RegisterInstance(ProcessMethodCollection);
 
             //if (isBuild)
             //{
@@ -45,7 +45,6 @@
 
         #region Event
         public event Action<string, Bitmap, string> OnBitmapOutput;
-        //public event Action<string, object> OnObjectOutput;
         public Action<DateTime, Exception> OnExceptionOccured { get; set; }
         public event Action<DeviceState> OnProcessStateChanged;
         public event Action<DateTime, string, string> OnLog;
@@ -348,10 +347,16 @@
             {
                 if (config == null)
                     throw new ProcessException("淇濆瓨鐨勯厤缃俊鎭笉鑳戒负绌�");
-                ProductionCode = newProductionCode;
+
+                string newConfigPath = Path.Combine(Path.GetDirectoryName(_configPath), $"Config_{newProductionCode}.json");
+                if (File.Exists(newConfigPath))
+                {
+                    throw new ProcessException($"{newProductionCode}閰嶇疆鏂囦欢宸茬粡瀛樺湪");
+                }
+
                 //鐢熸垚config.json
                 string newConfig = JsonConvert.SerializeObject(config, new JsonSerializerSettings() { TypeNameHandling = TypeNameHandling.All });
-                using (StreamWriter writer = new StreamWriter(_configPath, false, System.Text.Encoding.UTF8))
+                using (StreamWriter writer = new StreamWriter(newConfigPath, false, System.Text.Encoding.UTF8))
                 {
                     writer.Write(newConfig);
                     writer.Flush();
@@ -359,7 +364,7 @@
                 }
 
                 //娣诲姞鍒癝etting.json
-                SettingHelper.AddNewProductionCode(ProductionCode);
+                SettingHelper.AddNewProductionCode(newProductionCode);
             }
             catch (Exception ex)
             {
@@ -520,11 +525,14 @@
                 return;
             }
 
+            if (!ProcessInvokePreCheck())
+                return;
+
             IOperationConfig config = monitorSet.OpConfig;
             object res = null;
             int reTryTimes = config.ReTryTimes;
             IDevice device = DeviceCollection.FirstOrDefault(u => u.Id == deviceId);
-            LogAsync(DateTime.Now, $"{device.Name}璋冪敤{methodCode}寮�濮�", "");
+            LogAsync(DateTime.Now, $"{device?.Name}璋冪敤{methodCode}寮�濮�", "");
 
             Stopwatch sw = new Stopwatch();
             sw.Start();
@@ -578,6 +586,8 @@
                         }
 
                         LogAsync(DateTime.Now, methodCode + "寮傚父淇℃伅", ex.GetExceptionMessage());
+
+                        ExceptionRaisedInMonitor(ex);
                     }
                 }
 
@@ -598,13 +608,30 @@
             #endregion
 
             sw.Stop();
-            LogAsync(DateTime.Now, $"{device.Name}璋冪敤{methodCode}瀹屾垚锛岃�楁椂{sw.ElapsedMilliseconds}ms", "");
-            TimeRecordCSV(DateTime.Now, device.Name, $"{methodCode}璋冪敤瀹屾垚", (int)sw.ElapsedMilliseconds);
+            LogAsync(DateTime.Now, $"{device?.Name}璋冪敤{methodCode}瀹屾垚锛岃�楁椂{sw.ElapsedMilliseconds}ms", "");
+            TimeRecordCSV(DateTime.Now, device?.Name, $"{methodCode}璋冪敤瀹屾垚", (int)sw.ElapsedMilliseconds);
+        }
+
+        /// <summary>
+        /// 娴佺▼鎵ц鐨勯妫�鏌�
+        /// </summary>
+        /// <returns></returns>
+        public virtual bool ProcessInvokePreCheck()
+        {
+            return true;
+        }
+
+        /// <summary>
+        /// 鐩戝惉娴佺▼涓紓甯告姏鍑� 鍦ㄥ叿浣撲笟鍔′腑鍏蜂綋澶勭悊
+        /// </summary>
+        /// <param name="ex">鐩戝惉娴佺▼涓紓甯稿璞�</param>
+        public virtual void ExceptionRaisedInMonitor(Exception ex)
+        {
         }
         #endregion
 
         #region 鍥惧儚澶勭悊
-        protected HImage CollectHImage(CameraBase camera, IOperationConfig opConfig, out string imgSetId, [CallerMemberName]string methodCode = "")
+        protected IImageSet CollectHImage(CameraBase camera, IOperationConfig opConfig, [CallerMemberName]string methodCode = "")
         {
             IImageSet set = null;
 
@@ -653,8 +680,7 @@
                 TimeRecordCSV(DateTime.Now, camera.Name, methodCode + "閲囧浘", (int)sw.ElapsedMilliseconds);
             }
 
-            imgSetId = set?.Id;
-            return set.HImage;
+            return set;
         }
 
         protected async void CameraUpdateImage(CameraBase camera, Bitmap image, string setId)
@@ -698,6 +724,11 @@
 
             OnAlarmUpdate?.BeginInvoke(alarmMsg, null, null);
         }
+
+        public virtual void RaisedAlarm(string alarmMsg)
+        {
+            OnAlarmUpdate?.Invoke(alarmMsg);
+        }
         #endregion
 
         #region ILogger

--
Gitblit v1.8.0