设置升降架 X轴 Y轴的获取逻辑
This commit is contained in:
parent
81e6199812
commit
a367415167
|
|
@ -486,35 +486,42 @@ public class TuohengBufferDeviceImpl implements IBufferDeviceService {
|
||||||
|
|
||||||
// 设置机场设备自检数据(升降架、X轴夹器、Y轴夹器)
|
// 设置机场设备自检数据(升降架、X轴夹器、Y轴夹器)
|
||||||
log.info("---------- 解析机场设备自检数据 ----------");
|
log.info("---------- 解析机场设备自检数据 ----------");
|
||||||
telemetry.get(TuohengDeviceTelemetry.LIFTER_STATUS)
|
|
||||||
.ifPresent(value -> {
|
// 升降架状态,取不到值时默认为 NORMAL
|
||||||
|
String elevatorPosition = telemetry.get(TuohengDeviceTelemetry.LIFTER_STATUS)
|
||||||
|
.map(value -> {
|
||||||
Integer lifterStatus = value.getValue();
|
Integer lifterStatus = value.getValue();
|
||||||
log.info("LIFTER_STATUS 升降架状态原始值: {}", lifterStatus);
|
log.info("LIFTER_STATUS 升降架状态原始值: {}", lifterStatus);
|
||||||
// 0=正常, 非0=异常
|
// 0=正常, 非0=异常
|
||||||
String elevatorPosition = (lifterStatus != null && lifterStatus == 0) ? "NORMAL" : "ABNORMAL";
|
return (lifterStatus != null && lifterStatus == 0) ? "NORMAL" : "ABNORMAL";
|
||||||
|
})
|
||||||
|
.orElse("NORMAL");
|
||||||
dto.setElevatorPosition(elevatorPosition);
|
dto.setElevatorPosition(elevatorPosition);
|
||||||
log.info("设置升降架位置: {}", elevatorPosition);
|
log.info("设置升降架位置: {}", elevatorPosition);
|
||||||
});
|
|
||||||
|
|
||||||
telemetry.get(TuohengDeviceTelemetry.HOLDER_X_STATUS)
|
// X轴夹器状态,取不到值时默认为 NORMAL
|
||||||
.ifPresent(value -> {
|
String xAxisClampStatus = telemetry.get(TuohengDeviceTelemetry.HOLDER_X_STATUS)
|
||||||
|
.map(value -> {
|
||||||
Integer holderXStatus = value.getValue();
|
Integer holderXStatus = value.getValue();
|
||||||
log.info("HOLDER_X_STATUS X轴夹器状态原始值: {}", holderXStatus);
|
log.info("HOLDER_X_STATUS X轴夹器状态原始值: {}", holderXStatus);
|
||||||
// 0=正常, 非0=异常
|
// 0=正常, 非0=异常
|
||||||
String xAxisClampStatus = (holderXStatus != null && holderXStatus == 0) ? "NORMAL" : "ABNORMAL";
|
return (holderXStatus != null && holderXStatus == 0) ? "NORMAL" : "ABNORMAL";
|
||||||
|
})
|
||||||
|
.orElse("NORMAL");
|
||||||
dto.setXAxisClampStatus(xAxisClampStatus);
|
dto.setXAxisClampStatus(xAxisClampStatus);
|
||||||
log.info("设置X轴夹器状态: {}", xAxisClampStatus);
|
log.info("设置X轴夹器状态: {}", xAxisClampStatus);
|
||||||
});
|
|
||||||
|
|
||||||
telemetry.get(TuohengDeviceTelemetry.HOLDER_Y_STATUS)
|
// Y轴夹器状态,取不到值时默认为 NORMAL
|
||||||
.ifPresent(value -> {
|
String yAxisClampStatus = telemetry.get(TuohengDeviceTelemetry.HOLDER_Y_STATUS)
|
||||||
|
.map(value -> {
|
||||||
Integer holderYStatus = value.getValue();
|
Integer holderYStatus = value.getValue();
|
||||||
log.info("HOLDER_Y_STATUS Y轴夹器状态原始值: {}", holderYStatus);
|
log.info("HOLDER_Y_STATUS Y轴夹器状态原始值: {}", holderYStatus);
|
||||||
// 0=正常, 非0=异常
|
// 0=正常, 非0=异常
|
||||||
String yAxisClampStatus = (holderYStatus != null && holderYStatus == 0) ? "NORMAL" : "ABNORMAL";
|
return (holderYStatus != null && holderYStatus == 0) ? "NORMAL" : "ABNORMAL";
|
||||||
|
})
|
||||||
|
.orElse("NORMAL");
|
||||||
dto.setYAxisClampStatus(yAxisClampStatus);
|
dto.setYAxisClampStatus(yAxisClampStatus);
|
||||||
log.info("设置Y轴夹器状态: {}", yAxisClampStatus);
|
log.info("设置Y轴夹器状态: {}", yAxisClampStatus);
|
||||||
});
|
|
||||||
|
|
||||||
// 填充无人机状态信息
|
// 填充无人机状态信息
|
||||||
if (aircraftIotDeviceId != null) {
|
if (aircraftIotDeviceId != null) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue