Merge remote-tracking branch 'origin/master'

罗广辉

2026-01-26 beb95fb5fc166804056abafd70fc01ac27de7621

 applications/drone-command/src/views/api.txt

@@ -1,9 +1,9 @@


## 历史告警-实时告警
## 分页


**接口地址**:`/cockpit/dataCockpit/alarmLog`
**接口地址**:`/blade-log/log/operationLog/page`


**请求方式**:`GET`
@@ -15,7 +15,7 @@
**响应数据类型**:`*/*`


**接口描述**:<p>传入fwDroneAlarmRecord</p>
**接口描述**:<p>分页</p>



@@ -27,31 +27,12 @@

| 参数名称 | 参数说明 | 请求类型    | 是否必须 | 数据类型 | 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||
|createBy|操作人|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||
|title|日志类型（0菜单/1按钮）|query|false|string||


**响应状态**:
@@ -59,7 +40,7 @@

| 状态码 | 说明 | schema |
| -------- | -------- | ----- | 
|200|OK|R«IPage«FwDroneAlarmRecordVO»»|
|200|OK|R«IPage«OperationLogVO»»|
|401|Unauthorized||
|403|Forbidden||
|404|Not Found||
@@ -71,31 +52,16 @@
| 参数名称 | 参数说明 | 类型 | schema |
| -------- | -------- | ----- |----- | 
|code|状态码|integer(int32)|integer(int32)|
|data|承载数据|IPage«FwDroneAlarmRecordVO»|IPage«FwDroneAlarmRecordVO»|
|data|承载数据|IPage«OperationLogVO»|IPage«OperationLogVO»|
|&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;records||array|OperationLogVO|
|&emsp;&emsp;&emsp;&emsp;createBy|操作人|string||
|&emsp;&emsp;&emsp;&emsp;remoteIp|客户端IP|string||
|&emsp;&emsp;&emsp;&emsp;requestUri|请求地址|string||
|&emsp;&emsp;&emsp;&emsp;title|日志标题|string||
|&emsp;&emsp;&emsp;&emsp;type|日志类型（0菜单/1按钮）|string||
|&emsp;&emsp;&emsp;&emsp;userAgent|客户端|string||
|&emsp;&emsp;size||integer(int64)||
|&emsp;&emsp;total||integer(int64)||
|msg|返回消息|string||
@@ -111,27 +77,12 @@
      "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": ""
            "createBy": "",
            "remoteIp": "",
            "requestUri": "",
            "title": "",
            "type": "",
            "userAgent": ""
         }
      ],
      "size": 0,