From 39ec001f02bde6fd7b7a40bdf7b2313df87e8e76 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Sat, 17 Jan 2026 17:34:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/api.txt | 343 ++++++++++-----------------------------------------------
1 files changed, 60 insertions(+), 283 deletions(-)
diff --git a/applications/drone-command/src/views/api.txt b/applications/drone-command/src/views/api.txt
index 716ca76..b82372a 100644
--- a/applications/drone-command/src/views/api.txt
+++ b/applications/drone-command/src/views/api.txt
@@ -1,9 +1,9 @@
-## 分页
+## 列表
-**接口地址**:`/device/fwDevice/page`
+**接口地址**:`/drone-fw/area/fwAreaDivide/list`
**请求方式**:`GET`
@@ -15,7 +15,7 @@
**响应数据类型**:`*/*`
-**接口描述**:<p>传入fwDevice</p>
+**接口描述**:<p>传入filterSelected或sceneId</p>
@@ -27,12 +27,8 @@
| 参数名称 | 参数说明 | 请求类型 | 是否必须 | 数据类型 | schema |
| -------- | -------- | ----- | -------- | -------- | ------ |
-|belongDept|所属部门|query|false|integer(int64)||
-|current|当前页|query|false|integer(int32)||
-|deviceName|设备名称|query|false|string||
-|deviceType|设备类型（察打一体/便捷侦测箱/反制枪）|query|false|string||
-|effectiveRangeKmIsNotNull|有效范围是否为空：0-不处理 1-不为空 2-为空|query|false|integer(int32)||
-|size|每页的数量|query|false|integer(int32)||
+|filterSelected|是否过滤已被选择的数据（1过滤 0不过滤）|query|false|integer(int32)||
+|sceneId|场景id|query|false|integer(int64)||
**响应状态**:
@@ -40,7 +36,7 @@
| 状态码 | 说明 | schema |
| -------- | -------- | ----- |
-|200|OK|R«IPage«FwDeviceVO»»|
+|200|OK|R«List«FwAreaDivide对象»»|
|401|Unauthorized||
|403|Forbidden||
|404|Not Found||
@@ -52,152 +48,32 @@
| 参数名称 | 参数说明 | 类型 | schema |
| -------- | -------- | ----- |----- |
|code|状态码|integer(int32)|integer(int32)|
-|data|承载数据|IPage«FwDeviceVO»|IPage«FwDeviceVO»|
-|  current||integer(int64)||
-|  pages||integer(int64)||
-|  records||array|FwDeviceVO|
-|    azimuth|方位角 0-360°|integer||
-|    batteryPct|电量百分比 0-100|integer||
-|    belongDept|所属部门id|integer||
-|    belongDeptName|所属部门名称|string||
-|    charger|负责人|string||
-|    contactPhone|联系电话|string||
-|    createTime|创建时间|string||
-|    detectTargetCnt|侦测目标数量|integer||
-|    deviceAtt|设备属性（无线电/光电/雷达）|string||
-|    deviceModel|型号|string||
-|    deviceName|设备名称|string||
-|    deviceSpecification|规格|string||
-|    deviceType|设备类型（察打一体/便捷侦测箱/反制枪）|string||
-|    effectiveRangeKm|有效范围 km|number||
-|    elevation|俯仰角 -90-+90°|integer||
-|    id|主键|integer||
-|    manufacturer|生产厂商|string||
-|    purpose|用途|string||
-|    remark|备注|string||
-|    source|来源|string||
-|    status|运行状态（0:在线/1:离线/2:故障/3:报废）|integer||
-|    workMode|工作模式：1.侦测中/2.信号干扰中/3.诱导驱离中/4.待机|string||
-|  size||integer(int64)||
-|  total||integer(int64)||
-|msg|返回消息|string||
-|success|是否成功|boolean||
-
-
-**响应示例**:
-```javascript
-{
- "code": 0,
- "data": {
- "current": 0,
- "pages": 0,
- "records": [
- {
- "azimuth": 0,
- "batteryPct": 0,
- "belongDept": 0,
- "belongDeptName": "",
- "charger": "",
- "contactPhone": "",
- "createTime": "",
- "detectTargetCnt": 0,
- "deviceAtt": "",
- "deviceModel": "",
- "deviceName": "",
- "deviceSpecification": "",
- "deviceType": "",
- "effectiveRangeKm": 0,
- "elevation": 0,
- "id": 0,
- "manufacturer": "",
- "purpose": "",
- "remark": "",
- "source": "",
- "status": 0,
- "workMode": ""
- }
- ],
- "size": 0,
- "total": 0
- },
- "msg": "",
- "success": true
-}
-```
-
-
-
-
-## 详情
-
-
-**接口地址**:`/device/fwDevice/detail`
-
-
-**请求方式**:`GET`
-
-
-**请求数据类型**:`application/x-www-form-urlencoded`
-
-
-**响应数据类型**:`*/*`
-
-
-**接口描述**:<p>传入fwDevice</p>
-
-
-
-**请求参数**:
-
-
-**请求参数**:
-
-
-| 参数名称 | 参数说明 | 请求类型 | 是否必须 | 数据类型 | schema |
-| -------- | -------- | ----- | -------- | -------- | ------ |
-|id|主键|query|true|integer(int64)||
-
-
-**响应状态**:
-
-
-| 状态码 | 说明 | schema |
-| -------- | -------- | ----- |
-|200|OK|R«FwDeviceVO»|
-|401|Unauthorized||
-|403|Forbidden||
-|404|Not Found||
-
-
-**响应参数**:
-
-
-| 参数名称 | 参数说明 | 类型 | schema |
-| -------- | -------- | ----- |----- |
-|code|状态码|integer(int32)|integer(int32)|
-|data|承载数据|FwDeviceVO|FwDeviceVO|
-|  azimuth|方位角 0-360°|integer(int32)||
-|  batteryPct|电量百分比 0-100|integer(int32)||
-|  belongDept|所属部门id|integer(int64)||
-|  belongDeptName|所属部门名称|string||
-|  charger|负责人|string||
-|  contactPhone|联系电话|string||
+|data|承载数据|array|FwAreaDivide对象|
+|  areaCode|区域编码|string||
+|  areaName|区域名称|string||
+|  areaSize|区域面积（km²）|number||
+|  areaType|区域类型：报警区/重点管制区|string||
+|  controlLevel|管控级别：日常/重点/严密|string||
+|  createDept|创建部门|integer(int64)||
|  createTime|创建时间|string(date-time)||
-|  detectTargetCnt|侦测目标数量|integer(int32)||
-|  deviceAtt|设备属性（无线电/光电/雷达）|string||
-|  deviceModel|型号|string||
-|  deviceName|设备名称|string||
-|  deviceSpecification|规格|string||
-|  deviceType|设备类型（察打一体/便捷侦测箱/反制枪）|string||
-|  effectiveRangeKm|有效范围 km|number||
-|  elevation|俯仰角 -90-+90°|integer(int32)||
-|  id|主键|integer(int64)||
-|  manufacturer|生产厂商|string||
-|  purpose|用途|string||
-|  remark|备注|string||
-|  source|来源|string||
-|  status|运行状态（0:在线/1:离线/2:故障/3:报废）|integer(int32)||
-|  workMode|工作模式：1.侦测中/2.信号干扰中/3.诱导驱离中/4.待机|string||
+|  createUser|创建人|integer(int64)||
+|  deviceIds|关联设备ID，逗号分隔|string||
+|  flyDateEnd|可飞行日期时间-结束|string(date-time)||
+|  flyDateStart|可飞行日期时间-开始|string(date-time)||
+|  geom|经纬度面（存储地理面数据）|string||
+|  id|主键id|integer(int64)||
+|  isDeleted|是否已删除|integer(int32)||
+|  latitude|区域中心纬度|number(double)||
+|  longitude|区域中心经度|number(double)||
+|  policeStationContactPerson|派出所联系人|string||
+|  policeStationContactPhone|派出所联系电话|string||
+|  policeStationId|关联派出所id|integer(int64)||
+|  policeStationName|派出所名称|string||
+|  responseMechanism|响应机制内容|string||
+|  status|业务状态|integer(int32)||
+|  triggerCondition|触发条件|string||
+|  updateTime|更新时间|string(date-time)||
+|  updateUser|更新人|integer(int64)||
|msg|返回消息|string||
|success|是否成功|boolean||
@@ -206,134 +82,35 @@
```javascript
{
"code": 0,
- "data": {
- "azimuth": 0,
- "batteryPct": 0,
- "belongDept": 0,
- "belongDeptName": "",
- "charger": "",
- "contactPhone": "",
- "createTime": "",
- "detectTargetCnt": 0,
- "deviceAtt": "",
- "deviceModel": "",
- "deviceName": "",
- "deviceSpecification": "",
- "deviceType": "",
- "effectiveRangeKm": 0,
- "elevation": 0,
- "id": 0,
- "manufacturer": "",
- "purpose": "",
- "remark": "",
- "source": "",
- "status": 0,
- "workMode": ""
- },
- "msg": "",
- "success": true
-}
-```
-
-
-
-## 新增或修改
-
-
-**接口地址**:`/device/fwDevice/submit`
-
-
-**请求方式**:`POST`
-
-
-**请求数据类型**:`application/json`
-
-
-**响应数据类型**:`*/*`
-
-
-**接口描述**:<p>传入fwDevice</p>
-
-
-
-**请求示例**:
-
-
-```javascript
-{
- "belongDept": 0,
- "charger": "",
- "contactPhone": "",
- "deviceAtt": "",
- "deviceModel": "",
- "deviceName": "",
- "deviceSpecification": "",
- "deviceStatusList": [],
- "deviceType": "",
- "effectiveRangeKm": 0,
- "effectiveRangeKmIsNotNull": 0,
- "id": 0,
- "manufacturer": "",
- "purpose": "",
- "source": ""
-}
-```
-
-
-**请求参数**:
-
-
-**请求参数**:
-
-
-| 参数名称 | 参数说明 | 请求类型 | 是否必须 | 数据类型 | schema |
-| -------- | -------- | ----- | -------- | -------- | ------ |
-|fwDevice|fwDevice|body|true|FwDeviceDTO|FwDeviceDTO|
-|  belongDept|所属部门||false|integer(int64)||
-|  charger|负责人||false|string||
-|  contactPhone|联系电话||false|string||
-|  deviceAtt|设备属性（无线电/光电/雷达）||false|string||
-|  deviceModel|型号||false|string||
-|  deviceName|设备名称||true|string||
-|  deviceSpecification|规格||false|string||
-|  deviceStatusList|设备状态，多个状态用逗号隔开||false|array|string|
-|  deviceType|设备类型（察打一体/便捷侦测箱/反制枪）||false|string||
-|  effectiveRangeKm|有效范围 km||false|number||
-|  effectiveRangeKmIsNotNull|是否有范围 0不过滤 1有 2没有||false|integer(int32)||
-|  id|主键||false|integer(int64)||
-|  manufacturer|生产厂商||false|string||
-|  purpose|用途||false|string||
-|  source|来源||false|string||
-
-
-**响应状态**:
-
-
-| 状态码 | 说明 | schema |
-| -------- | -------- | ----- |
-|200|OK|R|
-|201|Created||
-|401|Unauthorized||
-|403|Forbidden||
-|404|Not Found||
-
-
-**响应参数**:
-
-
-| 参数名称 | 参数说明 | 类型 | schema |
-| -------- | -------- | ----- |----- |
-|code|状态码|integer(int32)|integer(int32)|
-|data|承载数据|object||
-|msg|返回消息|string||
-|success|是否成功|boolean||
-
-
-**响应示例**:
-```javascript
-{
- "code": 0,
- "data": {},
+ "data": [
+ {
+ "areaCode": "",
+ "areaName": "",
+ "areaSize": 0,
+ "areaType": "",
+ "controlLevel": "",
+ "createDept": 0,
+ "createTime": "",
+ "createUser": 0,
+ "deviceIds": "",
+ "flyDateEnd": "",
+ "flyDateStart": "",
+ "geom": "",
+ "id": 0,
+ "isDeleted": 0,
+ "latitude": 0,
+ "longitude": 0,
+ "policeStationContactPerson": "",
+ "policeStationContactPhone": "",
+ "policeStationId": 0,
+ "policeStationName": "",
+ "responseMechanism": "",
+ "status": 0,
+ "triggerCondition": "",
+ "updateTime": "",
+ "updateUser": 0
+ }
+ ],
"msg": "",
"success": true
}
--
Gitblit v1.9.3