From 9eb8bb59b802ceef1f52d334c8e577f2bf02c90e Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Wed, 21 Jan 2026 15:12:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 applications/drone-command/src/views/api.txt |   38 ++++----------------------------------
 1 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/applications/drone-command/src/views/api.txt b/applications/drone-command/src/views/api.txt
index 86dc87e..350f827 100644
--- a/applications/drone-command/src/views/api.txt
+++ b/applications/drone-command/src/views/api.txt
@@ -3,7 +3,7 @@
 ## 信号干扰，诱导驱离
 
 
-**接口地址**:`/cockpit/dataCockpit/interferenceAndExpulsion`
+**接口地址**:`/drone-fw/cockpit/dataCockpit/interferenceAndExpulsion`
 
 
 **请求方式**:`POST`
@@ -25,22 +25,7 @@
 ```javascript
 {
   "alarmRecordId": 0,
-  "areaCode": "",
-  "counterEffect": "",
-  "coverRadiusM": 0,
-  "deployLatitude": 0,
-  "deployLongitude": 0,
-  "deviceCode": "",
-  "deviceId": 0,
-  "deviceModel": "",
-  "deviceName": "",
-  "deviceType": "",
-  "droneDeviceCode": "",
-  "droneName": "",
-  "droneType": "",
-  "findTime": "",
-  "id": 0,
-  "workMode": ""
+  "counterWay": ""
 }
 ```
 
@@ -53,24 +38,9 @@
 
 | 参数名称 | 参数说明 | 请求类型    | 是否必须 | 数据类型 | schema |
 | -------- | -------- | ----- | -------- | -------- | ------ |
-|fwEffectEval|fwEffectEval|body|true|FwEffectEvalDTO|FwEffectEvalDTO|
+|fwEffectEvalParam|fwEffectEvalParam|body|true|FwEffectEvalParam|FwEffectEvalParam|
 |&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||
+|&emsp;&emsp;counterWay|反制方式：1.信号干扰/2.诱导驱离/无||false|string||
 
 
 **响应状态**:

--
Gitblit v1.9.3