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; }
+ ///
+ /// Desc:是否启用
+ /// Default:
+ /// Nullable:True
+ ///
+ [SugarColumn(ColumnName = "IS_FLAG")]
+ public int? isFlag { get; set; }
+
///
/// 设备参数集合
///
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, IBaseD
{
try
{
- return _rep.Context.Queryable().Includes(x => x.deviceParams)
+ return _rep.Context.Queryable().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();
log.Info($"系统启动成功,日志存放位置:{appConfig.logPath}");
- var baseDeviceInfoCacheService = ServiceProvider.GetService();
- var valueAsync = baseDeviceInfoCacheService.GetValueAsync("FusionCacheExerciseKey");
-
- Thread.Sleep(2000);
- var valueAsync2 = baseDeviceInfoCacheService.GetValueAsync("FusionCacheExerciseKey");
+ Task.Delay(-1).Wait();
}
private static void ConfigureServices(IServiceCollection services)