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 | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/Rdream.Core/DataHandler/SendMsgByAccessControlRecord.cs b/Rdream.Core/DataHandler/SendMsgByAccessControlRecord.cs
index b365835..96ab9cd 100644
--- a/Rdream.Core/DataHandler/SendMsgByAccessControlRecord.cs
+++ b/Rdream.Core/DataHandler/SendMsgByAccessControlRecord.cs
@@ -296,7 +296,7 @@
sql += SQL_Six + SQL_Seven + SQL_Eight + SQL_Nine;
//log4netService.Debug("_seconds" + _seconds);
//log4netService.Debug("sql锛�" + sql);
- log4netService.Debug($"娴嬭瘯SQL={sql}");
+ //log4netService.Debug($"娴嬭瘯SQL={sql}");
DataSet ds = da.ExecuteDataSet(System.Data.CommandType.Text, sql);
DataTable dt = ds.Tables[0];
@@ -304,7 +304,7 @@
AccessControlRecord accessControlRecord = new AccessControlRecord();
- log4netService.Debug($"鎬诲叡鑾峰彇{dt.Rows.Count},SQL={sql}");
+ //log4netService.Debug($"鎬诲叡鑾峰彇{dt.Rows.Count},SQL={sql}");
//Console.WriteLine("寰呭鐞嗚褰曟暟锛�" + dt.Rows.Count);
@@ -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)
--
Gitblit v1.9.1