Commit 9aa3d8f6 by gdj

机队列表返回设备信息补充。

parent 325116da
package com.dji.sample.manage.model.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
......@@ -18,19 +19,36 @@ public class FleetDeviceDTO implements Serializable {
private Integer id;
@JsonProperty("fleet_id")
private String fleetId;
@JsonProperty("device_id")
private String deviceId;
/**
* 设备型号
*/
@JsonProperty("device_enum_name")
private String deviceEnumName;
/**
* 设备昵称
*/
@JsonProperty("device_nickname")
private String deviceNickname;
@JsonProperty("device_enum")
private String deviceEnum;
private Integer domain;
@JsonProperty("device_type")
private Integer deviceType;
@JsonProperty("sub_type")
private Integer subType;
@JsonProperty("device_sn")
private String deviceSn;
}
......@@ -83,6 +83,11 @@ public class FleetDeviceServiceImpl extends ServiceImpl<IFleetDeviceMapper, Flee
// 型号
DeviceEnum deviceEnum = DeviceEnum.find(device.getDomain(), device.getDeviceType(), device.getSubType());
fleetDeviceDTO.setDeviceEnumName(deviceEnum.name());
fleetDeviceDTO.setDomain(device.getDomain());
fleetDeviceDTO.setDeviceType(device.getDeviceType());
fleetDeviceDTO.setSubType(device.getSubType());
fleetDeviceDTO.setDeviceSn(device.getDeviceSn());
fleetDeviceDTO.setDeviceEnum(deviceEnum.getDevice());
}
return fleetDeviceDTO;
......@@ -109,6 +114,11 @@ public class FleetDeviceServiceImpl extends ServiceImpl<IFleetDeviceMapper, Flee
// 型号
DeviceEnum deviceEnum = DeviceEnum.find(device.getDomain(), device.getDeviceType(), device.getSubType());
fleetDeviceDTO.setDeviceEnumName(deviceEnum.name());
fleetDeviceDTO.setDomain(device.getDomain());
fleetDeviceDTO.setDeviceType(device.getDeviceType());
fleetDeviceDTO.setSubType(device.getSubType());
fleetDeviceDTO.setDeviceSn(device.getDeviceSn());
fleetDeviceDTO.setDeviceEnum(deviceEnum.getDevice());
}
fleetDeviceDTOList.add(fleetDeviceDTO);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment