Merge branch '71博创自动立库' of http://www.imaodou.com.cn:30030/c_jack/EICP3.0_69 into 71博创自动立库

Lib/SCADA.CommonLib.xml

@@ -610,6 +610,21 @@
             
             </summary>
         </member>
+        <member name="P:SCADA.CommonLib.AutoSaveParameterItem.IsEnableBinding">
+            <summary>
+            绑定使能
+            </summary>
+        </member>
+        <member name="P:SCADA.CommonLib.AutoSaveParameterItem.VisibilityBinding">
+            <summary>
+            可视性绑定
+            </summary>
+        </member>
+        <member name="P:SCADA.CommonLib.AutoSaveParameterItem.Command">
+            <summary>
+            
+            </summary>
+        </member>
         <member name="M:SCADA.CommonLib.AutoSaveParameterItem.OnParameterChanged">
             <summary>
             
@@ -6394,96 +6409,6 @@
             </summary>
             <param name="eventData"></param>
         </member>
-        <member name="T:SCADA.CommonLib.EventBus.EventBus">
-            <summary>
-            事件总线
-            </summary>
-        </member>
-        <member name="P:SCADA.CommonLib.EventBus.EventBus.IocContainer">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="P:SCADA.CommonLib.EventBus.EventBus.Default">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="M:SCADA.CommonLib.EventBus.EventBus.#ctor">
-            <summary>
-            
-            </summary>
-        </member>
-        <member name="M:SCADA.CommonLib.EventBus.EventBus.Register``1(SCADA.CommonLib.EventBus.IEventHandler)">
-            <summary>
-            手动绑定事件源与事件处理
-            </summary>
-            <typeparam name="TEventData"></typeparam>
-            <param name="eventHandler"></param>
-        </member>
-        <member name="M:SCADA.CommonLib.EventBus.EventBus.Register``1(System.Action{``0})">
-            <summary>
-            注册Action事件处理器
-            </summary>
-            <typeparam name="TEventData"></typeparam>
-            <param name="action"></param>
-        </member>
-        <member name="M:SCADA.CommonLib.EventBus.EventBus.Register(System.Type,System.Type)">
-            <summary>
-            手动绑定事件源与事件处理
-            </summary>
-            <param name="eventType"></param>
-            <param name="handlerType"></param>
-        </member>
-        <member name="M:SCADA.CommonLib.EventBus.EventBus.RegisterAllEventHandlerFromAssembly(System.Reflection.Assembly)">
-            <summary>
-            提供入口支持注册其它程序集中实现的IEventHandler
-            </summary>
-            <param name="assembly"></param>
-        </member>
-        <member name="M:SCADA.CommonLib.EventBus.EventBus.UnRegister``1(System.Type)">
-            <summary>
-            手动解除事件源与事件处理的绑定
-            </summary>
-            <typeparam name="TEventData"></typeparam>
-            <param name="handlerType"></param>
-        </member>
-        <member name="M:SCADA.CommonLib.EventBus.EventBus.UnRegisterAll``1">
-            <summary>
-            卸载指定事件源上绑定的所有事件
-            </summary>
-            <typeparam name="TEventData"></typeparam>
-        </member>
-        <member name="M:SCADA.CommonLib.EventBus.EventBus.Trigger``1(``0)">
-            <summary>
-            根据事件源触发绑定的事件处理
-            </summary>
-            <typeparam name="TEventData"></typeparam>
-            <param name="eventData"></param>
-        </member>
-        <member name="M:SCADA.CommonLib.EventBus.EventBus.Trigger``1(System.Type,``0)">
-            <summary>
-            触发指定EventHandler
-            </summary>
-            <param name="eventHandlerType"></param>
-            <param name="eventData"></param>
-        </member>
-        <member name="M:SCADA.CommonLib.EventBus.EventBus.TriggerAsync``1(``0)">
-            <summary>
-            异步触发
-            </summary>
-            <typeparam name="TEventData"></typeparam>
-            <param name="eventData"></param>
-            <returns></returns>
-        </member>
-        <member name="M:SCADA.CommonLib.EventBus.EventBus.TriggerAsycn``1(System.Type,``0)">
-            <summary>
-            异步触发指定EventHandler
-            </summary>
-            <param name="eventHandlerType"></param>
-            <param name="eventData"></param>
-            <returns></returns>
-        </member>
         <member name="T:SCADA.CommonLib.EventBus.IEventBus">
             <summary>
             
@@ -12215,8 +12140,7 @@
             </summary>
         </member>
         <member name="M:SCADA.CommonLib.Scheduler.BaseJob.OnExcuteCompleted(SCADA.CommonLib.Scheduler.JobExcuteFinishEventArgs)">
-            <summary>
-            
+            <summary> 执行结束
             </summary>
             <param name="excuteCompleted"></param>
         </member>
@@ -12236,28 +12160,23 @@
             </summary>
         </member>
         <member name="P:SCADA.CommonLib.Scheduler.BaseJob.LastExcuteTime">
-            <summary>
-            最后一次执行时间
+            <summary> 最后一次执行时间
             </summary>
         </member>
         <member name="P:SCADA.CommonLib.Scheduler.BaseJob.ExcutePolicy">
-            <summary>
-            执行策略
+            <summary> 执行策略
             </summary>
         </member>
         <member name="P:SCADA.CommonLib.Scheduler.BaseJob.NextExcuteTime">
-            <summary>
-            下次执行时间
+            <summary> 下次执行时间
             </summary>
         </member>
         <member name="P:SCADA.CommonLib.Scheduler.BaseJob.ExcuteStatus">
-            <summary>
-            执行状态   运行中，等待运行
+            <summary> 执行状态   运行中，等待运行
             </summary>
         </member>
         <member name="P:SCADA.CommonLib.Scheduler.BaseJob.JobName">
-            <summary>
-            任务名称
+            <summary> 任务名称
             </summary>
         </member>
         <member name="P:SCADA.CommonLib.Scheduler.BaseJob.ExcuteHandler">
@@ -12347,7 +12266,15 @@
             
             </summary>
         </member>
+        <member name="P:SCADA.CommonLib.Scheduler.JobServer.Instance">
+            <summary>
+            </summary>
+        </member>
         <member name="E:SCADA.CommonLib.Scheduler.JobServer.JobExcuteFinish">
+            <summary> 
+            </summary>
+        </member>
+        <member name="P:SCADA.CommonLib.Scheduler.JobServer.AppRunTime">
             <summary>
             
             </summary>

Lib/SCADA.xml

@@ -1447,6 +1447,11 @@
             <summary> 读取失败超过 N 此引发连接断开
             </summary>
         </member>
+        <member name="F:SCADA.BaseDevice.ReadCount">
+            <summary>
+            读取次数
+            </summary>
+        </member>
         <member name="P:SCADA.BaseDevice.ReadNGCnt">
             <summary> 当前读取失败次数
             </summary>
@@ -2621,7 +2626,7 @@
         </member>
         <member name="P:SCADA.Comm.BaseComm.LastDataReceivedTime">
             <summary>
-            
+            最后一次接收到数据的时间
             </summary>
         </member>
         <member name="M:SCADA.Comm.BaseComm.OnBeginConnect">
@@ -3792,6 +3797,47 @@
             
             </summary>
         </member>
+        <member name="T:SCADA.Comm.SocketEx">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="M:SCADA.Comm.SocketEx.SafeClose(System.Net.Sockets.Socket)">
+            <summary>
+            
+            </summary>
+            <param name="socket"></param>
+        </member>
+        <member name="M:SCADA.Comm.SocketEx.IsConnected(System.Net.Sockets.Socket)">
+            <summary>
+            
+            </summary>
+            <param name="socket"></param>
+            <returns></returns>
+        </member>
+        <member name="M:SCADA.Comm.SocketEx.KeepAlive(System.Net.Sockets.Socket,System.Int32,System.Int32,System.Int32)">
+            <summary>
+            
+            </summary>
+            <param name="socket"></param>
+            <param name="onOff"></param>
+            <param name="keepAliveTime"></param>
+            <param name="keepAliveInterval"></param>
+        </member>
+        <member name="M:SCADA.Comm.SocketEx.PortIsUsed(System.Int32)">
+            <summary>
+            检查TCP端口是否被占用
+            </summary>
+            <param name="port"></param>
+            <returns></returns>
+        </member>
+        <member name="M:SCADA.Comm.SocketEx.UdpPortIsUsed(System.Int32)">
+            <summary>
+            检查TCP端口是否被占用
+            </summary>
+            <param name="port"></param>
+            <returns></returns>
+        </member>
         <member name="T:SCADA.Comm.TcpComm">
             <summary>
             TCP测试通道
@@ -8892,7 +8938,6 @@
         </member>
         <member name="P:SCADA.Drive.RegAnnotation.StringEncoding">
             <summary>
-            
             </summary>
         </member>
         <member name="P:SCADA.Drive.RegAnnotation.OutputLog">
@@ -8917,13 +8962,11 @@
             </summary>
         </member>
         <member name="P:SCADA.Drive.RegAnnotation._encoding">
-            <summary>
-            
+            <summary> 
             </summary>
         </member>
         <member name="M:SCADA.Drive.RegAnnotation.GetEncoding">
             <summary>
-            
             </summary>
             <returns></returns>
         </member>
@@ -8932,6 +8975,11 @@
             数据字典
             </summary>
         </member>
+        <member name="P:SCADA.Drive.RegAnnotation.RegKind">
+            <summary>
+            
+            </summary>
+        </member>
         <member name="P:SCADA.Drive.RegAnnotation.DataDictionary">
             <summary>
             
@@ -9378,6 +9426,16 @@
             内存
             </summary>
         </member>
+        <member name="F:SCADA.Drive.RegKind.Const">
+            <summary>
+            常量
+            </summary>
+        </member>
+        <member name="F:SCADA.Drive.RegKind.Ref">
+            <summary>
+            引用
+            </summary>
+        </member>
         <member name="T:SCADA.Drive.RegReadValueChangedEventArgs">
             <summary>
             寄存器的读数发生变化
@@ -23354,6 +23412,46 @@
             
             </summary>
         </member>
+        <member name="T:SCADA.Drive.Siemens.CNC840Dsl">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="M:SCADA.Drive.Siemens.CNC840Dsl.#ctor(SCADA.Comm.IComm,System.String)">
+            <summary>
+            
+            </summary>
+            <param name="commWay"></param>
+            <param name="address"></param>
+        </member>
+        <member name="M:SCADA.Drive.Siemens.CNC840Dsl.#ctor(SCADA.Comm.IComm,System.Int32)">
+            <summary>
+            S7-200Smart 通信
+            </summary>
+            <param name="commWay"></param>
+            <param name="address"></param>
+        </member>
+        <member name="M:SCADA.Drive.Siemens.CNC840Dsl.Handshake">
+            <summary>
+            
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:SCADA.Drive.Siemens.CNC840Dsl.ReadNReg(System.String,System.Int32)">
+            <summary>
+            
+            </summary>
+            <param name="regName"></param>
+            <param name="length"></param>
+            <returns></returns>
+        </member>
+        <member name="M:SCADA.Drive.Siemens.CNC840Dsl.ReadNReg(System.String)">
+            <summary>
+            
+            </summary>
+            <param name="regNameRange"></param>
+            <returns></returns>
+        </member>
         <member name="T:SCADA.Drive.Siemens.PPI.S7Cmd">
             <summary>
             
@@ -23451,6 +23549,70 @@
             DB号
             </summary>
         </member>
+        <member name="F:SCADA.Drive.Siemens.S7Comm.NckArea.N">
+            <summary> NCK
+            </summary>
+        </member>
+        <member name="F:SCADA.Drive.Siemens.S7Comm.NckArea.B">
+            <summary> Mode group
+            </summary>
+        </member>
+        <member name="F:SCADA.Drive.Siemens.S7Comm.NckArea.C">
+            <summary>channel
+            </summary>
+        </member>
+        <member name="F:SCADA.Drive.Siemens.S7Comm.NckArea.T">
+            <summary>Tool 
+            </summary>
+        </member>
+        <member name="F:SCADA.Drive.Siemens.S7Comm.NckArea.V">
+            <summary> Feed Drive
+            </summary>
+        </member>
+        <member name="F:SCADA.Drive.Siemens.S7Comm.NCKModule.TO">
+            <summary> Tool Data
+            </summary>
+        </member>
+        <member name="F:SCADA.Drive.Siemens.S7Comm.NCKModule.RP">
+            <summary> Arithmetic parameters 
+            </summary>
+        </member>
+        <member name="F:SCADA.Drive.Siemens.S7Comm.NCKModule.M">
+            <summary>Machine state 
+            </summary>
+        </member>
+        <member name="F:SCADA.Drive.Siemens.S7Comm.NCKModule.DIAGN">
+            <summary>NCK Module: DIAGN - Diagnostic data (0x3b)
+             </summary>
+        </member>
+        <member name="F:SCADA.Drive.Siemens.S7Comm.NCKModule.SEGA">
+            <summary>  State data:Geometry axes in tool offset memory(extend)
+            </summary>
+        </member>
+        <member name="F:SCADA.Drive.Siemens.S7Comm.NCKModule.SSP">
+            <summary>
+            NCK Module: SSP - State data: Spindle (0x72)
+            </summary>
+        </member>
+        <member name="F:SCADA.Drive.Siemens.S7Comm.NCKModule.SPARPP">
+            <summary>
+            NCK Module: SPARPP - Program pointer in automatic operation (0x7a)
+            </summary>
+        </member>
+        <member name="F:SCADA.Drive.Siemens.S7Comm.NCKModule.SMA">
+            <summary>
+            NCK Module: S - State data:Machine axes (0x74)
+            </summary>
+        </member>
+        <member name="F:SCADA.Drive.Siemens.S7Comm.NCKModule.StateData">
+            <summary>
+            NCK Module: S - State data (0x7f)
+            </summary>
+        </member>
+        <member name="F:SCADA.Drive.Siemens.S7Comm.NCKModule.Unknow">
+            <summary>Unknow
+            </summary>
+        </member>
         <member name="P:SCADA.Drive.Siemens.S7Comm.S7CommDataItem.TransportSize">
             <summary>
             //数据类型 0x03 bit  0x04 byte

SCADA_DAQ/Customer/Jobs/CustomerJob.cs

@@ -42,12 +42,12 @@ namespace SCADA_DAQ.Customer.Jobs
         /// <summary>
         /// 任务执行
         /// </summary>
-        protected override Func<IJobExecutionContext,ILog, JobExcuteFinishEventArgs> ExcuteHandler => (context,log) =>
+        protected override Func<IJobExecutionContext, ILog, JobExcuteFinishEventArgs> ExcuteHandler => (context, log) =>
         {
-            var para = (CustomerJobConfig)JobServer.JobParameters[context.JobDetail.Key.ToString()];
-            var excuteMsg =new JobExcuteFinishEventArgs();
+            var para = (CustomerJobConfig)JobServer.Instance.JobParameters[context.JobDetail.Key.ToString()];
+            var excuteMsg = new JobExcuteFinishEventArgs();
             //TODO:这里执行需要的逻辑
-            excuteMsg.IsSuccess= true;
+            excuteMsg.IsSuccess = true;
             return excuteMsg;
         };
     }