diff --git a/SynPlc/Program.cs b/SynPlc/Program.cs index 09b5f04..9393b5b 100644 --- a/SynPlc/Program.cs +++ b/SynPlc/Program.cs @@ -1,5 +1,4 @@ using HslCommunication.Profinet.Siemens; -using NewLife.Extensions.Hosting.AgentService; using NewLife.Log; using SqlSugar; using SynPlc; @@ -13,13 +12,14 @@ if (!HslCommunication.Authorization.SetAuthorizationCode("12a99167-05ff-4c89-936 XTrace.UseConsole(); + IHost host = Host.CreateDefaultBuilder(args) .ConfigureServices((context,services) => { string sqlConect = context.Configuration.GetConnectionString("Sql"); string Plc = context.Configuration.GetConnectionString("Plc"); - services.AddSingleton(_ => new SiemensS7Net(SiemensPLCS.S300) + services.AddSingleton(new SiemensS7Net(SiemensPLCS.S300) { IpAddress = Plc, Port = 102 @@ -31,7 +31,7 @@ IHost host = Host.CreateDefaultBuilder(args) //Scoped用SqlSugarClient SqlSugarClient sqlSugar = new SqlSugarClient (new ConnectionConfig() { - DbType = SqlSugar.DbType.SqlServer, + DbType = DbType.SqlServer, ConnectionString = sqlConect, IsAutoCloseConnection = true, }, @@ -57,12 +57,6 @@ IHost host = Host.CreateDefaultBuilder(args) services.AddHostedService(); }) - .UseAgentService(options => - { - options.ServiceName = "TestWorker"; - options.DisplayName = "Worker服务测试"; - options.Description = "Worker服务的测试应用"; - }) .Build(); await host.RunAsync(); \ No newline at end of file diff --git a/SynPlc/SynPlc.csproj b/SynPlc/SynPlc.csproj index 0f7295d..18ad612 100644 --- a/SynPlc/SynPlc.csproj +++ b/SynPlc/SynPlc.csproj @@ -10,7 +10,7 @@ - + diff --git a/SynPlc/Worker.cs b/SynPlc/Worker.cs index 720dac8..b92dd13 100644 --- a/SynPlc/Worker.cs +++ b/SynPlc/Worker.cs @@ -30,7 +30,7 @@ public class Worker : BackgroundService } XTrace.WriteLine("Worker running at: {0}", DateTimeOffset.Now); - + await Task.Delay(5000, stoppingToken); } @@ -71,11 +71,13 @@ public class Worker : BackgroundService var a = await S7.ReadFloatAsync(e.Point); if (a.IsSuccess) { - var listd = new EPointDataEntity(); - listd.ID = Guid.NewGuid().ToString(); - listd.PID = e.ID; - listd.CreateTime = DateTime.Now; - listd.Data = Math.Round(Convert.ToDecimal(a.Content), 2); + var listd = new EPointDataEntity + { + ID = Guid.NewGuid().ToString(), + PID = e.ID, + CreateTime = DateTime.Now, + Data = Math.Round(Convert.ToDecimal(a.Content), 2) + }; ls.Add(listd); } else