From 3667807a7b7418efc090ee3fa6a6b734bc3080bf Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 13 Sep 2023 20:36:29 +0800
Subject: [PATCH] Merge branch 'develop' of http://s16s652780.51mypc.cn:49896/r/yskj/iot_drone_web into develop
---
src/api/manage.ts | 90 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 77 insertions(+), 13 deletions(-)
diff --git a/src/api/manage.ts b/src/api/manage.ts
index 1fe6b06..4b28e23 100644
--- a/src/api/manage.ts
+++ b/src/api/manage.ts
@@ -1,11 +1,14 @@
+import { Firmware, FirmwareQueryParam, FirmwareUploadParam } from '/@/types/device-firmware'
import request, { CommonListResponse, IListWorkspaceResponse, IPage, IWorkspaceResponse } from '/@/api/http/request'
-const HTTP_PREFIX = '/manage/api/v1'
+import { Device } from '/@/types/device'
+
+const HTTP_PREFIX = 'api/system'
+const HTTP_PREFIX_MANAGE='api/drone'
// login
export interface LoginBody {
username: string,
password: string,
- flag: number,
}
export interface BindBody {
device_sn: string,
@@ -22,12 +25,18 @@
begin_time: number,
end_time: number,
message: string,
- domain: string,
+ domain: number,
}
export const login = async function (body: LoginBody): Promise<IWorkspaceResponse<any>> {
- const url = `${HTTP_PREFIX}/login`
+ const url = 'api/system/auth/login/password'
const result = await request.post(url, body)
+ return result.data
+}
+
+export const loginOut = async function (): Promise<IWorkspaceResponse<any>> {
+ const url = `api/${HTTP_PREFIX}/logout`
+ const result = await request.delete(url)
return result.data
}
@@ -52,10 +61,10 @@
return result.data
}
-// Get Device Topo
-export const getDeviceTopo = async function (workspace_id: string): Promise<IWorkspaceResponse<any>> {
- const url = `${HTTP_PREFIX}/devices/${workspace_id}/devices`
- const result = await request.get(url)
+// 获取在线设备信息
+export const getDeviceTopo = async function (params:any): Promise<IWorkspaceResponse<any>> {
+ const url = `${HTTP_PREFIX_MANAGE}/manage/device`
+ const result = await request.get(url,{params})
return result.data
}
@@ -92,6 +101,17 @@
return result.data
}
+export const getUserPage = async function (params: any, body: IPage): Promise<CommonListResponse<any>> {
+
+ console.log(params,"++++++++++++++")
+
+ const url = `${HTTP_PREFIX}/user/page`
+ const result = await request.get(url,{params:{...params,pageNum:body.current,pageSize:body.size}})
+ return result.data
+}
+
+
+
export const updateUserInfo = async function (wid: string, user_id: string, body: {}): Promise<IWorkspaceResponse<any>> {
const url = `${HTTP_PREFIX}/users/${wid}/users/${user_id}`
const result = await request.put(url, body)
@@ -116,11 +136,30 @@
return result.data
}
-export const getBindingDevices = async function (workspace_id: string, body: IPage, domain: string): Promise<IWorkspaceResponse<any>> {
+/**
+ * 获取绑定设备信息
+ * @param workspace_id
+ * @param body
+ * @param domain
+ * @returns
+ */
+export const getBindingDevices = async function (workspace_id: string, body: IPage, domain: number): Promise<IListWorkspaceResponse<Device>> {
const url = `${HTTP_PREFIX}/devices/${workspace_id}/devices/bound?&page=${body.page}&page_size=${body.page_size}&domain=${domain}`
const result = await request.get(url)
return result.data
}
+
+/**
+ * 获取设备信息
+ * @param params
+ */
+export const getDeviceList = async function (params:any): Promise<IListWorkspaceResponse<Device>> {
+ const url = `${HTTP_PREFIX}/manage/device/getPage`
+ const result = await request.get(url,{params})
+ return result.data
+}
+
+
export const updateDevice = async function (body: {}, workspace_id: string, device_sn: string): Promise<IWorkspaceResponse<any>> {
const url = `${HTTP_PREFIX}/devices/${workspace_id}/devices/${device_sn}`
@@ -141,13 +180,38 @@
}
export const getDeviceHms = async function (body: HmsQueryBody, workspace_id: string, pagination: IPage): Promise<IListWorkspaceResponse<any>> {
- let url = `${HTTP_PREFIX}/devices/${workspace_id}/devices/hms?page=${pagination.page}&pageSize=${pagination.page_size}` +
- `&level=${body.level ?? ''}&beginTime=${body.begin_time ?? ''}&endTime=${body.end_time ?? ''}&message=${body.message ?? ''}&language=${body.language}`
+ let url = `${HTTP_PREFIX}/devices/${workspace_id}/devices/hms?page=${pagination.page}&page_size=${pagination.page_size}` +
+ `&level=${body.level ?? ''}&begin_time=${body.begin_time ?? ''}&end_time=${body.end_time ?? ''}&message=${body.message ?? ''}&language=${body.language}`
body.sns.forEach((sn: string) => {
if (sn !== '') {
- url = url.concat(`&deviceSn=${sn}`)
+ url = url.concat(`&device_sn=${sn}`)
}
})
const result = await request.get(url)
return result.data
-}
\ No newline at end of file
+}
+
+export const changeLivestreamLens = async function (body: {}): Promise<IWorkspaceResponse<any>> {
+ const url = `${HTTP_PREFIX}/live/streams/switch`
+ const result = await request.post(url, body)
+ return result.data
+}
+
+export const getFirmwares = async function (workspace_id: string, page: IPage, body: FirmwareQueryParam): Promise<IListWorkspaceResponse<Firmware>> {
+ const url = `${HTTP_PREFIX}/workspaces/${workspace_id}/firmwares?page=${page.page}&page_size=${page.page_size}` +
+ `&device_name=${body.device_name}&product_version=${body.product_version}&status=${body.firmware_status ?? ''}`
+ const result = await request.get(url)
+ return result.data
+}
+
+export const importFirmareFile = async function (workspaceId: string, param: FormData): Promise<IWorkspaceResponse<any>> {
+ const url = `${HTTP_PREFIX}/workspaces/${workspaceId}/firmwares/file/upload`
+ const result = await request.post(url, param)
+ return result.data
+}
+
+export const changeFirmareStatus = async function (workspaceId: string, firmwareId: string, param: {status: boolean}): Promise<IWorkspaceResponse<any>> {
+ const url = `${HTTP_PREFIX}/workspaces/${workspaceId}/firmwares/${firmwareId}`
+ const result = await request.put(url, param)
+ return result.data
+}
--
Gitblit v1.9.3