From 2c2bc8614c8ea0ce386369eb4924da1e6aa052d1 Mon Sep 17 00:00:00 2001
From: husq <931347610@qq.com>
Date: Wed, 27 Sep 2023 09:35:57 +0800
Subject: [PATCH] 添加环境配置区分
---
src/api/wayline.ts | 45 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 34 insertions(+), 11 deletions(-)
diff --git a/src/api/wayline.ts b/src/api/wayline.ts
index 04c017c..191174b 100644
--- a/src/api/wayline.ts
+++ b/src/api/wayline.ts
@@ -3,7 +3,7 @@
import { TaskType, TaskStatus, OutOfControlAction } from '/@/types/task'
import { WaylineType } from '/@/types/wayline'
-const HTTP_PREFIX = '/api/drone'
+const HTTP_PREFIX = '/wayline/api/v1'
// Get Wayline Files
export const getWaylineFiles = async function (wid: string, body: {}): Promise<IWorkspaceResponse<any>> {
@@ -28,6 +28,12 @@
return result.data
}
}
+// get Wayline File
+export const getWayLineFile = async function (workspaceId: string, waylineId: string) {
+ const url = `${HTTP_PREFIX}/workspaces/${workspaceId}/waylines/${waylineId}/urlData`
+ const result = await request.get(url)
+ return result.data
+}
// Delete Wayline File
export const deleteWaylineFile = async function (workspaceId: string, waylineId: string): Promise<IWorkspaceResponse<any>> {
@@ -42,7 +48,7 @@
waylineId:string
dockSn: string
workspaceId: string
- taskType: number
+ taskType: TaskType
executeSingleTime?: string
repeatExecuteTimeArr?: string[]
executeStartTime?: string
@@ -59,12 +65,20 @@
finishAction: number
breakContinue: number
}
-
-
-
+export interface CreatePlan {
+ name: string,
+ file_id: string,
+ dock_sn: string,
+ task_type: TaskType, // 任务类型
+ wayline_type: WaylineType, // 航线类型
+ task_days?: number[] // 执行任务的日期（秒）
+ task_periods?: number[][] // 执行任务的时间点（秒）
+ rth_altitude: number // 相对机场返航高度 20 - 500
+ out_of_control_action: OutOfControlAction // 失控动作
+}
// 新增计划
-export const createPlan = async function (plan:any): Promise<IWorkspaceResponse<any>> {
- const url = `${HTTP_PREFIX}/waylineJob/add`
+export const createPlan = async function (workspaceId: string, plan: CreatePlan): Promise<IWorkspaceResponse<any>> {
+ const url = `${HTTP_PREFIX}/workspaces/${workspaceId}/flight-tasks`
const result = await request.post(url, plan)
return result.data
}
@@ -94,10 +108,19 @@
uploaded_count: number // 已上传媒体数量
}
+export interface TaskQueryParam{
+ dockSn?:string
+ taskType?:any
+ status?:any
+ name?:string
+ startTime?:string
+ endTime?:string
+}
+
// 获取计划列表（分页）
-export const getWaylineJobs = async function (workspaceId: string, page: IPage): Promise<IListWorkspaceResponse<Task>> {
- const url = `${HTTP_PREFIX}/waylineJob/getPage`
- const result = await request.get(url,{params:{workspaceId}})
+export const getWaylineJobs = async function (workspaceId: string, page: IPage, params:TaskQueryParam): Promise<IListWorkspaceResponse<Task>> {
+ const url = `${HTTP_PREFIX}/workspaces/${workspaceId}/jobs?page=${page.page}&page_size=${page.page_size}`
+ const result = await request.get(url, { params })
return result.data
}
@@ -134,7 +157,7 @@
// Upload Wayline file
export const importKmzFile = async function (workspaceId: string, file: {}): Promise<IWorkspaceResponse<any>> {
- const url = `${HTTP_PREFIX}/waylineFile/upload`
+ const url = `${HTTP_PREFIX}/workspaces/${workspaceId}/waylines/file/upload`
const result = await request.post(url, file, {
headers: {
'Content-Type': 'multipart/form-data',
--
Gitblit v1.9.3