g82tt/ThingsGateway
1
0
Fork 0
mirror of https://gitee.com/ThingsGateway/ThingsGateway.git synced 2025-10-20 10:50:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 数据库插件保留天数逻辑错误

Browse Source
This commit is contained in:
2248356998 qq.com
2025-10-09 08:52:02 +08:00
parent 42c740fa1b
commit 53a98b26cd
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Admin/ThingsGateway.SqlSugar/ThingsGateway.SqlSugar.csproj
View File

@@ -34,7 +34,7 @@
<PackageReference Include="Oracle.ManagedDataAccess.Core" Version="23.9.1" />
<PackageReference Include="Oscar.Data.SqlClient" Version="4.2.27" />
<PackageReference Include="System.Data.Common" Version="4.3.0" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.1" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.2" />
<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
<PackageReference Include="System.Formats.Asn1" Version="8.0.2" />

6
src/Directory.Build.props
View File

@@ -1,9 +1,9 @@
<Project>
<PropertyGroup>
<PluginVersion>10.11.84</PluginVersion>
<ProPluginVersion>10.11.84</ProPluginVersion>
<DefaultVersion>10.11.84</DefaultVersion>
<PluginVersion>10.11.85</PluginVersion>
<ProPluginVersion>10.11.85</ProPluginVersion>
<DefaultVersion>10.11.85</DefaultVersion>
<AuthenticationVersion>10.11.6</AuthenticationVersion>
<SourceGeneratorVersion>10.11.6</SourceGeneratorVersion>
<NET8Version>8.0.20</NET8Version>

2
src/Plugin/ThingsGateway.Plugin.DB/QuestDB/QuestDBProducer.cs
View File

@@ -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}

4
src/Plugin/ThingsGateway.Plugin.DB/SqlDB/SqlDBProducer.cs
View File

@@ -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<SQLHistoryValue>().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<SQLNumberHistoryValue>().GetTables();//根据时间获取表名
var filtered = tableNames.Where(a => a.Date < time).ToList();
// 去掉最后一个

2
src/Plugin/ThingsGateway.Plugin.DB/SqlHistoryAlarm/SqlHistoryAlarm.cs
View File

@@ -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<HistoryAlarm>().Where(a => a.EventTime < time).ExecuteCommandAsync(cancellationToken).ConfigureAwait(false);