添加充放电状态
This commit is contained in:
parent
a636c9a858
commit
8a418c063d
|
|
@ -287,6 +287,22 @@ public class DeviceTelemetry {
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 无人机 position_state.gps_number GPS 搜星数量
|
||||||
|
*/
|
||||||
|
|
||||||
|
public static final TelemetryKey<Integer> Position_State_GPS_Number = TelemetryKey.of(
|
||||||
|
"position_state.gps_number",
|
||||||
|
Integer.class,
|
||||||
|
value -> {
|
||||||
|
if (value == null) return null;
|
||||||
|
if (value instanceof Number) {
|
||||||
|
return ((Number) value).intValue();
|
||||||
|
}
|
||||||
|
return Integer.parseInt(value.toString());
|
||||||
|
}
|
||||||
|
);
|
||||||
/**
|
/**
|
||||||
* 风速
|
* 风速
|
||||||
*/
|
*/
|
||||||
|
|
@ -514,7 +530,8 @@ public class DeviceTelemetry {
|
||||||
Environment_Temperature,
|
Environment_Temperature,
|
||||||
Network_State_Rate,
|
Network_State_Rate,
|
||||||
Cover_State,
|
Cover_State,
|
||||||
Drone_Charge_State_Capacity_Percent
|
Drone_Charge_State_Capacity_Percent,
|
||||||
|
Position_State_GPS_Number
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -70,6 +70,9 @@ public class AircraftDetailDTO implements Serializable
|
||||||
/** RTK信号 */
|
/** RTK信号 */
|
||||||
private Integer rtkSignal;
|
private Integer rtkSignal;
|
||||||
|
|
||||||
|
/** GPS信号 */
|
||||||
|
private Integer gpsSignal;
|
||||||
|
|
||||||
/** 限高 */
|
/** 限高 */
|
||||||
private Integer maxAltitude;
|
private Integer maxAltitude;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -502,6 +502,14 @@ public class BufferDeviceImpl implements IBufferDeviceService
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
telemetryMap.get(DeviceTelemetry.Position_State_GPS_Number)
|
||||||
|
.ifPresent(telemetryValue -> {
|
||||||
|
Integer gpsNumber = telemetryValue.getValue();
|
||||||
|
if (gpsNumber != null) {
|
||||||
|
dto.setGpsSignal(gpsNumber);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
// 限高
|
// 限高
|
||||||
telemetryMap.get(DeviceTelemetry.Height_Limit)
|
telemetryMap.get(DeviceTelemetry.Height_Limit)
|
||||||
.ifPresent(telemetryValue -> dto.setMaxAltitude(telemetryValue.getValue()));
|
.ifPresent(telemetryValue -> dto.setMaxAltitude(telemetryValue.getValue()));
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue