THENG
/
a-tuoheng-device
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: THENG:9943cfe1f2b6cd9b38612f7775951bd5f13dcaf9
Branches Tags
THENG:main
THENG:test
THENG:dev
THENG:f_add_shuxing
THENG:f_open_all
THENG:release
THENG:model
..
compare: THENG:cbfd77da5cbb99624123a6f4c03cb5b4c69b1a4d
Branches Tags
THENG:test
THENG:dev
THENG:f_add_shuxing
THENG:f_open_all
THENG:main
THENG:release
THENG:model

No commits in common. "9943cfe1f2b6cd9b38612f7775951bd5f13dcaf9" and "cbfd77da5cbb99624123a6f4c03cb5b4c69b1a4d" have entirely different histories.
9943cfe1f2 ... cbfd77da5c

3 changed files with 5 additions and 15 deletions
Show Stats Expand all files Collapse all files

5
src/main/java/com/ruoyi/device/domain/model/thingsboard/constants/DeviceTelemetry.java
View File

@ -4,7 +4,6 @@ import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.ruoyi.device.domain.model.thingsboard.AttributeKey;
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.battery.BatteryData;
@ -306,7 +305,9 @@ public class DeviceTelemetry {
);
/**
* 无人机特有
*/
/**
* 无人机挂载信息

2
src/main/java/com/ruoyi/device/service/dto/AircraftDetailDTO.java
View File

@ -43,6 +43,8 @@ public class AircraftDetailDTO implements Serializable
// ========== AircraftDetailVO 特有字段 ==========
/** 无人机版本 */
private String aircraftVersion;

13
src/main/java/com/ruoyi/device/service/impl/BufferDeviceImpl.java
View File

@ -151,9 +151,6 @@ public class BufferDeviceImpl implements IBufferDeviceService
AircraftDetailDTO dto = getChangeAbleAirDetailDTO(device.getIotDeviceId());
dto.setAircraftId(aircraft.getAircraftId());
dto.setAircraftName(aircraft.getAircraftName());
dto.setSnNumber(device.getDeviceSn());
dto.setBindTime(device.getCreateTime().getTime());
List<AircraftPayload> aircraftPayloads =
aircraftPayloadDomain.selectAircraftPayloadByAircraftId(aircraft.getAircraftId());
@ -173,16 +170,6 @@ public class BufferDeviceImpl implements IBufferDeviceService
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;
}