From ed2e8f378bdcddf467f7ffa59410fa0e6051339c Mon Sep 17 00:00:00 2001
From: WenJY <WenJY@mesnac.com>
Date: Fri, 5 Sep 2025 15:31:38 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E8=AE=BE=E5=A4=87=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E7=BC=93=E5=AD=98=E9=80=BB=E8=BE=91=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Sln.Imm.Daemon.Cache/Class1.cs                            | 5 -----
 Sln.Imm.Daemon.Model/dao/BaseDeviceInfo.cs                | 8 ++++++++
 .../service/Impl/BaseDeviceInfoServiceImpl.cs             | 3 ++-
 Sln.Imm.Daemon/Program.cs                                 | 6 +-----
 4 files changed, 11 insertions(+), 11 deletions(-)
 delete mode 100644 Sln.Imm.Daemon.Cache/Class1.cs

diff --git a/Sln.Imm.Daemon.Cache/Class1.cs b/Sln.Imm.Daemon.Cache/Class1.cs
deleted file mode 100644
index 2c9588c..0000000
--- a/Sln.Imm.Daemon.Cache/Class1.cs
+++ /dev/null
@@ -1,5 +0,0 @@
-namespace Sln.Imm.Daemon.Cache;
-
-public class Class1
-{
-}
\ No newline at end of file
diff --git a/Sln.Imm.Daemon.Model/dao/BaseDeviceInfo.cs b/Sln.Imm.Daemon.Model/dao/BaseDeviceInfo.cs
index 82030e9..a0e9d2a 100644
--- a/Sln.Imm.Daemon.Model/dao/BaseDeviceInfo.cs
+++ b/Sln.Imm.Daemon.Model/dao/BaseDeviceInfo.cs
@@ -81,6 +81,14 @@ public class BaseDeviceInfo
     [SugarColumn(ColumnName = "DEVICE_STATUS")]
     public int? deviceStatus { get; set; }
 
+    /// <summary>
+    /// Desc:是否启用
+    /// Default:
+    /// Nullable:True
+    /// </summary>
+    [SugarColumn(ColumnName = "IS_FLAG")]
+    public int? isFlag { get; set; }
+
     /// <summary>
     /// 设备参数集合
     /// </summary>
diff --git a/Sln.Imm.Daemon.Repository/service/Impl/BaseDeviceInfoServiceImpl.cs b/Sln.Imm.Daemon.Repository/service/Impl/BaseDeviceInfoServiceImpl.cs
index 7a2f8a7..40c0d3e 100644
--- a/Sln.Imm.Daemon.Repository/service/Impl/BaseDeviceInfoServiceImpl.cs
+++ b/Sln.Imm.Daemon.Repository/service/Impl/BaseDeviceInfoServiceImpl.cs
@@ -44,7 +44,8 @@ public class BaseDeviceInfoServiceImpl : BaseServiceImpl<BaseDeviceInfo>, IBaseD
     {
         try
         {
-            return _rep.Context.Queryable<BaseDeviceInfo>().Includes(x => x.deviceParams)
+            return _rep.Context.Queryable<BaseDeviceInfo>().Includes(x => x.deviceParams.Where(x=>x.isFlag == 1).ToList())
+                .Where(x => x.isFlag == 1)
                 .ToList();
         }
         catch (Exception ex)
diff --git a/Sln.Imm.Daemon/Program.cs b/Sln.Imm.Daemon/Program.cs
index 29c8afb..0be3b6d 100644
--- a/Sln.Imm.Daemon/Program.cs
+++ b/Sln.Imm.Daemon/Program.cs
@@ -26,11 +26,7 @@ namespace Sln.Imm.Daemon
             var log = ServiceProvider.GetService<SerilogHelper>();
             log.Info($"系统启动成功,日志存放位置:{appConfig.logPath}");
 
-            var baseDeviceInfoCacheService = ServiceProvider.GetService<BaseDeviceInfoCacheService>();
-            var valueAsync = baseDeviceInfoCacheService.GetValueAsync("FusionCacheExerciseKey");
-
-            Thread.Sleep(2000);
-            var valueAsync2 = baseDeviceInfoCacheService.GetValueAsync("FusionCacheExerciseKey");
+            Task.Delay(-1).Wait();
         }
 
         private static void ConfigureServices(IServiceCollection services)