Merge branch 'master' of https://git.zyuas.com/DJI/shangyun

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);

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;
 }

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())

Backend/sample/src/main/resources/application.yml

@@ -2,7 +2,7 @@ server:
   port: 6789
 spring:
   profiles:
-    active: test
+    active: prd
   main:
     allow-bean-definition-overriding: true
   application:
@@ -189,8 +189,8 @@ custom-config:
   #流媒体接口地址
   smspTokenUrl: http://smsp.jkec.info:18000/api/v1/login
   smspRtmpUrl: http://smsp.jkec.info:18000/api/v1/channelstream/all
-  smspTokenUrl2: https://smsp.jkec.info:4443/api/v1/login
-  smspRtmpUrl2: https://smsp.jkec.info:4443/api/v1/channelstream/all
+  smspTokenUrl2: https://smsp.jkec.info:30299/api/v1/login
+  smspRtmpUrl2: https://smsp.jkec.info:30299/api/v1/channelstream/all
   #流媒体客户端ID
   clientId: e534550a85d94faba73e8040e76514bc
   #上级系统客户端ID