Commit 0286ca97 by gdj

设备返回型号信息。

parent beb3d443
...@@ -6,6 +6,7 @@ import com.dji.sdk.cloudapi.device.DeviceDomainEnum; ...@@ -6,6 +6,7 @@ import com.dji.sdk.cloudapi.device.DeviceDomainEnum;
import com.dji.sdk.cloudapi.device.DeviceSubTypeEnum; import com.dji.sdk.cloudapi.device.DeviceSubTypeEnum;
import com.dji.sdk.cloudapi.device.DeviceTypeEnum; import com.dji.sdk.cloudapi.device.DeviceTypeEnum;
import com.dji.sdk.cloudapi.tsa.DeviceIconUrl; import com.dji.sdk.cloudapi.tsa.DeviceIconUrl;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
...@@ -74,4 +75,14 @@ public class DeviceDTO { ...@@ -74,4 +75,14 @@ public class DeviceDTO {
private String parentSn; private String parentSn;
private String thingVersion; private String thingVersion;
/**
* 设备型号
*/
@JsonProperty("device_enum_name")
private String deviceEnumName;
@JsonProperty("device_enum")
private String deviceEnum;
} }
\ No newline at end of file
...@@ -363,9 +363,12 @@ public class DeviceServiceImpl extends ServiceImpl<IDeviceMapper, DeviceEntity> ...@@ -363,9 +363,12 @@ public class DeviceServiceImpl extends ServiceImpl<IDeviceMapper, DeviceEntity>
} }
DeviceDTO.DeviceDTOBuilder builder = DeviceDTO.builder(); DeviceDTO.DeviceDTOBuilder builder = DeviceDTO.builder();
try { try {
DeviceEnum deviceEnum = DeviceEnum.find(entity.getDomain(), entity.getDeviceType(), entity.getSubType());
builder builder
.deviceSn(entity.getDeviceSn()) .deviceSn(entity.getDeviceSn())
.id(entity.getId()) .id(entity.getId())
.deviceEnum(deviceEnum.getDevice())
.deviceEnumName(deviceEnum.name())
.childDeviceSn(entity.getChildSn()) .childDeviceSn(entity.getChildSn())
.deviceName(entity.getDeviceName()) .deviceName(entity.getDeviceName())
.deviceDesc(entity.getDeviceDesc()) .deviceDesc(entity.getDeviceDesc())
......
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