Explorar el Código

修改获取无人机信息接口

tags/v1.2.0^2
wanjing hace 1 año
padre
commit
081ab11e47
Se han modificado 1 ficheros con 1 adiciones y 8 borrados
  1. +1
    -8
      tuoheng-admin/src/main/java/com/tuoheng/admin/service/airport/drone/QueryDroneDataService.java

+ 1
- 8
tuoheng-admin/src/main/java/com/tuoheng/admin/service/airport/drone/QueryDroneDataService.java Ver fichero

// 读取不同租户的机场平台url // 读取不同租户的机场平台url
User user = ShiroUtils.getUserInfo(); User user = ShiroUtils.getUserInfo();
Integer tenantId = user.getTenantId(); Integer tenantId = user.getTenantId();

this.check(airportId); this.check(airportId);

ThMission mission = missionMapper.selectOne(new LambdaQueryWrapper<ThMission>() ThMission mission = missionMapper.selectOne(new LambdaQueryWrapper<ThMission>()
.eq(ThMission::getTenantId, tenantId) .eq(ThMission::getTenantId, tenantId)
.eq(ThMission::getAirportId, airportId) .eq(ThMission::getAirportId, airportId)
if (ObjectUtil.isNull(mission)) { if (ObjectUtil.isNull(mission)) {
log.info("获取无人机数据信息, 没有正在飞行的任务"); log.info("获取无人机数据信息, 没有正在飞行的任务");
// throw new ServiceException("没有正在飞行的任务"); // throw new ServiceException("没有正在飞行的任务");
JsonResult.success("没有正在飞行的任务");
return JsonResult.success("没有正在飞行的任务");
} }

log.info("获取无人机数据信息1, missionId={}, emergencyDataMissionId={}", mission.getId(), mission.getEmergencyDataMissionId());

Integer missionId; Integer missionId;
if (0 == mission.getEmergencyDataMissionId()) { if (0 == mission.getEmergencyDataMissionId()) {
missionId = mission.getId(); missionId = mission.getId();
} else { } else {
missionId = mission.getEmergencyDataMissionId(); missionId = mission.getEmergencyDataMissionId();
} }
log.info("获取无人机数据信息2, missionId={}", missionId);

Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("id", missionId); map.put("id", missionId);
map.put("tenantId", tenantId); map.put("tenantId", tenantId);

Cargando…
Cancelar
Guardar