西门子PLC操作细节优化

src/YSAI.Siemens/SiemensData.cs

@@ -38,17 +38,17 @@ namespace YSAI.Siemens
             /// <summary>
             /// CPU类型
             /// </summary>
-            [Description("Cpu类型")]
+            [Description("CPU类型")]
             [JsonConverter(typeof(StringEnumConverter))]
             [Display(true, true, true, Core.data.ParamStructure.dataCate.select)]
-            public CpuType S7CpuType { get; set; }
+            public CpuType CType { get; set; }
 
             /// <summary>
             /// PLC的机架，
             /// 通常为0，
             /// 但检查Step7或TIA门户的硬件配置
             /// </summary>
-            [Description("Plc机架")]
+            [Description("机架")]
             [Display(true, true, true, Core.data.ParamStructure.dataCate.unmber)]
             public int Rack { get; set; } = 0;
 
@@ -57,7 +57,7 @@ namespace YSAI.Siemens
             /// S7-300/S7-400为2，
             /// S7-1200/S7-1500为0
             /// </summary>
-            [Description("Cpu插槽")]
+            [Description("插槽")]
             [Display(true, true, true, Core.data.ParamStructure.dataCate.unmber)]
             public int Slot { get; set; } = 0;
         }

src/YSAI.Siemens/SiemensOperate.cs

@@ -119,7 +119,7 @@ namespace YSAI.Siemens
                 {
                     tokenSource = new CancellationTokenSource();
                 }
-                PlcS7 = new Plc(basics.S7CpuType, basics.Ip, basics.Port, (short)basics.Rack, (short)basics.Slot);
+                PlcS7 = new Plc(basics.CType, basics.Ip, basics.Port, (short)basics.Rack, (short)basics.Slot);
                 PlcS7.Open();
                 if (!PlcS7.IsConnected)
                 {

src/YSAI.Test.Console/Program.cs

@@ -367,16 +367,16 @@ using S7.Net;
 using System.Collections.Concurrent;
 using YSAI.Core.data;
 using YSAI.Core.@enum;
-using YSAI.S7;
+using YSAI.Siemens;
 using YSAI.Unility;
 
-S7Operate s7ClientOperate = S7Operate.Instance(new S7Data.Basics()
+SiemensOperate s7ClientOperate = SiemensOperate.Instance(new SiemensData.Basics()
 {
     Ip = "192.168.2.20",
     Port = 102,
     Rack = 0,
     Slot = 1,
-    S7CpuType = CpuType.S71200,
+    CType = CpuType.S71200,
     ChangeOut = true,
     HandleInterval = 1000,
     SN = Guid.NewGuid().ToString()

src/YSAI.Test.Console/YSAI.Test.Console.csproj

@@ -25,6 +25,7 @@
 		<ProjectReference Include="..\YSAI.RabbitMQ\YSAI.RabbitMQ.csproj" />
 		<ProjectReference Include="..\YSAI.DaqManage\YSAI.DaqManage.csproj" />
 		<ProjectReference Include="..\YSAI.RelayManage\YSAI.RelayManage.csproj" />
+		<ProjectReference Include="..\YSAI.Siemens\YSAI.Siemens.csproj" />
 	</ItemGroup>
 
 </Project>

src/YSAI.Test.Service/Program.cs

@@ -1,5 +1,5 @@
 using S7.Net;
-using YSAI.S7;
+using YSAI.Siemens;
 using YSAI.Unility;
 
 namespace YSAI.Test.Service
@@ -8,26 +8,26 @@ namespace YSAI.Test.Service
     {
         static void Main(string[] args)
         {
-            S7Operate s7Operate = S7Operate.Instance(new S7Data.Basics()
+            SiemensOperate s7Operate = SiemensOperate.Instance(new SiemensData.Basics()
             {
                 Ip = "192.168.2.20",
                 Port = 102,
                 Rack = 0,
                 Slot = 1,
-                S7CpuType = CpuType.S71200,
+                CType = CpuType.S71200,
                 ChangeOut = true,
                 HandleInterval = 1000,
                 SN = Guid.NewGuid().ToString()
             });
             Console.WriteLine(s7Operate.On().ToJson().JsonFormatting());
 
-            s7Operate = S7Operate.Instance(new S7Data.Basics
+            s7Operate = SiemensOperate.Instance(new SiemensData.Basics
             {
                 Ip = "192.168.2.20",
                 Port = 102,
                 Rack = 0,
                 Slot = 1,
-                S7CpuType = CpuType.S71200,
+                CType = CpuType.S71200,
                 ChangeOut = true,
                 HandleInterval = 1000,
                 SN = Guid.NewGuid().ToString()

src/YSAI.Test.Service/YSAI.Test.Service.csproj

@@ -12,4 +12,8 @@
 	<PackageReference Include="Talk.BACnet" Version="1.0.2" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\YSAI.Siemens\YSAI.Siemens.csproj" />
+  </ItemGroup>
+
 </Project>