yanghongwei
/
ly
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

白名单调整

This commit is contained in:
yanghongwei 2025-07-09 20:47:01 +08:00
parent 91f093867a
commit 45c19fcdf9
3 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Device/DeviceManager.cs
View File

@ -331,7 +331,7 @@ namespace LY.App.Device
private async Task HandleDeviceConnection(Device device) private async Task HandleDeviceConnection(Device device)
{ {
int retryDelay = 1000; // 初始重连间隔（1秒） int retryDelay = 10000; // 初始重连间隔（1秒）
int maxDelay = 30000; // 最大重连间隔（30秒） int maxDelay = 30000; // 最大重连间隔（30秒）
var _log = ServiceLocator.Instance.GetService<LogService>(); var _log = ServiceLocator.Instance.GetService<LogService>();
await _log?.AddLog(new AddLog { Message = $"设备 {device.Id} 掉线，重新连接中...", Parameters = "", StackTrace = "", url = "" }); await _log?.AddLog(new AddLog { Message = $"设备 {device.Id} 掉线，重新连接中...", Parameters = "", StackTrace = "", url = "" });

34
Service/AlarmService.cs
View File

@ -134,35 +134,17 @@ namespace LY.App.Service
private async Task<bool> Iswhitlist(string serial_number, double lat, double lon) private async Task<bool> Iswhitlist(string serial_number, double lat, double lon)
{ {
string key = RedisKeyList.white_list(serial_number); string key = RedisKeyList.white_list(serial_number);
if (!await _redisService.ExistsAsync(key)) if (await _redisService.ExistsAsync(key))
return false;
else
{ {
var entity = await _redisService.GetAsync<Whitelist>(key); var entity = await _redisService.GetAsync<Whitelist>(key);
//判断 是否在防区内 //判断时间是否在区在
if (entity.positionId.Any()) if (entity.allDay)
{ {
foreach (var item in entity.positionId) return true;
{ }
var region = await _redisService.GetAsync<PositionInfo>(RedisKeyList.PositioinRegion(item)); else
if (region != null) {
{ return entity.startTime <= DateTime.Now && DateTime.Now <= entity.endTime;
region.SetRegionJson();
if (IsPointInGeoJson(lat, lon, region.RegionJson))
{
//判断时间是否在区在
if (entity.allDay)
{
return true;
}
else
{
return entity.startTime <= DateTime.Now && DateTime.Now <= entity.endTime;
}
}
}
}
} }
} }
return false; return false;

2
appsettings.json
View File

@ -8,7 +8,7 @@
"log2db": true, //是否记录 "log2db": true, //是否记录
"AllowedHosts": "*", "AllowedHosts": "*",
"ConnectionStrings": { "ConnectionStrings": {
"DefaultConnection": "server=114.66.57.139;port=13306;database=lyapp;user=root;password=dklymysql;Pooling=true;" "DefaultConnection": "server=114.66.59.70;port=33306;database=lyapp;user=root;password=dklymysql;Pooling=true;"
}, },
"Token": { "Token": {
"SecretKey": "HWLSNPM+OhlFe4wwEV/teSWsxGjrWbxKnHonxW5Z+mFlQq3zonv5", "SecretKey": "HWLSNPM+OhlFe4wwEV/teSWsxGjrWbxKnHonxW5Z+mFlQq3zonv5",