From 4ae8b1c91036a89f7b8921921826e37e0df1a656 Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期一, 30 九月 2024 10:35:30 +0800
Subject: [PATCH] fix: 修复因数据库死锁导致过滤失效的问题
---
Rdream.Core/DataHandler/SendMsgByAccessControlRecord.cs | 12 ++++++++----
TimedTaskService/TimedTaskService.csproj | 22 ++++++++++++++++++++++
2 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/Rdream.Core/DataHandler/SendMsgByAccessControlRecord.cs b/Rdream.Core/DataHandler/SendMsgByAccessControlRecord.cs
index cc121c0..96ab9cd 100644
--- a/Rdream.Core/DataHandler/SendMsgByAccessControlRecord.cs
+++ b/Rdream.Core/DataHandler/SendMsgByAccessControlRecord.cs
@@ -353,10 +353,11 @@
if (subDeviceId == dicDoorSwitch[doorIdTemp])
{
//鍓旈櫎灞忚斀鐨勮褰�
- Console.WriteLine($"鍓旈櫎灞忚斀闂ㄧ{dt.Rows[i]["door_id"]}");
+ Console.WriteLine($"鍗曞悜闂ㄥ睆钄藉墧闄ゅ睆钄介棬绂亄dt.Rows[i]["door_id"]}");
log4netService.Debug($"鍓旈櫎灞忚斀闂ㄧ{dt.Rows[i]["door_id"]}");
- UpdateDataSycFlag(int.Parse(dt.Rows[i]["id"].ToString()), 2);
dt.Rows[i].Delete();
+ UpdateDataSycFlag(int.Parse(dt.Rows[i]["id"].ToString()), 2);
+
continue;
}
@@ -374,10 +375,12 @@
else
{
string str = $"鍥犳俯搴︽垨灞忚斀闂ㄧ杩囨护鏁版嵁ID锛歿dt.Rows[i]["id"]}";
- UpdateDataSycFlag(Convert.ToInt32(dt.Rows[i]["id"]), 3);
log4netService.Debug(str);
Console.WriteLine(str);
dt.Rows[i].Delete();
+
+ UpdateDataSycFlag(Convert.ToInt32(dt.Rows[i]["id"]), 3);
+
}
}
}
@@ -386,8 +389,9 @@
//鍓旈櫎灞忚斀鐨勮褰�
Console.WriteLine($"鍓旈櫎灞忚斀闂ㄧ{dt.Rows[i]["door_id"]}");
log4netService.Debug($"鍓旈櫎灞忚斀闂ㄧ{dt.Rows[i]["door_id"]}");
- UpdateDataSycFlag(int.Parse(dt.Rows[i]["id"].ToString()), 2);
+
dt.Rows[i].Delete();
+ UpdateDataSycFlag(int.Parse(dt.Rows[i]["id"].ToString()), 2);
}
}
catch (Exception ex)
diff --git a/TimedTaskService/TimedTaskService.csproj b/TimedTaskService/TimedTaskService.csproj
index f2c8d2d..09fe247 100644
--- a/TimedTaskService/TimedTaskService.csproj
+++ b/TimedTaskService/TimedTaskService.csproj
@@ -11,6 +11,21 @@
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -68,5 +83,12 @@
<Name>2.Rdream.Core</Name>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file
--
Gitblit v1.9.1