Merge remote-tracking branch 'origin/dev' into dev

dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceEntity.java

@@ -92,4 +92,13 @@ public class DeviceEntity implements Serializable {
     @TableField(value = "pro_id")
     private Integer proId;
 
+    @TableField(value = "latitude")
+    private Float latitude;
+
+    @TableField(value = "longitude")
+    private Float longitude;
+
+    @TableField(value = "height")
+    private Float height;
+
 }

dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceServiceImpl.java

@@ -423,13 +423,16 @@ public class DeviceServiceImpl implements IDeviceService {
                     .firmwareStatus(DeviceFirmwareStatusEnum.NOT_UPGRADE)
                     .videoId(dockVideoId)
                     .proId(ObjectUtil.isNotEmpty(entity.getProId())?entity.getProId():null)
+                    .latitude(entity.getLatitude())
+                    .longitude(entity.getLongitude())
+                    .height(entity.getHeight())
                     .thingVersion(entity.getVersion()).build();
         } catch (CloudSDKException e) {
             log.error(e.getLocalizedMessage() + "Entity: {}", entity);
         }
         DeviceDTO deviceDTO = builder.build();
         if(deviceDTO.getDomain() != null && deviceDTO.getDomain().getDomain() == 3 && deviceDTO.getLatitude() != null){
-            Optional<OsdDockDrone> deviceOsd = deviceRedisService.getDeviceOsd(entity.getDeviceSn(), OsdDockDrone.class);
+            Optional<OsdDock> deviceOsd = deviceRedisService.getDeviceOsd(entity.getDeviceSn(), OsdDock.class);
             if(!deviceOsd.isEmpty()){
                 deviceDTO.setLatitude(deviceOsd.get().getLatitude());
                 deviceDTO.setLongitude(deviceOsd.get().getLongitude());
@@ -748,6 +751,9 @@ public class DeviceServiceImpl implements IDeviceService {
                 .compatibleStatus(dto.getFirmwareStatus() == null ? null :
                         DeviceFirmwareStatusEnum.CONSISTENT_UPGRADE != dto.getFirmwareStatus())
                 .deviceDesc(dto.getDeviceDesc())
+                .latitude(dto.getLatitude())
+                .longitude(dto.getLongitude())
+                .height(dto.getHeight())
                 .proId(dto.getProId() == null ? null : dto.getProId())
                 .build();
     }

dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKDeviceService.java

@@ -167,6 +167,7 @@ public class SDKDeviceService extends AbstractDeviceService {
             && ((deviceOpt.get().getLatitude() == null && deviceOpt.get().getLongitude() == null)) || (request.getData().getLatitude() != deviceOpt.get().getLatitude() && request.getData().getLongitude() != deviceOpt.get().getLongitude())){
             deviceOpt.get().setLatitude(request.getData().getLatitude());
             deviceOpt.get().setLongitude(request.getData().getLongitude());
+            deviceOpt.get().setHeight(request.getData().getHeight());
             deviceRedisService.setDeviceOnline(deviceOpt.get());
             deviceService.updateDevice(deviceOpt.get());
         }

dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/WaylineJobController.java

@@ -133,8 +133,8 @@ public class WaylineJobController {
     public HttpResultResponse getJobIdByDeviceSn(@PathVariable(name = "workspace_id") String workspaceId,
                                         @RequestParam(name = "device_sn") String deviceSn, HttpServletRequest req, HttpServletResponse rsp) {
             Optional<EventsReceiver<FlighttaskProgress>> runningWaylineJob = waylineRedisService.getRunningWaylineJob(deviceSn);
-            if(runningWaylineJob.isEmpty())HttpResultResponse.error("不存在");
-            return HttpResultResponse.success(runningWaylineJob.get().getOutput().getExt().getFlightId()==null?runningWaylineJob.get().getOutput().getExt().getFlightId():null);
+            if(runningWaylineJob.isEmpty())return HttpResultResponse.error("不存在");
+            return HttpResultResponse.success(runningWaylineJob.get().getOutput().getExt().getFlightId()!=null?runningWaylineJob.get().getOutput().getExt().getFlightId():null);
     }
 
     @GetMapping("/{workspace_id}/getJobFileUrlByDeviceSn")