From d60b1396df45de76c6bae6aa75c15602dd4c2570 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Sat, 31 Jan 2026 14:22:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 applications/drone-command/src/views/api.txt |   77 ++++++++++++--------------------------
 1 files changed, 25 insertions(+), 52 deletions(-)

diff --git a/applications/drone-command/src/views/api.txt b/applications/drone-command/src/views/api.txt
index 5480053..348cc4e 100644
--- a/applications/drone-command/src/views/api.txt
+++ b/applications/drone-command/src/views/api.txt
@@ -1,9 +1,9 @@
 
 
-## 列表-不带分页
+## 列表
 
 
-**接口地址**:`/area/fwAreaDivide/list`
+**接口地址**:`/area/fwDefenseSceneManage/list`
 
 
 **请求方式**:`GET`
@@ -15,7 +15,7 @@
 **响应数据类型**:`*/*`
 
 
-**接口描述**:<p>传入filterSelected或sceneId或areaTypeKeys或isSetSceneManage或flyTime</p>
+**接口描述**:<p>传入time</p>
 
 
 
@@ -27,11 +27,7 @@
 
 | 参数名称 | 参数说明 | 请求类型    | 是否必须 | 数据类型 | schema |
 | -------- | -------- | ----- | -------- | -------- | ------ |
-|areaTypeKeys|区域类型key集合(逗号分隔)|query|false|string||
-|filterSelected|是否过滤已被选择的数据(1过滤 0不过滤)|query|false|integer(int32)||
-|flyTime|时间筛选(yyyy-MM-dd HH:mm:ss)|query|false|string(date-time)||
-|isSetSceneManage|是否按场景管理过滤(1是 0或空否)|query|false|integer(int32)||
-|sceneId|场景id|query|false|integer(int64)||
+|time|时间筛选(yyyy-MM-dd HH:mm:ss)|query|false|string(date-time)||
 
 
 **响应状态**:
@@ -39,7 +35,7 @@
 
 | 状态码 | 说明 | schema |
 | -------- | -------- | ----- | 
-|200|OK|R«List«FwAreaDivideVO»»|
+|200|OK|R«List«FwDefenseSceneManageVO»»|
 |401|Unauthorized||
 |403|Forbidden||
 |404|Not Found||
@@ -51,28 +47,18 @@
 | 参数名称 | 参数说明 | 类型 | schema |
 | -------- | -------- | ----- |----- | 
 |code|状态码|integer(int32)|integer(int32)|
-|data|承载数据|array|FwAreaDivideVO|
+|data|承载数据|array|FwDefenseSceneManageVO|
 |&emsp;&emsp;areaCode|区域编码|string||
-|&emsp;&emsp;areaName|区域名称|string||
-|&emsp;&emsp;areaTypeKeys|区域面的类型集合逗号隔开|string||
-|&emsp;&emsp;controlLevel|管控级别:日常/重点/严密|string||
-|&emsp;&emsp;deviceIds|关联设备ID,逗号分隔|string||
-|&emsp;&emsp;flyDateEnd|可飞行日期时间-结束|string(date-time)||
-|&emsp;&emsp;flyDateStart|可飞行日期时间-开始|string(date-time)||
-|&emsp;&emsp;fwAreaDivideExtList|面数据|array|FwAreaDivideExtVO|
-|&emsp;&emsp;&emsp;&emsp;areaCode|区域编码|string||
-|&emsp;&emsp;&emsp;&emsp;areaDivideId|关联主表区域划分ID|integer||
-|&emsp;&emsp;&emsp;&emsp;areaTypeKey|区域类型数字字典key|string||
-|&emsp;&emsp;&emsp;&emsp;areaTypeValue|区域类型数字字典value|string||
-|&emsp;&emsp;&emsp;&emsp;geomJson|几何JSON|string||
-|&emsp;&emsp;&emsp;&emsp;id|主键id|integer||
-|&emsp;&emsp;id|主键id|integer(int64)||
-|&emsp;&emsp;policeStationContactPerson|派出所联系人|string||
-|&emsp;&emsp;policeStationContactPhone|派出所联系电话|string||
-|&emsp;&emsp;policeStationId|关联派出所id|string||
-|&emsp;&emsp;policeStationName|派出所名称|string||
-|&emsp;&emsp;responseMechanism|响应机制内容|string||
-|&emsp;&emsp;triggerCondition|触发条件|string||
+|&emsp;&emsp;defenseLeader|防控负责人|string||
+|&emsp;&emsp;defenseSceneId|关联场景配置ID|integer(int64)||
+|&emsp;&emsp;defenseSceneName|场景配置名称|string||
+|&emsp;&emsp;effectiveDateEnd|有效时间-结束|string(date-time)||
+|&emsp;&emsp;effectiveDateStart|有效时间-开始|string(date-time)||
+|&emsp;&emsp;id||integer(int64)||
+|&emsp;&emsp;latitude|指挥点纬度|number(double)||
+|&emsp;&emsp;leaderPhone|防控负责人电话|string||
+|&emsp;&emsp;longitude|指挥点经度|number(double)||
+|&emsp;&emsp;sceneName|场景名称|string||
 |msg|返回消息|string||
 |success|是否成功|boolean||
 
@@ -84,29 +70,16 @@
 	"data": [
 		{
 			"areaCode": "",
-			"areaName": "",
-			"areaTypeKeys": "",
-			"controlLevel": "",
-			"deviceIds": "",
-			"flyDateEnd": "",
-			"flyDateStart": "",
-			"fwAreaDivideExtList": [
-				{
-					"areaCode": "",
-					"areaDivideId": 0,
-					"areaTypeKey": "",
-					"areaTypeValue": "",
-					"geomJson": "",
-					"id": 0
-				}
-			],
+			"defenseLeader": "",
+			"defenseSceneId": 0,
+			"defenseSceneName": "",
+			"effectiveDateEnd": "",
+			"effectiveDateStart": "",
 			"id": 0,
-			"policeStationContactPerson": "",
-			"policeStationContactPhone": "",
-			"policeStationId": "",
-			"policeStationName": "",
-			"responseMechanism": "",
-			"triggerCondition": ""
+			"latitude": 0,
+			"leaderPhone": "",
+			"longitude": 0,
+			"sceneName": ""
 		}
 	],
 	"msg": "",

--
Gitblit v1.9.3