Browse Source

航线点位经纬度修改 错误信息返回

S0025136190 1 year ago
parent
commit
693a894b3e

+ 2 - 2
Backend/sample/src/main/java/com/dji/sample/common/util/WaylineUtil.java

@@ -58,8 +58,8 @@ public class WaylineUtil {
                         // 获取coordinates
                         String coordinates = getTagValue(placemark, "coordinates");
                         String[] coo = coordinates.split(",");
-                        waylinePointDTO.setLatitude(Double.valueOf(coo[0]));
-                        waylinePointDTO.setLongitude(Double.valueOf(coo[1]));
+                        waylinePointDTO.setLatitude(Double.valueOf(coo[1]));
+                        waylinePointDTO.setLongitude(Double.valueOf(coo[0]));
                         // 获取wpml:index
                         String index = getTagValue(placemark, "wpml:index");
                         waylinePointDTO.setPointIndex(index);

+ 2 - 0
Backend/sample/src/main/java/com/dji/sample/wayline/model/dto/WaylineJobDTO.java

@@ -72,4 +72,6 @@ public class WaylineJobDTO {
     private Integer waylinePrecisionType;
 
     private FlighttaskBreakPoint breakPoint;
+
+    private String errorText;
 }

+ 4 - 3
Backend/sample/src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java

@@ -286,6 +286,9 @@ public class WaylineJobServiceImpl implements IWaylineJobService {
                     .orElse(null));
         }
 
+        if (Objects.nonNull(entity.getErrorCode())) {
+            builder.errorText(WaylineErrorCodeEnum.find(entity.getErrorCode()).getMessage());
+        }
         if (entity.getMediaCount() == 0) {
             return builder.build();
         }
@@ -305,9 +308,7 @@ public class WaylineJobServiceImpl implements IWaylineJobService {
         if (uploadedSize >= entity.getMediaCount()) {
             return builder.uploadedCount(uploadedSize).build();
         }
-        if (Objects.nonNull(entity.getErrorCode())) {
-            builder.endTime(LocalDateTime.ofInstant(Instant.ofEpochMilli(entity.getEndTime()), ZoneId.systemDefault()));
-        }
+
         RedisOpsUtils.hashSet(countKey, entity.getJobId(),
                 MediaFileCountDTO.builder()
                         .jobId(entity.getJobId())