From 5667f2b4fc7555ba678d5aef13b096cd38da64db Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 12 Jan 2026 15:45:34 +0800
Subject: [PATCH] feat:数据驾驶舱相关处理

---
 applications/drone-command/src/views/api.txt |  142 +++++++++++++++++++++++++++++-----------------
 1 files changed, 89 insertions(+), 53 deletions(-)

diff --git a/applications/drone-command/src/views/api.txt b/applications/drone-command/src/views/api.txt
index 86dc87e..1decdbe 100644
--- a/applications/drone-command/src/views/api.txt
+++ b/applications/drone-command/src/views/api.txt
@@ -1,48 +1,22 @@
 
 
-## 信号干扰,诱导驱离
+## 历史告警-实时告警
 
 
-**接口地址**:`/cockpit/dataCockpit/interferenceAndExpulsion`
+**接口地址**:`/cockpit/dataCockpit/alarmLog`
 
 
-**请求方式**:`POST`
+**请求方式**:`GET`
 
 
-**请求数据类型**:`application/json`
+**请求数据类型**:`application/x-www-form-urlencoded`
 
 
 **响应数据类型**:`*/*`
 
 
-**接口描述**:<p>传入fwEffectEval</p>
+**接口描述**:<p>传入fwDroneAlarmRecord</p>
 
-
-
-**请求示例**:
-
-
-```javascript
-{
-  "alarmRecordId": 0,
-  "areaCode": "",
-  "counterEffect": "",
-  "coverRadiusM": 0,
-  "deployLatitude": 0,
-  "deployLongitude": 0,
-  "deviceCode": "",
-  "deviceId": 0,
-  "deviceModel": "",
-  "deviceName": "",
-  "deviceType": "",
-  "droneDeviceCode": "",
-  "droneName": "",
-  "droneType": "",
-  "findTime": "",
-  "id": 0,
-  "workMode": ""
-}
-```
 
 
 **请求参数**:
@@ -53,24 +27,31 @@
 
 | 参数名称 | 参数说明 | 请求类型    | 是否必须 | 数据类型 | schema |
 | -------- | -------- | ----- | -------- | -------- | ------ |
-|fwEffectEval|fwEffectEval|body|true|FwEffectEvalDTO|FwEffectEvalDTO|
-|&emsp;&emsp;alarmRecordId|告警记录ID(ja_fw_drone_alarm_record.id)||false|integer(int64)||
-|&emsp;&emsp;areaCode|区域编码||false|string||
-|&emsp;&emsp;counterEffect|反制效果(success/fail)||false|string||
-|&emsp;&emsp;coverRadiusM|覆盖范围(米)||false|integer(int32)||
-|&emsp;&emsp;deployLatitude|部署纬度(冗余)||false|number(double)||
-|&emsp;&emsp;deployLongitude|部署经度(冗余)||false|number(double)||
-|&emsp;&emsp;deviceCode|反制设备编码(快照)||false|string||
-|&emsp;&emsp;deviceId|反制设备ID(ja_fw_device.id)||false|integer(int64)||
-|&emsp;&emsp;deviceModel|反制设备型号(快照)||false|string||
-|&emsp;&emsp;deviceName|反制设备名称(快照)||false|string||
-|&emsp;&emsp;deviceType|反制设备类型(快照)||false|string||
-|&emsp;&emsp;droneDeviceCode|无人机设备编码||false|string||
-|&emsp;&emsp;droneName|无人机名称||false|string||
-|&emsp;&emsp;droneType|无人机类型||false|string||
-|&emsp;&emsp;findTime|发现时间||false|string(date-time)||
-|&emsp;&emsp;id|主键id||false|integer(int64)||
-|&emsp;&emsp;workMode|工作模式(机动/固定)||false|string||
+|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||
 
 
 **响应状态**:
@@ -78,8 +59,7 @@
 
 | 状态码 | 说明 | schema |
 | -------- | -------- | ----- | 
-|200|OK|R|
-|201|Created||
+|200|OK|R«IPage«FwDroneAlarmRecordVO»»|
 |401|Unauthorized||
 |403|Forbidden||
 |404|Not Found||
@@ -91,7 +71,33 @@
 | 参数名称 | 参数说明 | 类型 | schema |
 | -------- | -------- | ----- |----- | 
 |code|状态码|integer(int32)|integer(int32)|
-|data|承载数据|object||
+|data|承载数据|IPage«FwDroneAlarmRecordVO»|IPage«FwDroneAlarmRecordVO»|
+|&emsp;&emsp;current||integer(int64)||
+|&emsp;&emsp;pages||integer(int64)||
+|&emsp;&emsp;records||array|FwDroneAlarmRecordVO|
+|&emsp;&emsp;&emsp;&emsp;alarmTime|告警时间|string||
+|&emsp;&emsp;&emsp;&emsp;alarmType|告警类型:1.实时告警/2.历史告警|string||
+|&emsp;&emsp;&emsp;&emsp;areaCode|区域编码|string||
+|&emsp;&emsp;&emsp;&emsp;areaName|区域名称|string||
+|&emsp;&emsp;&emsp;&emsp;counterWay|反制方式:1.信号干扰/2.诱导驱离/3.无|string||
+|&emsp;&emsp;&emsp;&emsp;deviceId|反无设备ID(关联ja_fw_device.id)|integer||
+|&emsp;&emsp;&emsp;&emsp;deviceModel|设备型号|string||
+|&emsp;&emsp;&emsp;&emsp;deviceName|设备名称|string||
+|&emsp;&emsp;&emsp;&emsp;deviceType|设备类型(1.便捷侦测箱/2.反制枪/3.察打一体)|string||
+|&emsp;&emsp;&emsp;&emsp;droneName|无人机名称|string||
+|&emsp;&emsp;&emsp;&emsp;droneSerialNo|无人机序列号|string||
+|&emsp;&emsp;&emsp;&emsp;droneType|无人机类型(1.微型机/2.植保机...)|string||
+|&emsp;&emsp;&emsp;&emsp;flightHeightM|飞行高度(m)|integer||
+|&emsp;&emsp;&emsp;&emsp;flightSpeedMs|飞行速度(m/s)|number||
+|&emsp;&emsp;&emsp;&emsp;flightStatus|飞行状态:1.侦测中/2.反制中|string||
+|&emsp;&emsp;&emsp;&emsp;id|主键id|integer||
+|&emsp;&emsp;&emsp;&emsp;latitude|当前纬度|number||
+|&emsp;&emsp;&emsp;&emsp;longitude|当前经度|number||
+|&emsp;&emsp;&emsp;&emsp;signalFreqMhz|信号频段(MHz)|integer||
+|&emsp;&emsp;&emsp;&emsp;stayDuration|停留时长(秒)|string||
+|&emsp;&emsp;&emsp;&emsp;triggerReason|触发原因|string||
+|&emsp;&emsp;size||integer(int64)||
+|&emsp;&emsp;total||integer(int64)||
 |msg|返回消息|string||
 |success|是否成功|boolean||
 
@@ -100,7 +106,37 @@
 ```javascript
 {
 	"code": 0,
-	"data": {},
+	"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
+	},
 	"msg": "",
 	"success": true
 }

--
Gitblit v1.9.3