diff --git a/Device/DeviceManager.cs b/Device/DeviceManager.cs index 06773b6..e2079a3 100644 --- a/Device/DeviceManager.cs +++ b/Device/DeviceManager.cs @@ -331,7 +331,7 @@ namespace LY.App.Device private async Task HandleDeviceConnection(Device device) { - int retryDelay = 1000; // 初始重连间隔(1秒) + int retryDelay = 10000; // 初始重连间隔(1秒) int maxDelay = 30000; // 最大重连间隔(30秒) var _log = ServiceLocator.Instance.GetService(); await _log?.AddLog(new AddLog { Message = $"设备 {device.Id} 掉线,重新连接中...", Parameters = "", StackTrace = "", url = "" }); diff --git a/Service/AlarmService.cs b/Service/AlarmService.cs index 61610b7..b2ea08f 100644 --- a/Service/AlarmService.cs +++ b/Service/AlarmService.cs @@ -134,35 +134,17 @@ namespace LY.App.Service private async Task Iswhitlist(string serial_number, double lat, double lon) { string key = RedisKeyList.white_list(serial_number); - if (!await _redisService.ExistsAsync(key)) - return false; - else + if (await _redisService.ExistsAsync(key)) { var entity = await _redisService.GetAsync(key); - //判断 是否在防区内 - if (entity.positionId.Any()) + //判断时间是否在区在 + if (entity.allDay) { - foreach (var item in entity.positionId) - { - var region = await _redisService.GetAsync(RedisKeyList.PositioinRegion(item)); - if (region != null) - { - region.SetRegionJson(); - if (IsPointInGeoJson(lat, lon, region.RegionJson)) - { - //判断时间是否在区在 - if (entity.allDay) - { - return true; - } - else - { - return entity.startTime <= DateTime.Now && DateTime.Now <= entity.endTime; - } - } - } - - } + return true; + } + else + { + return entity.startTime <= DateTime.Now && DateTime.Now <= entity.endTime; } } return false; diff --git a/appsettings.json b/appsettings.json index 4b49c56..4563222 100644 --- a/appsettings.json +++ b/appsettings.json @@ -8,7 +8,7 @@ "log2db": true, //是否记录 "AllowedHosts": "*", "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": { "SecretKey": "HWLSNPM+OhlFe4wwEV/teSWsxGjrWbxKnHonxW5Z+mFlQq3zonv5",