Device命名改为Machine，定位为机台相关部分；Device定义为后续接入的子设备

SKMC.API/Device/Config/DeviceBaseConfig.cs → SKMC.API/Common/Config/ConfigBase.cs

@@ -2,7 +2,7 @@
 
 namespace SKMC.Api.Device.Config
 {
-    public class DeviceBaseConfig : BindableBase
+    public class ConfigBase : BindableBase
     {
         private string _code;
 

SKMC.API/Device/Config/DeviceConfigStore.cs

@@ -1,18 +0,0 @@
-using System;
-using SKMC.Api.Common.Exceptions;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SKMC.Api.Device.Config
-{
-    public abstract class DeviceConfigStore
-    {
-
-        /// <summary>
-        /// 异常配置集
-        /// </summary>
-        public List<ExceptionConfig> Exceptions { get; set; }
-    }
-}

SKMC.API/Device/Config/DeviceConstants.cs

@@ -1,16 +0,0 @@
-
-namespace SKMC.Api.Device.Config
-{
-    /// <summary>
-    /// 设备常量
-    /// </summary>
-    public class DeviceConstants
-    {
-        // 设备整机部分的Id
-        public static readonly int DeviceId_Machine = 1000;
-
-        // 三色灯部分的Id
-        public static readonly int DeviceId_Lamp = 1010;
-
-    }
-}

SKMC.API/Device/Config/DeviceConfiger.cs → SKMC.API/Machine/Config/MachineConfig.cs

@@ -1,13 +1,20 @@
 
-namespace SKMC.Api.Device.Config
-{
+using SKMC.Api.Device.Config;
 
-    public class DeviceCatalogConfig : DeviceBaseConfig
+namespace SKMC.Api.Machine.Config
+{
+    /// <summary>
+    /// 机台目录配置
+    /// </summary>
+    public class MachineCatalogConfig : ConfigBase
     {
         public bool IsChecked { get; set; }
     }
 
-    public class DeviceParamConfig : DeviceBaseConfig
+    /// <summary>
+    /// 机台参数配置
+    /// </summary>
+    public class MachineParamConfig : ConfigBase
     {
         private string _group;
 

SKMC.API/Device/Config/MachineConfigStore.cs → SKMC.API/Machine/Config/MachineConfigStore.cs

@@ -1,10 +1,11 @@
-using System;
+using SKMC.Api.Common.Exceptions;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace SKMC.Api.Device.Config
+namespace SKMC.Api.Machine.Config
 {
     public abstract class MachineConfigStore
     {

SKMC.API/Machine/Config/MachineConstants.cs

@@ -0,0 +1,16 @@
+
+namespace SKMC.Api.Machine.Config
+{
+    /// <summary>
+    /// 设备常量
+    /// </summary>
+    public class MachineConstants
+    {
+        // 设备整机部分的Id
+        public static readonly int Machine_Main = 1000;
+
+        // 三色灯部分的Id
+        public static readonly int Machine_Tower = 1010;
+
+    }
+}

SKMC.API/Device/Config/ParamEnum.cs → SKMC.API/Machine/Config/MachineParamEnum.cs

@@ -1,10 +1,10 @@
 
-namespace SKMC.Api.Device.Config
+namespace SKMC.Api.Machine.Config
 {
     /// <summary>
     /// 设备参数
     /// </summary>
-    public enum ParamEnum
+    public enum MachineParamEnum
     {
         /// <summary>
         /// 设备组

SKMC.API/Device/Machine/MachineStatusEnum.cs → SKMC.API/Machine/Config/MachineStatusEnum.cs

@@ -1,5 +1,5 @@
 
-namespace SKMC.Api.Device.Machine
+namespace SKMC.Api.Machine.Config
 {
     /// <summary>
     /// 机台运行状态枚举

SKMC.API/Device/Machine/IMachineBoardControl.cs → SKMC.API/Machine/Control/IMachineBoardControl.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace SKMC.Api.Device.Machine
+namespace SKMC.Api.Machine.Control
 {
     /// <summary>
     /// 机台面板控制逻辑接口

SKMC.API/Device/Machine/IMachineButtonControl.cs → SKMC.API/Machine/Control/IMachineButtonControl.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace SKMC.Api.Device.Machine
+namespace SKMC.Api.Machine.Control
 {
     /// <summary>
     /// 机台设备按钮控制接口

SKMC.API/Device/Machine/IMachineTowerLightControl.cs → SKMC.API/Machine/Control/IMachineTowerLightControl.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace SKMC.Api.Device.Machine
+namespace SKMC.Api.Machine.Control
 {
     /// <summary>
     /// 机台三色灯（含蜂鸣器）的控制接口

SKMC.API/Device/Machine/MachineStatus.cs → SKMC.API/Machine/Control/MachineStatusControl.cs

@@ -1,21 +1,21 @@
 using Prism.Mvvm;
 using System;
 
-namespace SKMC.Api.Device.Machine
+namespace SKMC.Api.Machine.Control
 {
     /// <summary>
     /// 机台运行状态
     /// </summary>
-    public class MachineStatus : BindableBase
+    public class MachineStatusControl : BindableBase
     {
 
-        private static MachineStatus instance;
+        private static MachineStatusControl instance;
 
-        private MachineStatus() { }
+        private MachineStatusControl() { }
 
-        public static MachineStatus Instance()
+        public static MachineStatusControl Instance()
         {
-            if (instance == null) instance = new MachineStatus();
+            if (instance == null) instance = new MachineStatusControl();
             return instance;
         }
 

SKMC.API/Device/DeviceCacher.cs → SKMC.API/Machine/MachineCacher.cs

@@ -1,19 +1,19 @@
 using SKMC.Api.Common.Exceptions;
-using SKMC.Api.Device.Config;
+using SKMC.Api.Machine.Config;
 using System.Collections.ObjectModel;
 
-namespace SKMC.Api.Device
+namespace SKMC.Api.Machine
 {
     /// <summary>
     /// 设备配置参数缓存器
     /// </summary>
-    public abstract class DeviceCacher
+    public abstract class MachineCacher
     {
         // Module数据
-        public ObservableCollection<DeviceCatalogConfig> DeviceCatalogs { get; set; }
+        public ObservableCollection<MachineCatalogConfig> DeviceCatalogs { get; set; }
 
         // Param数据
-        public ObservableCollection<DeviceParamConfig> DeviceParams { get; set; }
+        public ObservableCollection<MachineParamConfig> DeviceParams { get; set; }
 
         /// <summary>
         /// 获取设备参数
@@ -21,7 +21,7 @@ namespace SKMC.Api.Device
         /// <param name="group"></param>
         /// <param name="code"></param>
         /// <returns></returns>
-        public abstract string GetDeviceParamValue(string group, string code);
+        public abstract string GetMachineParamValue(string group, string code);
 
         /// <summary>
         /// 获取设备参数
@@ -29,7 +29,7 @@ namespace SKMC.Api.Device
         /// <param name="groupEnum"></param>
         /// <param name="codeEnum"></param>
         /// <returns></returns>
-        public abstract string GetDeviceParamValue(ParamEnum groupEnum, ParamEnum codeEnum);
+        public abstract string GetMachineParamValue(MachineParamEnum groupEnum, MachineParamEnum codeEnum);
 
         /// <summary>
         /// 获取设备参数
@@ -38,7 +38,7 @@ namespace SKMC.Api.Device
         /// <param name="groupCode"></param>
         /// <param name="paramCode"></param>
         /// <returns></returns>
-        public abstract T GetDeviceParamValue<T>(string groupCode, string paramCode);
+        public abstract T GetMachineParamValue<T>(string groupCode, string paramCode);
 
         /// <summary>
         /// 获取设备参数
@@ -47,7 +47,7 @@ namespace SKMC.Api.Device
         /// <param name="groupEnum"></param>
         /// <param name="codeEnum"></param>
         /// <returns></returns>
-        public abstract T GetDeviceParamValue<T>(ParamEnum groupEnum, ParamEnum codeEnum);
+        public abstract T GetMachineParamValue<T>(MachineParamEnum groupEnum, MachineParamEnum codeEnum);
 
         /// <summary>
         /// 获取异常配置对象

SKMC.API/Process/Control/ProcessExceptions.cs

@@ -1,10 +1,9 @@
 using SKMC.Api.Client;
 using SKMC.Api.Client.Model;
-using SKMC.Api.Device;
-using SKMC.Api.Device.Machine;
+using SKMC.Api.Machine;
+using SKMC.Api.Machine.Control;
 using SKMC.Api.Common;
 using SKMC.Api.Common.Exceptions;
-using SKMC.Api.Recipe;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -23,7 +22,7 @@ namespace SKMC.Api.Process.Control
         private readonly static ILogger log = LogFactory.Get();
         private readonly static IMachineBoardControl deviceBoardControl = ObjectFactory.Resolve<IMachineBoardControl>();
         private readonly static ClientCacher clientCacher = ObjectFactory.Resolve<ClientCacher>();
-        private readonly static DeviceCacher deviceCacher = ObjectFactory.Resolve<DeviceCacher>();
+        private readonly static MachineCacher machineCacher = ObjectFactory.Resolve<MachineCacher>();
         public const string DefaultViewName = "ProcessExceptionsView";
         public const string NoticeViewName = "ProcessNotificationView";
 
@@ -114,9 +113,9 @@ namespace SKMC.Api.Process.Control
         private static ExceptionConfig GetExceptionConfiger(ExceptionBase exceptionBase)
         {
             // 先根据内部异常Type关联
-            ExceptionConfig exceptionConfiger = deviceCacher.GetException(exceptionBase.Type);
+            ExceptionConfig exceptionConfiger = machineCacher.GetException(exceptionBase.Type);
             // 再根据项目异常Code关联
-            if (exceptionConfiger == null) exceptionConfiger = deviceCacher.GetException(exceptionBase.Code);
+            if (exceptionConfiger == null) exceptionConfiger = machineCacher.GetException(exceptionBase.Code);
             return exceptionConfiger;
         }
 

SKMC.API/SKMC.API.csproj

@@ -127,14 +127,13 @@
     <Compile Include="Common\Tcp\TCPClient.cs" />
     <Compile Include="Common\Tcp\TcpClientBase.cs" />
     <Compile Include="Common\Monitor\StateLatchManager.cs" />
-    <Compile Include="Device\Adapter\SKVision\SKVisionClient.cs" />
-    <Compile Include="Device\Adapter\SKVision\SKVisionProtocol.cs" />
-    <Compile Include="Device\Adapter\SKVision\SKVisionClientBase.cs" />
-    <Compile Include="Device\Config\DeviceConfigStore.cs" />
-    <Compile Include="Device\Config\MachineConfigStore.cs" />
-    <Compile Include="Device\Machine\IMachineBoardControl.cs" />
-    <Compile Include="Device\Machine\IMachineButtonControl.cs" />
-    <Compile Include="Device\Machine\IMachineTowerLightControl.cs" />
+    <Compile Include="Machine\Adapter\SKVision\SKVisionClient.cs" />
+    <Compile Include="Machine\Adapter\SKVision\SKVisionProtocol.cs" />
+    <Compile Include="Machine\Adapter\SKVision\SKVisionClientBase.cs" />
+    <Compile Include="Machine\Config\MachineConfigStore.cs" />
+    <Compile Include="Machine\Control\IMachineBoardControl.cs" />
+    <Compile Include="Machine\Control\IMachineButtonControl.cs" />
+    <Compile Include="Machine\Control\IMachineTowerLightControl.cs" />
     <Compile Include="Motion\Config\MotionConfigStore.cs" />
     <Compile Include="Motion\Driver\IMotionDriverAdvance.cs" />
     <Compile Include="Motion\Model\MotionAO.cs" />
@@ -155,9 +154,9 @@
     <Compile Include="Common\Types\ObservableConcurrentList.cs" />
     <Compile Include="Common\Expression\Predicator.cs" />
     <Compile Include="Common\Tasks\TaskTokener.cs" />
-    <Compile Include="Device\Config\DeviceConfiger.cs" />
-    <Compile Include="Device\DeviceCacher.cs" />
-    <Compile Include="Device\Machine\MachineStatusEnum.cs" />
+    <Compile Include="Machine\Config\MachineConfig.cs" />
+    <Compile Include="Machine\MachineCacher.cs" />
+    <Compile Include="Machine\Config\MachineStatusEnum.cs" />
     <Compile Include="Motion\Control\IMotionChecker.cs" />
     <Compile Include="Process\Model\ProcessAction.cs" />
     <Compile Include="Process\Config\ProcessException.cs" />
@@ -175,14 +174,14 @@
     <Compile Include="Motion\Model\MotionAxis.cs" />
     <Compile Include="Motion\Model\MotionAxisRecord.cs" />
     <Compile Include="Motion\Model\MotionAxisStatus.cs" />
-    <Compile Include="Device\Config\DeviceBaseConfig.cs" />
-    <Compile Include="Device\Config\DeviceConstants.cs" />
+    <Compile Include="Common\Config\ConfigBase.cs" />
+    <Compile Include="Machine\Config\MachineConstants.cs" />
     <Compile Include="Motion\Model\MotionIODev.cs" />
     <Compile Include="Motion\Model\MotionIOGroup.cs" />
     <Compile Include="Motion\Model\MotionIO.cs" />
-    <Compile Include="Device\Config\ParamEnum.cs" />
+    <Compile Include="Machine\Config\MachineParamEnum.cs" />
     <Compile Include="Motion\Model\MotionSdo.cs" />
-    <Compile Include="Device\Machine\MachineStatus.cs" />
+    <Compile Include="Machine\Control\MachineStatusControl.cs" />
     <Compile Include="Motion\Driver\IMotionDriverParser.cs" />
     <Compile Include="Motion\Model\MotionAxisParam.cs" />
     <Compile Include="Motion\Driver\IMotionDriver.cs" />