From 0c92fd00fae033a2aa04bb65b2d32bd2c8f9fd4a Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Wed, 04 Feb 2026 15:48:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/api.txt | 171 +++++++++++++++++++++++++++-----------------------------
1 files changed, 83 insertions(+), 88 deletions(-)
diff --git a/applications/drone-command/src/views/api.txt b/applications/drone-command/src/views/api.txt
index 1decdbe..ab098cd 100644
--- a/applications/drone-command/src/views/api.txt
+++ b/applications/drone-command/src/views/api.txt
@@ -1,9 +1,9 @@
-## 历史告警-实时告警
+## 列表
-**接口地址**:`/cockpit/dataCockpit/alarmLog`
+**接口地址**:`/device/fwDevice/list`
**请求方式**:`GET`
@@ -15,7 +15,7 @@
**响应数据类型**:`*/*`
-**接口描述**:<p>传入fwDroneAlarmRecord</p>
+**接口描述**:<p>传入isAreaSelect、areaId、areaIds（多个用,隔开获取对应区域绑定设备数据）、status</p>
@@ -27,31 +27,11 @@
| 参数名称 | 参数说明 | 请求类型 | 是否必须 | 数据类型 | schema |
| -------- | -------- | ----- | -------- | -------- | ------ |
-|alarmTime|告警时间|query|false|string(date-time)||
-|alarmType|告警类型：1.实时告警/2.历史告警|query|false|string||
-|areaCode|区域编码|query|false|string||
-|areaDivideId|区域id ja_fw_area_divide|query|false|string||
-|areaName|区域名称|query|false|string||
-|counterWay|反制方式：1.信号干扰/2.诱导驱离/无|query|false|string||
-|current|当前页|query|false|integer(int32)||
-|defenseSceneId|场景id ja_fw_defense_scene.id|query|false|string||
-|deviceId|反无设备ID（关联ja_fw_device.id）|query|false|integer(int64)||
-|deviceType|设备类型|query|false|string||
-|droneName|无人机名称|query|false|string||
-|droneSerialNo|无人机序列号|query|false|string||
-|droneType|无人机类型（1.微型机/2.植保机...）|query|false|string||
-|endTime|结束时间|query|false|string||
-|flightHeightM|飞行高度(m)|query|false|integer(int32)||
-|flightSpeedMs|飞行速度(m/s)|query|false|number||
-|flightStatus|飞行状态：1.侦测中/2.反制中|query|false|string||
-|id|主键id|query|false|integer(int64)||
-|latitude|当前纬度|query|false|number(double)||
-|longitude|当前经度|query|false|number(double)||
-|signalFreqMhz|信号频段(MHz)|query|false|integer(int32)||
-|size|每页的数量|query|false|integer(int32)||
-|startTime|开始时间|query|false|string||
-|stayDuration|停留时长 （秒） |query|false|string||
-|triggerReason|触发原因|query|false|string||
+|areaId|areaId|query|false|integer(int64)||
+|areaIds|areaIds（多个用,隔开）|query|false|string||
+|isAreaSelect|isAreaSelect|query|false|integer(int32)||
+|isTrack|isTrack|query|false|integer(int32)||
+|status|status|query|false|integer(int32)||
**响应状态**:
@@ -59,7 +39,7 @@
| 状态码 | 说明 | schema |
| -------- | -------- | ----- |
-|200|OK|R«IPage«FwDroneAlarmRecordVO»»|
+|200|OK|R«List«FwDeviceVO»»|
|401|Unauthorized||
|403|Forbidden||
|404|Not Found||
@@ -71,33 +51,41 @@
| 参数名称 | 参数说明 | 类型 | schema |
| -------- | -------- | ----- |----- |
|code|状态码|integer(int32)|integer(int32)|
-|data|承载数据|IPage«FwDroneAlarmRecordVO»|IPage«FwDroneAlarmRecordVO»|
-|  current||integer(int64)||
-|  pages||integer(int64)||
-|  records||array|FwDroneAlarmRecordVO|
-|    alarmTime|告警时间|string||
-|    alarmType|告警类型：1.实时告警/2.历史告警|string||
-|    areaCode|区域编码|string||
-|    areaName|区域名称|string||
-|    counterWay|反制方式：1.信号干扰/2.诱导驱离/3.无|string||
-|    deviceId|反无设备ID（关联ja_fw_device.id）|integer||
-|    deviceModel|设备型号|string||
-|    deviceName|设备名称|string||
-|    deviceType|设备类型（1.便捷侦测箱/2.反制枪/3.察打一体）|string||
-|    droneName|无人机名称|string||
-|    droneSerialNo|无人机序列号|string||
-|    droneType|无人机类型（1.微型机/2.植保机...）|string||
-|    flightHeightM|飞行高度(m)|integer||
-|    flightSpeedMs|飞行速度(m/s)|number||
-|    flightStatus|飞行状态：1.侦测中/2.反制中|string||
-|    id|主键id|integer||
-|    latitude|当前纬度|number||
-|    longitude|当前经度|number||
-|    signalFreqMhz|信号频段(MHz)|integer||
-|    stayDuration|停留时长（秒）|string||
-|    triggerReason|触发原因|string||
-|  size||integer(int64)||
-|  total||integer(int64)||
+|data|承载数据|array|FwDeviceVO|
+|  azimuth|方位角 0-360°|integer(int32)||
+|  batteryPct|电量百分比 0-100|integer(int32)||
+|  belongDept|所属部门id|integer(int64)||
+|  belongDeptName|所属部门名称|string||
+|  charger|负责人|string||
+|  contactPhone|联系电话|string||
+|  createDept|创建部门|integer(int64)||
+|  createTime|创建时间|string(date-time)||
+|  createUser|创建人|integer(int64)||
+|  detectTargetCnt|侦测目标数量|integer(int32)||
+|  deviceAtt|设备属性（无线电/光电/雷达）|string||
+|  deviceModel|型号|string||
+|  deviceName|设备名称|string||
+|  deviceSn|设备sn|string||
+|  deviceSpecification|规格|string||
+|  deviceType|设备类型（察打一体/便捷侦测箱/反制枪）|string||
+|  effectiveRangeKm|有效范围 km|number||
+|  elevation|俯仰角 -90-+90°|integer(int32)||
+|  id|主键|integer(int64)||
+|  isShared|是否被共享给当前机构|boolean||
+|  latitude|纬度|string||
+|  longitude|经度|string||
+|  manufacturer|生产厂商|string||
+|  outTarget|出库去向|string||
+|  purpose|用途|string||
+|  remark|备注|string||
+|  sceneName|场景名称|string||
+|  shareId|共享记录ID|integer(int64)||
+|  source|来源|string||
+|  status|运行状态（0:在线/1:离线/2:故障/3:报废）|integer(int32)||
+|  trackStatus|设备出入库状态 0未出库1已出库|integer(int32)||
+|  updateTime|更新时间|string(date-time)||
+|  updateUser|更新人|integer(int64)||
+|  workMode|工作模式：1.侦测中/2.信号干扰中/3.诱导驱离中/4.待机|string||
|msg|返回消息|string||
|success|是否成功|boolean||
@@ -106,38 +94,45 @@
```javascript
{
"code": 0,
- "data": {
- "current": 0,
- "pages": 0,
- "records": [
- {
- "alarmTime": "",
- "alarmType": "",
- "areaCode": "",
- "areaName": "",
- "counterWay": "",
- "deviceId": 0,
- "deviceModel": "",
- "deviceName": "",
- "deviceType": "",
- "droneName": "",
- "droneSerialNo": "",
- "droneType": "",
- "flightHeightM": 0,
- "flightSpeedMs": 0,
- "flightStatus": "",
- "id": 0,
- "latitude": 0,
- "longitude": 0,
- "signalFreqMhz": 0,
- "stayDuration": "",
- "triggerReason": ""
- }
- ],
- "size": 0,
- "total": 0
- },
+ "data": [
+ {
+ "azimuth": 0,
+ "batteryPct": 0,
+ "belongDept": 0,
+ "belongDeptName": "",
+ "charger": "",
+ "contactPhone": "",
+ "createDept": 0,
+ "createTime": "",
+ "createUser": 0,
+ "detectTargetCnt": 0,
+ "deviceAtt": "",
+ "deviceModel": "",
+ "deviceName": "",
+ "deviceSn": "",
+ "deviceSpecification": "",
+ "deviceType": "",
+ "effectiveRangeKm": 0,
+ "elevation": 0,
+ "id": 0,
+ "isShared": true,
+ "latitude": "",
+ "longitude": "",
+ "manufacturer": "",
+ "outTarget": "",
+ "purpose": "",
+ "remark": "",
+ "sceneName": "",
+ "shareId": 0,
+ "source": "",
+ "status": 0,
+ "trackStatus": 0,
+ "updateTime": "",
+ "updateUser": 0,
+ "workMode": ""
+ }
+ ],
"msg": "",
"success": true
}
-```
\ No newline at end of file
+```
--
Gitblit v1.9.3