添加电池的信息获取
This commit is contained in:
parent
b3c3515322
commit
9943cfe1f2
|
|
@ -4,6 +4,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
import com.ruoyi.device.domain.model.thingsboard.AttributeKey;
|
import com.ruoyi.device.domain.model.thingsboard.AttributeKey;
|
||||||
import com.ruoyi.device.domain.model.thingsboard.TelemetryKey;
|
import com.ruoyi.device.domain.model.thingsboard.TelemetryKey;
|
||||||
|
import com.ruoyi.device.domain.model.thingsboard.attributes.battery.BatteryInfo;
|
||||||
import com.ruoyi.device.domain.model.thingsboard.attributes.psdk.PsdkDevice;
|
import com.ruoyi.device.domain.model.thingsboard.attributes.psdk.PsdkDevice;
|
||||||
import com.ruoyi.device.domain.model.thingsboard.attributes.battery.BatteryData;
|
import com.ruoyi.device.domain.model.thingsboard.attributes.battery.BatteryData;
|
||||||
|
|
||||||
|
|
@ -305,9 +306,7 @@ public class DeviceTelemetry {
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 无人机特有
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 无人机挂载信息
|
* 无人机挂载信息
|
||||||
|
|
|
||||||
|
|
@ -173,6 +173,16 @@ public class BufferDeviceImpl implements IBufferDeviceService
|
||||||
dto.setPayloadList(payloads);
|
dto.setPayloadList(payloads);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 获取电池SN号 - 从 batteries 数组里面的第一个的 SN号
|
||||||
|
TelemetryMap telemetryMap = thingsBoardDomain.getPredefinedDeviceTelemetry(device.getIotDeviceId());
|
||||||
|
telemetryMap.get(DeviceTelemetry.BATTERY)
|
||||||
|
.ifPresent(telemetryValue -> {
|
||||||
|
var batteryData = telemetryValue.getValue();
|
||||||
|
if (batteryData != null && !CollectionUtils.isEmpty(batteryData.getBatteries())) {
|
||||||
|
String batterySn = batteryData.getBatteries().get(0).getSn();
|
||||||
|
dto.setBatterySn(batterySn);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
return dto;
|
return dto;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue