白名单调整
This commit is contained in:
parent
6c31a6a72d
commit
8bd8f38962
|
|
@ -137,22 +137,9 @@ namespace LY.App.Service
|
|||
private async Task<Tuple<bool, long>> Iswhitlist(string serial_number, double lat, double lon)
|
||||
{
|
||||
string key = RedisKeyList.white_list(serial_number);
|
||||
if (!await _redisService.ExistsAsync(key))
|
||||
return new Tuple<bool, long>(false, 0);
|
||||
else
|
||||
if (await _redisService.ExistsAsync(key))
|
||||
{
|
||||
var entity = await _redisService.GetAsync<Whitelist>(key);
|
||||
//判断 是否在防区内
|
||||
if (entity.positionId.Any())
|
||||
{
|
||||
foreach (var item in entity.positionId)
|
||||
{
|
||||
var region = await _redisService.GetAsync<PositionInfo>(RedisKeyList.PositioinRegion(item));
|
||||
if (region != null)
|
||||
{
|
||||
region.SetRegionJson();
|
||||
if (IsPointInGeoJson(lat, lon, region.RegionJson))
|
||||
{
|
||||
//判断时间是否在区在
|
||||
if (entity.allDay)
|
||||
{
|
||||
|
|
@ -163,12 +150,6 @@ namespace LY.App.Service
|
|||
var has = entity.startTime <= DateTime.Now && DateTime.Now <= entity.endTime;
|
||||
return new Tuple<bool, long>(has, has ? entity.Id : 0);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
return new Tuple<bool, long>(false, 0); ;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue