From 86c2d61ba9d33f1886cfc904dcaf17f033e4c80a Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 17 Jan 2026 13:52:53 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
applications/drone-command/src/views/api.txt | 301 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 267 insertions(+), 34 deletions(-)
diff --git a/applications/drone-command/src/views/api.txt b/applications/drone-command/src/views/api.txt
index 86dc87e..716ca76 100644
--- a/applications/drone-command/src/views/api.txt
+++ b/applications/drone-command/src/views/api.txt
@@ -1,9 +1,246 @@
-## 信号干扰，诱导驱离
+## 分页
-**接口地址**:`/cockpit/dataCockpit/interferenceAndExpulsion`
+**接口地址**:`/device/fwDevice/page`
+
+
+**请求方式**:`GET`
+
+
+**请求数据类型**:`application/x-www-form-urlencoded`
+
+
+**响应数据类型**:`*/*`
+
+
+**接口描述**:<p>传入fwDevice</p>
+
+
+
+**请求参数**:
+
+
+**请求参数**:
+
+
+| 参数名称 | 参数说明 | 请求类型 | 是否必须 | 数据类型 | schema |
+| -------- | -------- | ----- | -------- | -------- | ------ |
+|belongDept|所属部门|query|false|integer(int64)||
+|current|当前页|query|false|integer(int32)||
+|deviceName|设备名称|query|false|string||
+|deviceType|设备类型（察打一体/便捷侦测箱/反制枪）|query|false|string||
+|effectiveRangeKmIsNotNull|有效范围是否为空：0-不处理 1-不为空 2-为空|query|false|integer(int32)||
+|size|每页的数量|query|false|integer(int32)||
+
+
+**响应状态**:
+
+
+| 状态码 | 说明 | schema |
+| -------- | -------- | ----- |
+|200|OK|R«IPage«FwDeviceVO»»|
+|401|Unauthorized||
+|403|Forbidden||
+|404|Not Found||
+
+
+**响应参数**:
+
+
+| 参数名称 | 参数说明 | 类型 | schema |
+| -------- | -------- | ----- |----- |
+|code|状态码|integer(int32)|integer(int32)|
+|data|承载数据|IPage«FwDeviceVO»|IPage«FwDeviceVO»|
+|  current||integer(int64)||
+|  pages||integer(int64)||
+|  records||array|FwDeviceVO|
+|    azimuth|方位角 0-360°|integer||
+|    batteryPct|电量百分比 0-100|integer||
+|    belongDept|所属部门id|integer||
+|    belongDeptName|所属部门名称|string||
+|    charger|负责人|string||
+|    contactPhone|联系电话|string||
+|    createTime|创建时间|string||
+|    detectTargetCnt|侦测目标数量|integer||
+|    deviceAtt|设备属性（无线电/光电/雷达）|string||
+|    deviceModel|型号|string||
+|    deviceName|设备名称|string||
+|    deviceSpecification|规格|string||
+|    deviceType|设备类型（察打一体/便捷侦测箱/反制枪）|string||
+|    effectiveRangeKm|有效范围 km|number||
+|    elevation|俯仰角 -90-+90°|integer||
+|    id|主键|integer||
+|    manufacturer|生产厂商|string||
+|    purpose|用途|string||
+|    remark|备注|string||
+|    source|来源|string||
+|    status|运行状态（0:在线/1:离线/2:故障/3:报废）|integer||
+|    workMode|工作模式：1.侦测中/2.信号干扰中/3.诱导驱离中/4.待机|string||
+|  size||integer(int64)||
+|  total||integer(int64)||
+|msg|返回消息|string||
+|success|是否成功|boolean||
+
+
+**响应示例**:
+```javascript
+{
+ "code": 0,
+ "data": {
+ "current": 0,
+ "pages": 0,
+ "records": [
+ {
+ "azimuth": 0,
+ "batteryPct": 0,
+ "belongDept": 0,
+ "belongDeptName": "",
+ "charger": "",
+ "contactPhone": "",
+ "createTime": "",
+ "detectTargetCnt": 0,
+ "deviceAtt": "",
+ "deviceModel": "",
+ "deviceName": "",
+ "deviceSpecification": "",
+ "deviceType": "",
+ "effectiveRangeKm": 0,
+ "elevation": 0,
+ "id": 0,
+ "manufacturer": "",
+ "purpose": "",
+ "remark": "",
+ "source": "",
+ "status": 0,
+ "workMode": ""
+ }
+ ],
+ "size": 0,
+ "total": 0
+ },
+ "msg": "",
+ "success": true
+}
+```
+
+
+
+
+## 详情
+
+
+**接口地址**:`/device/fwDevice/detail`
+
+
+**请求方式**:`GET`
+
+
+**请求数据类型**:`application/x-www-form-urlencoded`
+
+
+**响应数据类型**:`*/*`
+
+
+**接口描述**:<p>传入fwDevice</p>
+
+
+
+**请求参数**:
+
+
+**请求参数**:
+
+
+| 参数名称 | 参数说明 | 请求类型 | 是否必须 | 数据类型 | schema |
+| -------- | -------- | ----- | -------- | -------- | ------ |
+|id|主键|query|true|integer(int64)||
+
+
+**响应状态**:
+
+
+| 状态码 | 说明 | schema |
+| -------- | -------- | ----- |
+|200|OK|R«FwDeviceVO»|
+|401|Unauthorized||
+|403|Forbidden||
+|404|Not Found||
+
+
+**响应参数**:
+
+
+| 参数名称 | 参数说明 | 类型 | schema |
+| -------- | -------- | ----- |----- |
+|code|状态码|integer(int32)|integer(int32)|
+|data|承载数据|FwDeviceVO|FwDeviceVO|
+|  azimuth|方位角 0-360°|integer(int32)||
+|  batteryPct|电量百分比 0-100|integer(int32)||
+|  belongDept|所属部门id|integer(int64)||
+|  belongDeptName|所属部门名称|string||
+|  charger|负责人|string||
+|  contactPhone|联系电话|string||
+|  createTime|创建时间|string(date-time)||
+|  detectTargetCnt|侦测目标数量|integer(int32)||
+|  deviceAtt|设备属性（无线电/光电/雷达）|string||
+|  deviceModel|型号|string||
+|  deviceName|设备名称|string||
+|  deviceSpecification|规格|string||
+|  deviceType|设备类型（察打一体/便捷侦测箱/反制枪）|string||
+|  effectiveRangeKm|有效范围 km|number||
+|  elevation|俯仰角 -90-+90°|integer(int32)||
+|  id|主键|integer(int64)||
+|  manufacturer|生产厂商|string||
+|  purpose|用途|string||
+|  remark|备注|string||
+|  source|来源|string||
+|  status|运行状态（0:在线/1:离线/2:故障/3:报废）|integer(int32)||
+|  workMode|工作模式：1.侦测中/2.信号干扰中/3.诱导驱离中/4.待机|string||
+|msg|返回消息|string||
+|success|是否成功|boolean||
+
+
+**响应示例**:
+```javascript
+{
+ "code": 0,
+ "data": {
+ "azimuth": 0,
+ "batteryPct": 0,
+ "belongDept": 0,
+ "belongDeptName": "",
+ "charger": "",
+ "contactPhone": "",
+ "createTime": "",
+ "detectTargetCnt": 0,
+ "deviceAtt": "",
+ "deviceModel": "",
+ "deviceName": "",
+ "deviceSpecification": "",
+ "deviceType": "",
+ "effectiveRangeKm": 0,
+ "elevation": 0,
+ "id": 0,
+ "manufacturer": "",
+ "purpose": "",
+ "remark": "",
+ "source": "",
+ "status": 0,
+ "workMode": ""
+ },
+ "msg": "",
+ "success": true
+}
+```
+
+
+
+## 新增或修改
+
+
+**接口地址**:`/device/fwDevice/submit`
**请求方式**:`POST`
@@ -15,7 +252,7 @@
**响应数据类型**:`*/*`
-**接口描述**:<p>传入fwEffectEval</p>
+**接口描述**:<p>传入fwDevice</p>
@@ -24,23 +261,21 @@
```javascript
{
- "alarmRecordId": 0,
- "areaCode": "",
- "counterEffect": "",
- "coverRadiusM": 0,
- "deployLatitude": 0,
- "deployLongitude": 0,
- "deviceCode": "",
- "deviceId": 0,
+ "belongDept": 0,
+ "charger": "",
+ "contactPhone": "",
+ "deviceAtt": "",
"deviceModel": "",
"deviceName": "",
+ "deviceSpecification": "",
+ "deviceStatusList": [],
"deviceType": "",
- "droneDeviceCode": "",
- "droneName": "",
- "droneType": "",
- "findTime": "",
+ "effectiveRangeKm": 0,
+ "effectiveRangeKmIsNotNull": 0,
"id": 0,
- "workMode": ""
+ "manufacturer": "",
+ "purpose": "",
+ "source": ""
}
```
@@ -53,24 +288,22 @@
| 参数名称 | 参数说明 | 请求类型 | 是否必须 | 数据类型 | schema |
| -------- | -------- | ----- | -------- | -------- | ------ |
-|fwEffectEval|fwEffectEval|body|true|FwEffectEvalDTO|FwEffectEvalDTO|
-|  alarmRecordId|告警记录ID（ja_fw_drone_alarm_record.id）||false|integer(int64)||
-|  areaCode|区域编码||false|string||
-|  counterEffect|反制效果（success/fail）||false|string||
-|  coverRadiusM|覆盖范围（米）||false|integer(int32)||
-|  deployLatitude|部署纬度（冗余）||false|number(double)||
-|  deployLongitude|部署经度（冗余）||false|number(double)||
-|  deviceCode|反制设备编码（快照）||false|string||
-|  deviceId|反制设备ID（ja_fw_device.id）||false|integer(int64)||
-|  deviceModel|反制设备型号（快照）||false|string||
-|  deviceName|反制设备名称（快照）||false|string||
-|  deviceType|反制设备类型（快照）||false|string||
-|  droneDeviceCode|无人机设备编码||false|string||
-|  droneName|无人机名称||false|string||
-|  droneType|无人机类型||false|string||
-|  findTime|发现时间||false|string(date-time)||
-|  id|主键id||false|integer(int64)||
-|  workMode|工作模式（机动/固定）||false|string||
+|fwDevice|fwDevice|body|true|FwDeviceDTO|FwDeviceDTO|
+|  belongDept|所属部门||false|integer(int64)||
+|  charger|负责人||false|string||
+|  contactPhone|联系电话||false|string||
+|  deviceAtt|设备属性（无线电/光电/雷达）||false|string||
+|  deviceModel|型号||false|string||
+|  deviceName|设备名称||true|string||
+|  deviceSpecification|规格||false|string||
+|  deviceStatusList|设备状态，多个状态用逗号隔开||false|array|string|
+|  deviceType|设备类型（察打一体/便捷侦测箱/反制枪）||false|string||
+|  effectiveRangeKm|有效范围 km||false|number||
+|  effectiveRangeKmIsNotNull|是否有范围 0不过滤 1有 2没有||false|integer(int32)||
+|  id|主键||false|integer(int64)||
+|  manufacturer|生产厂商||false|string||
+|  purpose|用途||false|string||
+|  source|来源||false|string||
**响应状态**:
--
Gitblit v1.9.3