Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071

wells

2020-07-11 0dfbcfad8bbbeae5218293d59aba851fd8e65a90

 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)
            //{
@@ -520,11 +520,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 +581,8 @@
                        }

                        LogAsync(DateTime.Now, methodCode + "异常信息", ex.GetExceptionMessage());

                        ExceptionRaisedInMonitor(ex);
                    }
                }

@@ -598,13 +603,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 +675,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 +719,11 @@

            OnAlarmUpdate?.BeginInvoke(alarmMsg, null, null);
        }

        public virtual void RaisedAlarm(string alarmMsg)
        {
            OnAlarmUpdate?.Invoke(alarmMsg);
        }
        #endregion

        #region ILogger