From a59bac4cccfee9024f08c7e16c8e732d0bc1daa9 Mon Sep 17 00:00:00 2001
From: WenJY <WenJY@mesnac.com>
Date: Wed, 3 Dec 2025 13:55:29 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E8=AE=BE=E5=A4=87=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DeviceCollectionBusiness.cs               | 31 ++++++++++++-------
 .../dao/BaseDeviceParamVal.cs                 |  8 ++---
 Sln.Imm.Daemon.Opc/OpcDeviceFactorySetup.cs   | 20 ++++++++----
 3 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/Sln.Imm.Daemon.Business/DeviceCollectionBusiness.cs b/Sln.Imm.Daemon.Business/DeviceCollectionBusiness.cs
index bf80dd0..aa6de33 100644
--- a/Sln.Imm.Daemon.Business/DeviceCollectionBusiness.cs
+++ b/Sln.Imm.Daemon.Business/DeviceCollectionBusiness.cs
@@ -68,22 +68,22 @@ public class DeviceCollectionBusiness
             {
                 try
                 {
-                    _serilog.Info($"开始采集{item.deviceName}");
+                    _serilog.Info($"开始采集{item.deviceName}；参数：{JsonConvert.SerializeObject(item.deviceParams)}");
                     var opcItemValues = await this.ReadParam(item, opcua);
 
                     this.SaveParam(item, opcItemValues, out List<BaseDeviceParamVal> paramValues);
 
                     _serilog.Info($"{item.deviceName}数据采集完成：{JsonConvert.SerializeObject(opcItemValues)}");
 
-                    if(i == 10)
-                    {
-
-                        isFlag = false;
-
-                        opcua.DisconnectAsync().Wait();
-
-                        _serilog.Info($"读取完成断开连接");
-                    }
+                    // if(i == 10)
+                    // {
+                    //
+                    //     isFlag = false;
+                    //
+                    //     opcua.DisconnectAsync().Wait();
+                    //
+                    //     _serilog.Info($"读取完成断开连接");
+                    // }
 
                 }
                 catch (Exception e)
@@ -213,7 +213,16 @@ public class DeviceCollectionBusiness
 
                 paramValues.Add(deviceParamVal);
             }
-            _paramValService.Insert(paramValues);
+
+            var isRes = _paramValService.Insert(paramValues);
+            if (isRes)
+            {
+                _serilog.Info(($"{device.deviceName} 设备参数保存成功"));
+            }
+            else
+            {
+                _serilog.Info(($"{device.deviceName} 设备参数保存失败"));
+            }
         }catch (Exception e)
         {
             throw new InvalidOperationException($"设备参数保存异常:{e.Message}");
diff --git a/Sln.Imm.Daemon.Model/dao/BaseDeviceParamVal.cs b/Sln.Imm.Daemon.Model/dao/BaseDeviceParamVal.cs
index 48629fa..e289a44 100644
--- a/Sln.Imm.Daemon.Model/dao/BaseDeviceParamVal.cs
+++ b/Sln.Imm.Daemon.Model/dao/BaseDeviceParamVal.cs
@@ -12,10 +12,10 @@ namespace Sln.Imm.Daemon.Model.dao;
 public class BaseDeviceParamVal
 {
     /// <summary>
-    /// 备  注:主键
+    /// 备  注:主键 ，PARAMRECORD_SEQ_ID
     ///</summary>
-    [SugarColumn(ColumnName = "RECORD_ID", IsPrimaryKey = true)]
-    public decimal objId { get; set; }
+    [SugarColumn(ColumnName = "RECORD_ID", OracleSequenceName = "PARAMRECORD_SEQ_ID",IsPrimaryKey = true)]
+    public int objId { get; set; }
 
     /// <summary>
     /// 备  注:参数编号
@@ -33,7 +33,7 @@ public class BaseDeviceParamVal
     /// 备  注:设备ID
     ///</summary>
     [SugarColumn(ColumnName = "DEVICE_ID")]
-    public decimal? deviceId { get; set; }
+    public int deviceId { get; set; }
 
     /// <summary>
     /// 备  注:参数名称
diff --git a/Sln.Imm.Daemon.Opc/OpcDeviceFactorySetup.cs b/Sln.Imm.Daemon.Opc/OpcDeviceFactorySetup.cs
index 751f597..68c5923 100644
--- a/Sln.Imm.Daemon.Opc/OpcDeviceFactorySetup.cs
+++ b/Sln.Imm.Daemon.Opc/OpcDeviceFactorySetup.cs
@@ -41,16 +41,24 @@ namespace Sln.Imm.Daemon.Opc
 
                             if (opcDev != null)
                             {
-                                var res = opcDev.ConnectAsync(item.networkAddress).Result;
-
-                                if (!res)
+                                try
                                 {
-                                    Console.WriteLine($"{item.deviceName}设备连接失败");
+                                    var res = opcDev.ConnectAsync(item.networkAddress).Result;
 
+                                    if (!res)
+                                    {
+                                        Console.WriteLine($"{item.deviceName}设备连接失败");
+
+                                    }
+                                    else
+                                    {
+                                        Console.WriteLine($"{item.deviceName}设备连接成功");
+                                        opcs.Add(item, opcDev);
+                                    }
                                 }
-                                else
+                                catch (Exception ex)
                                 {
-                                    opcs.Add(item, opcDev);
+                                    Console.WriteLine($"{item.deviceName}设备连接异常:{ex.Message}");
                                 }
                             }
                         }