Compare commits

..

No commits in common. "ec5dba7fc59bafbfb8d2c52224adb9fec6be31e5" and "372a289cf7bdfcd2236fb7c72ca374673d408e70" have entirely different histories.

2 changed files with 1 additions and 38 deletions

View File

@ -90,10 +90,7 @@ public class DeviceTelemetry {
); );
/**
* 舱门状态
* {"0":"关闭","1":"打开","2":"半开","3":"舱盖状态异常"}
*/
public static final TelemetryKey<Integer> Cover_State = TelemetryKey.of( public static final TelemetryKey<Integer> Cover_State = TelemetryKey.of(
"cover_state", "cover_state",
Integer.class, Integer.class,

View File

@ -17,7 +17,6 @@ import com.ruoyi.device.api.enums.AircraftStatusEnum;
import com.ruoyi.device.api.enums.DockStatusEnum; import com.ruoyi.device.api.enums.DockStatusEnum;
import com.ruoyi.device.api.enums.NetworkTypeEnum; import com.ruoyi.device.api.enums.NetworkTypeEnum;
import com.ruoyi.device.api.enums.AirConditionerStatusEnum; import com.ruoyi.device.api.enums.AirConditionerStatusEnum;
import com.ruoyi.device.api.enums.CabinDoorStatusEnum;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -225,15 +224,6 @@ public class BufferDeviceImpl implements IBufferDeviceService
} }
}); });
// 舱门状态枚举值0-关闭1-打开2-半开3-舱盖状态异常
telemetryMap.get(DeviceTelemetry.Cover_State)
.ifPresent(telemetryValue -> {
Integer coverState = telemetryValue.getValue();
if (coverState != null) {
dto.setCabinDoorStatus(mapCabinDoorState(coverState));
}
});
return dto; return dto;
} }
@ -305,30 +295,6 @@ public class BufferDeviceImpl implements IBufferDeviceService
} }
} }
/**
* 将舱门状态代码映射到 CabinDoorStatusEnum
* @param coverState 舱门状态代码0-关闭1-打开2-半开3-舱盖状态异常
* @return 舱门状态枚举的 code
*/
private String mapCabinDoorState(Integer coverState) {
if (coverState == null) {
return null;
}
switch (coverState) {
case 0:
return CabinDoorStatusEnum.CLOSED.getCode();
case 1:
return CabinDoorStatusEnum.OPEN.getCode();
case 2:
return CabinDoorStatusEnum.HALF_OPEN.getCode();
case 3:
return CabinDoorStatusEnum.ABNORMAL.getCode();
default:
return null;
}
}
private AircraftDetailDTO getChangeAbleAirDetailDTO(String deviceIotId) private AircraftDetailDTO getChangeAbleAirDetailDTO(String deviceIotId)
{ {