diff --git a/src/Admin/ThingsGateway.SqlSugar/ThingsGateway.SqlSugar.csproj b/src/Admin/ThingsGateway.SqlSugar/ThingsGateway.SqlSugar.csproj index 56bc2ec7f..ecb2c7198 100644 --- a/src/Admin/ThingsGateway.SqlSugar/ThingsGateway.SqlSugar.csproj +++ b/src/Admin/ThingsGateway.SqlSugar/ThingsGateway.SqlSugar.csproj @@ -34,7 +34,7 @@ - + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 6d9b5319a..31760e699 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,9 +1,9 @@ - 10.11.84 - 10.11.84 - 10.11.84 + 10.11.85 + 10.11.85 + 10.11.85 10.11.6 10.11.6 8.0.20 diff --git a/src/Plugin/ThingsGateway.Plugin.DB/QuestDB/QuestDBProducer.cs b/src/Plugin/ThingsGateway.Plugin.DB/QuestDB/QuestDBProducer.cs index 7f9081a6c..26385fbce 100644 --- a/src/Plugin/ThingsGateway.Plugin.DB/QuestDB/QuestDBProducer.cs +++ b/src/Plugin/ThingsGateway.Plugin.DB/QuestDB/QuestDBProducer.cs @@ -102,7 +102,7 @@ public partial class QuestDBProducer : BusinessBaseWithCacheIntervalVariable else { { - var time = TimerX.Now - TimeSpan.FromDays(-_driverPropertys.SaveDays); + var time = TimerX.Now - TimeSpan.FromDays(_driverPropertys.SaveDays); string sql = $""" ALTER TABLE {_driverPropertys.NumberTableNameLow} diff --git a/src/Plugin/ThingsGateway.Plugin.DB/SqlDB/SqlDBProducer.cs b/src/Plugin/ThingsGateway.Plugin.DB/SqlDB/SqlDBProducer.cs index 3dc242e1e..dcaed7986 100644 --- a/src/Plugin/ThingsGateway.Plugin.DB/SqlDB/SqlDBProducer.cs +++ b/src/Plugin/ThingsGateway.Plugin.DB/SqlDB/SqlDBProducer.cs @@ -119,7 +119,7 @@ public partial class SqlDBProducer : BusinessBaseWithCacheIntervalVariable if (_driverPropertys.IsHistoryDB) { { - var time = TimerX.Now - TimeSpan.FromDays(-_driverPropertys.SaveDays); + var time = TimerX.Now - TimeSpan.FromDays(_driverPropertys.SaveDays); var tableNames = db.SplitHelper().GetTables();//根据时间获取表名 var filtered = tableNames.Where(a => a.Date < time).ToList(); // 去掉最后一个 @@ -137,7 +137,7 @@ public partial class SqlDBProducer : BusinessBaseWithCacheIntervalVariable } { - var time = TimerX.Now - TimeSpan.FromDays(-_driverPropertys.SaveDays); + var time = TimerX.Now - TimeSpan.FromDays(_driverPropertys.SaveDays); var tableNames = db.SplitHelper().GetTables();//根据时间获取表名 var filtered = tableNames.Where(a => a.Date < time).ToList(); // 去掉最后一个 diff --git a/src/Plugin/ThingsGateway.Plugin.DB/SqlHistoryAlarm/SqlHistoryAlarm.cs b/src/Plugin/ThingsGateway.Plugin.DB/SqlHistoryAlarm/SqlHistoryAlarm.cs index 80511e479..0f4ab2900 100644 --- a/src/Plugin/ThingsGateway.Plugin.DB/SqlHistoryAlarm/SqlHistoryAlarm.cs +++ b/src/Plugin/ThingsGateway.Plugin.DB/SqlHistoryAlarm/SqlHistoryAlarm.cs @@ -105,7 +105,7 @@ public partial class SqlHistoryAlarm : BusinessBaseWithCacheAlarm else { { - var time = TimerX.Now - TimeSpan.FromDays(-_driverPropertys.SaveDays); + var time = TimerX.Now - TimeSpan.FromDays(_driverPropertys.SaveDays); await db.Deleteable().Where(a => a.EventTime < time).ExecuteCommandAsync(cancellationToken).ConfigureAwait(false);