轨迹回放 bug修复

Backend/sample/src/main/java/com/dji/sample/map/model/dto/FlightTrackDTO.java

@@ -35,5 +35,5 @@ public class FlightTrackDTO {
 
     private Integer type;
 
-    private Integer index;
+    private Integer pointIndex;
 }

Backend/sample/src/main/java/com/dji/sample/map/model/entity/FlightTrackEntity.java

@@ -45,7 +45,7 @@ public class FlightTrackEntity implements Serializable {
     @TableField("type")
     private Integer type;
 
-    @TableField("type")
-    private Integer index;
+    @TableField("point_index")
+    private Integer pointIndex;
 }
 

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

@@ -137,7 +137,7 @@ public class FlightTrackTaskServiceImpl implements IFlightTrackTaskService {
                     .sorted(Comparator.comparing(FlightTrackEntity::getCreateTime)).collect(Collectors.toList());
             //航线坐标
             List<FlightTrackEntity> waylinePoints = filghtPoints.stream().filter(fp ->FlightPointTypeEnum.WAYLINE.getType().intValue() == fp.getType().intValue())
-                    .sorted(Comparator.comparing(FlightTrackEntity::getIndex)).collect(Collectors.toList());
+                    .sorted(Comparator.comparing(FlightTrackEntity::getPointIndex)).collect(Collectors.toList());
 
             //照片坐标
             List<MediaFileEntity> mediaFileEntities = fileService.getFlightTrackMediaFiles(task.getWorkspaceId(),task.getDeviceSn(),task.getBeginTime(),endTime);
@@ -151,10 +151,11 @@ public class FlightTrackTaskServiceImpl implements IFlightTrackTaskService {
                 homePoint = FlightTrackEntity.builder().type(FlightPointTypeEnum.HOME.getType())
                         .latitude(normalPoints.get(0).getLatitude())
                         .longitude(normalPoints.get(0).getLongitude())
+                        .createTime(normalPoints.get(0).getCreateTime())
                         .build();
             }
             FlightTrackEntity firstPoint = normalPoints.get(0);
-            FlightTrackEntity lastPoint = normalPoints.get(waylinePoints.size() - 1);
+            FlightTrackEntity lastPoint = normalPoints.get(normalPoints.size() - 1);
 
             List<FlightTrackEntity> newFilghtTrackList = null;
             //航线飞行
@@ -269,6 +270,7 @@ public class FlightTrackTaskServiceImpl implements IFlightTrackTaskService {
                     .altitude(flightTrackEntity.getAltitude())
                     .modeCode(flightTrackEntity.getModeCode())
                     .elevation(flightTrackEntity.getElevation())
+                    .type(flightTrackEntity.getType())
                     .createTime(LocalDateTime.ofInstant(Instant.ofEpochMilli(flightTrackEntity.getCreateTime()), ZoneId.systemDefault()))
                     ;
         }