From ea51f1e83e21571b628efc032ac88aa2193e8af6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=94=84=E5=A4=B4?= <yangw@mesnac.com>
Date: Fri, 2 Aug 2024 08:45:55 +0800
Subject: [PATCH] =?UTF-8?q?=20=20=20=20=20if=20(!operateResult.IsSuccess)?=
 =?UTF-8?q?=20XTrace.WriteLine("=E8=BF=9E=E6=8E=A5=E5=A4=B1=E8=B4=A5");?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SynPlc/Program.cs        |  2 +-
 SynPlc/SqlSugarHelper.cs | 37 +------------------------------------
 SynPlc/Worker.cs         | 18 ++++++++----------
 3 files changed, 10 insertions(+), 47 deletions(-)

diff --git a/SynPlc/Program.cs b/SynPlc/Program.cs
index cb2c33c..09b5f04 100644
--- a/SynPlc/Program.cs
+++ b/SynPlc/Program.cs
@@ -19,7 +19,7 @@ IHost host = Host.CreateDefaultBuilder(args)
         string sqlConect = context.Configuration.GetConnectionString("Sql");
         string Plc = context.Configuration.GetConnectionString("Plc");
 
-        services.AddSingleton<SiemensS7Net>(_ => new SiemensS7Net(SiemensPLCS.S200Smart)
+        services.AddSingleton<SiemensS7Net>(_ => new SiemensS7Net(SiemensPLCS.S300)
         {
             IpAddress = Plc,
             Port = 102
diff --git a/SynPlc/SqlSugarHelper.cs b/SynPlc/SqlSugarHelper.cs
index b7c6fb0..5f28270 100644
--- a/SynPlc/SqlSugarHelper.cs
+++ b/SynPlc/SqlSugarHelper.cs
@@ -1,36 +1 @@
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SynPlc
-{
-    public class SqlSugarHelper //不能是泛型类
-    {
-
-        public static SqlSugarScope Db = new SqlSugarScope(
-            new ConnectionConfig()
-        {
-            ConnectionString = "server=175.27.215.92;uid=sa;pwd=Hawei@123;database=Hsdb;",//连接符字串
-            DbType = DbType.SqlServer,//数据库类型
-            IsAutoCloseConnection = true //不设成true要手动close
-        },
-        db => {
-        //(A)全局生效配置点，一般AOP和程序启动的配置扔这里面 ，所有上下文生效
-        //调试SQL事件，可以删掉
-        db.Aop.OnLogExecuting = (sql, pars) =>
-        {
-            //获取原生SQL推荐 5.1.4.63  性能OK
-            Console.WriteLine(UtilMethods.GetNativeSql(sql, pars));
-            //获取无参数化SQL 对性能有影响，特别大的SQL参数多的，调试使用
-            //Console.WriteLine(UtilMethods.GetSqlString(DbType.SqlServer,sql,pars))
-        };
-        //多个配置就写下面
-        //db.Ado.IsDisableMasterSlaveSeparation=true;
-        //注意多租户 有几个设置几个
-        //db.GetConnection(i).Aop
-    });
-    }
-}
+
\ No newline at end of file
diff --git a/SynPlc/Worker.cs b/SynPlc/Worker.cs
index 40c4763..dbef645 100644
--- a/SynPlc/Worker.cs
+++ b/SynPlc/Worker.cs
@@ -41,11 +41,7 @@ public class Worker : BackgroundService
 
         var S7 = services.GetService<SiemensS7Net>();
         var operateResult = await S7.ConnectServerAsync();
-        if (!operateResult.IsSuccess)
-        {
-            operateResult = await S7.ConnectServerAsync();
-            if (!operateResult.IsSuccess) XTrace.WriteLine("连接失败");
-        }
+        if (!operateResult.IsSuccess) XTrace.WriteLine("连接失败");
 
 
         var list = await dbClient.Queryable<EEquipmentStateEntity>().ToListAsync(stoppingToken);
@@ -73,11 +69,13 @@ public class Worker : BackgroundService
             var a = await S7.ReadDoubleAsync(e.Point);
             if (a.IsSuccess)
             {
-                var listd = new EPointDataEntity();
-                listd.ID = Guid.NewGuid().ToString();
-                listd.PID = e.ID;
-                listd.CreateTime = DateTime.Now;
-                listd.Data = a.Content.ToDecimal();
+                var listd = new EPointDataEntity
+                {
+                    ID = Guid.NewGuid().ToString(),
+                    PID = e.ID,
+                    CreateTime = DateTime.Now,
+                    Data = a.Content.ToDecimal()
+                };
                 ls.Add(listd);
             }
             else