|
|
@@ -41,12 +41,12 @@ public class QueryDroneDataService { |
|
|
|
|
|
|
|
public JsonResult getDroneDataById(String airportId) { |
|
|
|
log.info("获取无人机数据信息, airportId={}", airportId); |
|
|
|
|
|
|
|
this.check(airportId); |
|
|
|
|
|
|
|
// 读取不同租户的机场平台url |
|
|
|
User user = ShiroUtils.getUserInfo(); |
|
|
|
Integer tenantId = user.getTenantId(); |
|
|
|
|
|
|
|
this.check(airportId); |
|
|
|
|
|
|
|
ThMission mission = missionMapper.selectOne(new LambdaQueryWrapper<ThMission>() |
|
|
|
.eq(ThMission::getTenantId, tenantId) |
|
|
|
.eq(ThMission::getAirportId, airportId) |
|
|
@@ -57,8 +57,15 @@ public class QueryDroneDataService { |
|
|
|
throw new ServiceException("没有正在飞行的任务"); |
|
|
|
} |
|
|
|
|
|
|
|
Integer missionId; |
|
|
|
if (0 == mission.getEmergencyDataMissionId()) { |
|
|
|
missionId = mission.getId(); |
|
|
|
} else { |
|
|
|
missionId = mission.getEmergencyDataMissionId(); |
|
|
|
} |
|
|
|
|
|
|
|
Map<String, Object> map = new HashMap<>(); |
|
|
|
map.put("id", mission.getId()); |
|
|
|
map.put("id", missionId); |
|
|
|
map.put("tenantId", tenantId); |
|
|
|
List<ThInspection> inspectionList = inspectionMapper.selectListByMissionId(map); |
|
|
|
if (CollectionUtil.isEmpty(inspectionList)) { |