Commit 4f655e37 by gdj

修改遥控器上云bug。修复MeasureTargetStateEnum。

parent 31c54676
...@@ -20,6 +20,8 @@ public enum MeasureTargetStateEnum { ...@@ -20,6 +20,8 @@ public enum MeasureTargetStateEnum {
TOO_FAR(2), TOO_FAR(2),
NO_SIGNAL(3), NO_SIGNAL(3),
UNKNOWN(-1);
; ;
private final int state; private final int state;
...@@ -36,7 +38,8 @@ public enum MeasureTargetStateEnum { ...@@ -36,7 +38,8 @@ public enum MeasureTargetStateEnum {
@JsonCreator @JsonCreator
public static MeasureTargetStateEnum find(int state) { public static MeasureTargetStateEnum find(int state) {
return Arrays.stream(values()).filter(stateEnum -> stateEnum.state == state).findAny() return Arrays.stream(values()).filter(stateEnum -> stateEnum.state == state).findAny()
.orElseThrow(() -> new CloudSDKException(MeasureTargetStateEnum.class, state)); // .orElseThrow(() -> new CloudSDKException(MeasureTargetStateEnum.class, state));
.orElse(UNKNOWN);
} }
} }
...@@ -232,7 +232,7 @@ public class SDKDeviceService extends AbstractDeviceService { ...@@ -232,7 +232,7 @@ public class SDKDeviceService extends AbstractDeviceService {
public void osdRemoteControl(TopicOsdRequest<OsdRemoteControl> request, MessageHeaders headers) { public void osdRemoteControl(TopicOsdRequest<OsdRemoteControl> request, MessageHeaders headers) {
String from = request.getFrom(); String from = request.getFrom();
Optional<DeviceDTO> deviceOpt = deviceRedisService.getDeviceOnline(from); Optional<DeviceDTO> deviceOpt = deviceRedisService.getDeviceOnline(from);
if (deviceOpt.isEmpty()) { if (deviceOpt.isEmpty() || !StringUtils.hasText(deviceOpt.get().getWorkspaceId())) {
deviceOpt = deviceService.getDeviceBySn(from); deviceOpt = deviceService.getDeviceBySn(from);
if (deviceOpt.isEmpty()) { if (deviceOpt.isEmpty()) {
log.error("Please restart the drone."); log.error("Please restart the drone.");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment