From 5fe88759ff433830c6d24fce8e3b0f6ecaff66e4 Mon Sep 17 00:00:00 2001
From: husq <931347610@qq.com>
Date: Thu, 14 Sep 2023 18:21:13 +0800
Subject: [PATCH] 功能修改、接口修改
---
src/api/wayline.ts | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/src/api/wayline.ts b/src/api/wayline.ts
index cb685db..7ce981c 100644
--- a/src/api/wayline.ts
+++ b/src/api/wayline.ts
@@ -3,12 +3,12 @@
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 (params:any): Promise<IWorkspaceResponse<any>> {
- const url = `${HTTP_PREFIX}/waylineFile/getList`
- const result = await request.get(url, { params })
+export const getWaylineFiles = async function (wid: string, body: {}): Promise<IWorkspaceResponse<any>> {
+ const url = `${HTTP_PREFIX}/workspaces/${wid}/waylines?order_by=${body.order_by}&page=${body.page}&page_size=${body.page_size}`
+ const result = await request.get(url)
return result.data
}
@@ -59,10 +59,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,8 +104,8 @@
// 获取计划列表（分页）
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 } })
+ const url = `${HTTP_PREFIX}/workspaces/${workspaceId}/jobs?page=${page.page}&page_size=${page.page_size}`
+ const result = await request.get(url)
return result.data
}
@@ -132,11 +142,8 @@
// 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, {
- params: {
- projectId: workspaceId
- },
headers: {
'Content-Type': 'multipart/form-data',
}
--
Gitblit v1.9.3