Browse Source

1.prd 配置更新
2.飞行航点记录优化

S0025136190 1 year ago
parent
commit
8e2acd0494

+ 5 - 4
Backend/sample/src/main/java/com/dji/sample/manage/service/impl/SDKDeviceService.java

@@ -271,6 +271,7 @@ public class SDKDeviceService extends AbstractDeviceService {
             case RETURN_AUTO:
             case LIVE_FLIGHT_CONTROLS:
             case LANDING_THREE_PROPELLER:
+            case APAS:
                 FlightTaskDTO flightTask = getFlightTask(device);
                 if(flightTask == null) {
                     Optional<String> lockOpt = deviceRedisService.getDroneFlightTaskLock(device.getDeviceSn());
@@ -416,10 +417,10 @@ public class SDKDeviceService extends AbstractDeviceService {
     }
 
     private boolean isSamePoint(OsdRcDrone data,FlightTrackEntity lastPoint) {
-        return data.getLongitude().doubleValue() == lastPoint.getLongitude().doubleValue()
-                && data.getLatitude().doubleValue() == lastPoint.getLatitude().doubleValue()
-                && data.getHeight().doubleValue() == lastPoint.getAltitude().doubleValue()
-                && data.getElevation().doubleValue() == lastPoint.getElevation().doubleValue();
+        return data.getLongitude().doubleValue() == lastPoint.getLongitude()
+                && data.getLatitude().doubleValue() == lastPoint.getLatitude()
+                && data.getHeight().doubleValue() == lastPoint.getAltitude()
+                && data.getElevation().doubleValue() == lastPoint.getElevation();
     }
 
     private int updateFlightTask(FlightTaskDTO task) {

+ 4 - 2
Web/env/.env.production

@@ -2,7 +2,9 @@
 VITE_ENV = 'production'
 
 # Api 地址
-VITE_API_URL = 'http://49.234.30.234:6789'
+VITE_API_URL = 'https://uas.ryuiso.com'
+#VITE_API_URL = 'http://118.195.177.247:6789'
 
 # WebSocket 地址
-VITE_WEBSOCKET_URL = 'ws://49.234.30.234:6789/api/v1/ws'
+VITE_WEBSOCKET_URL = 'wss://uas.ryuiso.com:443/api/v1/ws'
+#VITE_WEBSOCKET_URL = 'ws://118.195.177.247:6789/api/v1/ws'