Merge remote-tracking branch 'origin/develop' into feature_v1.0

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/tzhl/constant/TZHLConstant.java

@@ -28,12 +28,12 @@ public interface TZHLConstant {
     /**
      * 天翼星云机场平台：获取机场列表
      */
-    String TIAN_YI_API_AIRPORT_LIST = "/prod-api/openapi/ctuav/v4/shelter/list";
+    String TIAN_YI_API_AIRPORT_LIST = "/prod-api/ctuav/openapi/ctuav/v4/shelter/list";
 
     /**
      * 天翼星云机场平台：航线列表（跟据方舱序列号查询待开发）
      */
-    String TIAN_YI_API_FLY_LINE_LIST = "/prod-api/openapi/ctuav/v4/flyline/list";
+    String TIAN_YI_API_FLY_LINE_LIST = "/prod-api/ctuav/openapi/ctuav/v4/flyline/list";
 
     /**
      * 天翼星云机场平台：下发任务
@@ -43,17 +43,17 @@ public interface TZHLConstant {
     /**
      * 天翼星云机场平台：飞行日志回调
      */
-    String TIAN_YI_API_FLIGHT_LOG_CALLBACK = "/prod-api/ctuav/mapper/fly/log/listAll";
+    String TIAN_YI_API_FLIGHT_LOG = "/prod-api/ctuav/mapper/fly/log/listAll";
 
     /**
      * 天翼星云机场平台：飞行画面
      */
-    String TIAN_YI_API_FLIGHT_SCREEN = "/prod-api/openapi/ctuav/v4/onlineuav/list";
+    String TIAN_YI_API_FLIGHT_SCREEN = "/prod-api/ctuav/openapi/ctuav/v4/onlineuav/list";
 
     /**
      * 天翼星云机场平台:飞行数据
      */
-    String TIAN_YI_API_FLIGHT_DATA = "/prod-api/openapi/ctuav/v4/flydata/list";
+    String TIAN_YI_API_FLIGHT_DATA = "/prod-api/ctuav/openapi/ctuav/v4/flydata/list";
 
 
 }

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/tzhl/service/airport/TZHLGetAirportListService.java

@@ -75,9 +75,7 @@ public class TZHLGetAirportListService {
         if(ObjectUtil.isNull(getAirportListDto)){
             return JsonResult.error("查询机场列表数据为空");
         }
-
         return JsonResult.success(getAirportListDto);
-
     }
 
     private JsonResult check(String token) {