轨迹回放加入飞手位置
This commit is contained in:
		
							parent
							
								
									bb1466689b
								
							
						
					
					
						commit
						a17cf970cb
					
				| 
						 | 
					@ -158,6 +158,8 @@ namespace LY.App.Service
 | 
				
			||||||
                      Lon = s.drone_lon,
 | 
					                      Lon = s.drone_lon,
 | 
				
			||||||
                      Lat = s.drone_lat,
 | 
					                      Lat = s.drone_lat,
 | 
				
			||||||
                      Alt = s.height,
 | 
					                      Alt = s.height,
 | 
				
			||||||
 | 
					                      s.app_lat,
 | 
				
			||||||
 | 
					                      s.app_lon,
 | 
				
			||||||
                      s.CreateTime,
 | 
					                      s.CreateTime,
 | 
				
			||||||
                      AlarmLevel = s.alarmLevel,
 | 
					                      AlarmLevel = s.alarmLevel,
 | 
				
			||||||
                  }).ToListAsync();
 | 
					                  }).ToListAsync();
 | 
				
			||||||
| 
						 | 
					@ -259,7 +261,7 @@ namespace LY.App.Service
 | 
				
			||||||
                .WhereIF(input.strartDate.HasValue, st => st.CreateTime >= input.strartDate.Value)
 | 
					                .WhereIF(input.strartDate.HasValue, st => st.CreateTime >= input.strartDate.Value)
 | 
				
			||||||
                .WhereIF(input.endDate.HasValue, st => st.CreateTime <= input.endDate.Value.AddDays(1))
 | 
					                .WhereIF(input.endDate.HasValue, st => st.CreateTime <= input.endDate.Value.AddDays(1))
 | 
				
			||||||
                .OrderBy(s => s.BatchId, OrderByType.Desc)
 | 
					                .OrderBy(s => s.BatchId, OrderByType.Desc)
 | 
				
			||||||
                .GroupBy(s => new { s.BatchId, s.serial_number, s.device_type, s.positionId, s.PostionName ,s.freq})
 | 
					                .GroupBy(s => new { s.BatchId, s.serial_number, s.device_type, s.positionId, s.PostionName, s.freq })
 | 
				
			||||||
                .Select(st => new AlarmRepDto
 | 
					                .Select(st => new AlarmRepDto
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    batchId = st.BatchId.ToString(),
 | 
					                    batchId = st.BatchId.ToString(),
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue