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:52:45 +08:00
parent 6c31a6a72d
commit 8bd8f38962
1 changed files with 10 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Service/AlarmService.cs
View File

@ -137,37 +137,18 @@ namespace LY.App.Service
private async Task<Tuple<bool, long>> Iswhitlist(string serial_number, double lat, double lon) private async Task<Tuple<bool, long>> 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 new Tuple<bool, long>(false, 0);
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 new Tuple<bool, long>(true, entity.Id);
{ }
var region = await _redisService.GetAsync<PositionInfo>(RedisKeyList.PositioinRegion(item)); else
if (region != null) {
{ var has = entity.startTime <= DateTime.Now && DateTime.Now <= entity.endTime;
region.SetRegionJson(); return new Tuple<bool, long>(has, has ? entity.Id : 0);
if (IsPointInGeoJson(lat, lon, region.RegionJson))
{
//判断时间是否在区在
if (entity.allDay)
{
return new Tuple<bool, long>(true, entity.Id);
}
else
{
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); ; return new Tuple<bool, long>(false, 0); ;
@ -393,7 +374,7 @@ namespace LY.App.Service
positionId = SqlFunc.AggregateMax(st.positionId), positionId = SqlFunc.AggregateMax(st.positionId),
}).MergeTable()//合并查询 }).MergeTable()//合并查询
.ToPageListAsync(input.pageNum, input.pageSize, total); .ToPageListAsync(input.pageNum, input.pageSize, total);
var ids= items.Select(s => s.positionId).Distinct().ToList(); var ids = items.Select(s => s.positionId).Distinct().ToList();
var positionNames = await _db.Queryable<PositionInfo>() var positionNames = await _db.Queryable<PositionInfo>()
.Where(s => ids.Contains(s.Id)) .Where(s => ids.Contains(s.Id))
.Select(s => new { s.Id, s.Name }) .Select(s => new { s.Id, s.Name })