流媒体接口、实时轨迹推送问题修复

Backend/sample/src/main/java/com/dji/sample/manage/service/impl/SDKDeviceService.java

@@ -260,6 +260,7 @@ public class SDKDeviceService extends AbstractDeviceService {
     private void toAddFilghtPoint(String from, DeviceDTO device,OsdRcDrone data) {
 
         switch (data.getModeCode()) {
+            //case IDLE:
             case TAKEOFF_FINISHED:
             case MANUAL:
             case TAKEOFF_AUTO:
@@ -299,17 +300,23 @@ public class SDKDeviceService extends AbstractDeviceService {
 
     private void pushFlyTrackToWeb(String from, DeviceDTO device,OsdRcDrone data) {
         //推送实时轨迹信息
-        List<FlightTrackDTO> trackList = getFlightLine(device,data);
+        List<FlightTrackDTO> trackList = getFlightLine(device);
         if(!CollectionUtils.isEmpty(trackList)) {
-            deviceService.pushOsdDataToWeb(device.getWorkspaceId(), BizCodeEnum.DRONE_FLY_TRACK, from, data);
+            deviceService.pushOsdDataToWeb(device.getWorkspaceId(), BizCodeEnum.DRONE_FLY_TRACK, from, trackList);
         }
+
+        //模拟第二条实时航线
+        List<FlightTrackDTO> flightPoints =  flightTaskService.getRTFlightTrackByTaskId(44);
+        deviceService.pushOsdDataToWeb(device.getWorkspaceId(), BizCodeEnum.DRONE_FLY_TRACK, from, trackList);
+
+
     }
 
-    private List<FlightTrackDTO> getFlightLine(DeviceDTO device,OsdRcDrone data) {
+    private List<FlightTrackDTO> getFlightLine(DeviceDTO device) {
         Optional<List<FlightTrackDTO>> optList = deviceRedisService.getDroneFlyTrack(device.getDeviceSn());
         if(!optList.isPresent() || optList.get().isEmpty()) {
             //获取飞行任务（轨迹）
-            FlightTaskDTO task = getFlightTask(device, data, false);
+            FlightTaskDTO task = getFlightTask(device, false);
             if(task == null) {
                 return null;
             }
@@ -361,7 +368,7 @@ public class SDKDeviceService extends AbstractDeviceService {
             }
             if(isAdd) {
                 //获取飞行任务（轨迹）
-                FlightTaskDTO task = getFlightTask(device, data, true);
+                FlightTaskDTO task = getFlightTask(device, true);
                 log.info("获取飞行轨迹任务:" + task.toString());
                 //添加Home信息
                 if(!lastPoint.isPresent()) {
@@ -421,12 +428,12 @@ public class SDKDeviceService extends AbstractDeviceService {
         return 0;
     }
 
-    private FlightTaskDTO getFlightTask(DeviceDTO device,OsdRcDrone data,boolean isCreate) {
+    private FlightTaskDTO getFlightTask(DeviceDTO device,boolean isCreate) {
         //获取任务名称
         FlightTaskDTO flightTaskDTO = null;
         Optional<FlightTaskDTO> opt = deviceRedisService.getDroneFlightTask(device.getDeviceSn());
         if(opt.isPresent()) {
-            return opt.get();
+            flightTaskDTO = opt.get();
         } else {
             //查询当天未完成的任务
             flightTaskDTO = flightTaskService.getCurrentFlightTask(device.getWorkspaceId(),device.getDeviceSn());
@@ -444,8 +451,9 @@ public class SDKDeviceService extends AbstractDeviceService {
                     .createTime(curTime.getTime())
                     .username(UserRequest.getCurrentUser() != null ? UserRequest.getCurrentUser().getUsername() : "system")
                     .build());
-            deviceRedisService.setDroneFlightTask(device.getDeviceSn(),flightTaskDTO);
+
         }
+        deviceRedisService.setDroneFlightTask(device.getDeviceSn(),flightTaskDTO);
         return flightTaskDTO;
     }
 

Backend/sample/src/main/java/com/dji/sample/manage/service/impl/UserServiceImpl.java

@@ -250,7 +250,7 @@ public class UserServiceImpl implements IUserService {
             userEntity.setUpdateTime(System.currentTimeMillis());
             int cnt = mapper.update(userEntity, new LambdaUpdateWrapper<UserEntity>()
                     .eq(UserEntity::getClientId, clientId)
-                    .eq(UserEntity::getUserId, userEntity.getUserId()));
+                    .eq(UserEntity::getUserType, UserTypeEnum.API.getVal()));
             return cnt > 0 ? HttpResultResponse.success():HttpResultResponse.error("更新失败");
         }
     }

Backend/sample/src/main/java/com/dji/sample/map/service/impl/FlightTrackTaskServiceImpl.java

@@ -146,6 +146,18 @@ public class FlightTrackTaskServiceImpl implements IFlightTrackTaskService {
 
             //照片坐标
             List<MediaFileEntity> mediaFileEntities = fileService.getFlightTrackMediaFiles(task.getWorkspaceId(),task.getDeviceSn(),task.getBeginTime(),endTime);
+            //按拍摄时间去重
+            List<MediaFileEntity> uniqueMediaRecords = mediaFileEntities.stream()
+                    .collect(Collectors.groupingBy(
+                            MediaFileEntity::getPictureTime,
+                            Collectors.collectingAndThen(
+                                    Collectors.toList(),
+                                    list -> list.get(0)
+                            )
+                    ))
+                    .values()
+                    .stream()
+                    .collect(Collectors.toList());
 
             //Home点
             Optional<FlightTrackEntity> homePointOpt = filghtPoints.stream().filter(fp ->FlightPointTypeEnum.HOME.getType().intValue() == fp.getType().intValue()).findFirst();
@@ -169,8 +181,8 @@ public class FlightTrackTaskServiceImpl implements IFlightTrackTaskService {
                 newFilghtTrackList.add(0,firstPoint);
                 newFilghtTrackList.add(lastPoint);
             //照片
-            } else if(!CollectionUtils.isEmpty(mediaFileEntities)) {
-                List<FlightTrackEntity> mediaTrackList = mediaFileEntities.stream().map(m -> mediaDTOToFlightTrackDTO(task.getId(), m)).sorted(Comparator.comparing(FlightTrackEntity::getCreateTime)).collect(Collectors.toList());
+            } else if(!CollectionUtils.isEmpty(uniqueMediaRecords)) {
+                List<FlightTrackEntity> mediaTrackList = uniqueMediaRecords.stream().map(m -> mediaDTOToFlightTrackDTO(task.getId(), m)).sorted(Comparator.comparing(FlightTrackEntity::getCreateTime)).collect(Collectors.toList());
                 newFilghtTrackList = mediaTrackList;
                 newFilghtTrackList.add(0,firstPoint);
                 newFilghtTrackList.add(lastPoint);