添加无人机信息获取的逻辑
This commit is contained in:
parent
acf586de85
commit
cbfd77da5c
|
|
@ -1,5 +1,6 @@
|
||||||
package com.ruoyi.device.service.dto;
|
package com.ruoyi.device.service.dto;
|
||||||
|
|
||||||
|
import com.ruoyi.device.api.domain.PayloadVO;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
|
|
@ -38,7 +39,7 @@ public class AircraftDetailDTO implements Serializable
|
||||||
private String aircraftStatus;
|
private String aircraftStatus;
|
||||||
|
|
||||||
/** 挂载列表 */
|
/** 挂载列表 */
|
||||||
private List<PayloadDTO> payloadList;
|
private List<PayloadVO> payloadList;
|
||||||
|
|
||||||
// ========== AircraftDetailVO 特有字段 ==========
|
// ========== AircraftDetailVO 特有字段 ==========
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -136,7 +136,42 @@ public class BufferDeviceImpl implements IBufferDeviceService
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public AircraftDetailDTO getAircraftDetailById(Long aircraftId) {
|
public AircraftDetailDTO getAircraftDetailById(Long aircraftId) {
|
||||||
return null;
|
Aircraft aircraft = aircraftDomain.selectAircraftByAircraftId(aircraftId);
|
||||||
|
|
||||||
|
log.info("selectAircraftByAircraftId {}",JSON.toJSONString(aircraft));
|
||||||
|
if (aircraft == null)
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
Device device = deviceDomain.selectDeviceByDeviceId(aircraft.getDeviceId());
|
||||||
|
log.info("selectDeviceByDeviceId {}",JSON.toJSONString(device));
|
||||||
|
|
||||||
|
|
||||||
|
AircraftDetailDTO dto = getChangeAbleAirDetailDTO(device.getIotDeviceId());
|
||||||
|
dto.setAircraftId(aircraft.getAircraftId());
|
||||||
|
dto.setAircraftName(aircraft.getAircraftName());
|
||||||
|
|
||||||
|
List<AircraftPayload> aircraftPayloads =
|
||||||
|
aircraftPayloadDomain.selectAircraftPayloadByAircraftId(aircraft.getAircraftId());
|
||||||
|
|
||||||
|
if(!CollectionUtils.isEmpty(aircraftPayloads)){
|
||||||
|
List<PayloadVO> payloads = new ArrayList<>(aircraftPayloads.size());
|
||||||
|
for(AircraftPayload aircraftPayload : aircraftPayloads){
|
||||||
|
Payload payload = payloadDomain.selectPayloadByPayloadId(aircraftPayload.getPayloadId());
|
||||||
|
PayloadVO payloadVO = new PayloadVO();
|
||||||
|
payloadVO.setPayloadId(aircraftPayload.getPayloadId());
|
||||||
|
payloadVO.setPayloadName(payload.getPayloadName());
|
||||||
|
payloadVO.setPayloadType(payload.getPayloadType());
|
||||||
|
payloadVO.setPayloadStatus(PayloadStatusEnum.ONLINE.getCode());
|
||||||
|
|
||||||
|
payloads.add(payloadVO);
|
||||||
|
}
|
||||||
|
dto.setPayloadList(payloads);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
return dto;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue