From 0abcc981f5c8e674c17baf7160ee8e6446d87b3a Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 09 Jan 2026 14:02:02 +0800
Subject: [PATCH] 数据驾驶舱优化
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/controller/CockpitController.java | 33 ++++++++++-----------------------
1 files changed, 10 insertions(+), 23 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/controller/CockpitController.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/controller/CockpitController.java
index 766f654..8900784 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/controller/CockpitController.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/controller/CockpitController.java
@@ -10,6 +10,7 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
import org.springframework.web.bind.annotation.*;
+import org.sxkj.fw.cockpit.service.ICockpitService;
import org.sxkj.fw.cockpit.vo.AlarmStatisticsVO;
import org.sxkj.fw.cockpit.vo.DeviceStatisticsVO;
import org.sxkj.fw.detection.dto.FwEffectEvalDTO;
@@ -25,6 +26,7 @@
import org.sxkj.fw.record.vo.FwDroneAlarmRecordVO;
import javax.validation.Valid;
+import java.util.List;
import java.util.Objects;
/**
@@ -39,11 +41,7 @@
@Api(value = "驾驶舱", tags = "数据驾驶舱")
public class CockpitController {
- private final IFwDroneAlarmRecordService fwDroneAlarmRecordService;
-
- private final IFwDeviceService fwDeviceService;
-
- private final IFwEffectEvalService fwEffectEvalService;
+ private final ICockpitService cockpitService;
/**
@@ -53,7 +51,7 @@
@ApiOperationSupport(order = 1)
@ApiOperation(value = "历史告警/实时告警", notes = "传入fwDroneAlarmRecord")
public R<IPage<FwDroneAlarmRecordVO>> page(FwDroneAlarmRecordDTO fwDroneAlarmRecord, Query query) {
- IPage<FwDroneAlarmRecordVO> pages = fwDroneAlarmRecordService.selectFwDroneAlarmRecordPage(Condition.getPage(query), fwDroneAlarmRecord);
+ IPage<FwDroneAlarmRecordVO> pages = cockpitService.selectFwDroneAlarmRecordPage(Condition.getPage(query), fwDroneAlarmRecord);
return R.data(pages);
}
@@ -64,7 +62,7 @@
@ApiOperationSupport(order = 2)
@ApiOperation(value = "设备查询", notes = "传入fwDevice")
public R<IPage<FwDeviceVO>> page(FwDeviceDTO fwDevice, Query query) {
- IPage<FwDeviceEntity> pages = fwDeviceService.selectFwDevicePage(Condition.getPage(query), fwDevice);
+ IPage<FwDeviceEntity> pages = cockpitService.selectFwDevicePage(Condition.getPage(query), fwDevice);
return R.data(FwDeviceWrapper.build().pageVO(pages));
}
@@ -73,12 +71,9 @@
*/
@GetMapping("/deviceStatistics")
@ApiOperationSupport(order = 3)
- @ApiOperation(value = "设备统计", notes = "返回设备统计、无线电、光电、雷达等数据")
- public R<DeviceStatisticsVO> getDeviceStatistics() {
- DeviceStatisticsVO statistics = new DeviceStatisticsVO();
- // 假设从服务层获取统计数据，这里仅示例填充数据
- statistics.setDetectCount(3);
- statistics.setCountermeasuresCount(4);
+ @ApiOperation(value = "设备统计", notes = "返回侦测设备，反制设备数量")
+ public R<List<DeviceStatisticsVO>> getDeviceStatistics() {
+ List<DeviceStatisticsVO> statistics = cockpitService.statisticalDeviceType();
return R.data(statistics);
}
@@ -89,15 +84,7 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "告警记录统计", notes = "返回实时告警、设备告警、历史告警数量")
public R<AlarmStatisticsVO> getAlarmStatistics() {
- AlarmStatisticsVO statistics = new AlarmStatisticsVO();
- // 假设从服务层获取统计数据，这里仅示例填充数据
- statistics.setDeviceCount(5);
- statistics.setRadioCount(1);
- statistics.setOpticalCount(2);
- statistics.setRadarCount(2);
- statistics.setRealTimeAlarmCount(5);
- statistics.setDeviceAlarmCount(5);
- statistics.setHistoryAlarmCount(5);
+ AlarmStatisticsVO statistics = cockpitService.statisticsAlarmsAndDeviceRecords();
return R.data(statistics);
}
@@ -109,6 +96,6 @@
@ApiOperation(value = "信号干扰，诱导驱离", notes = "传入fwEffectEval")
public R submit(@Valid @RequestBody FwEffectEvalDTO fwEffectEval) {
FwEffectEvalEntity fwEffectEvalEntity = Objects.requireNonNull(BeanUtil.copy(fwEffectEval, FwEffectEvalEntity.class));
- return R.status(fwEffectEvalService.saveOrUpdate(fwEffectEvalEntity));
+ return R.status(cockpitService.saveOrUpdate(fwEffectEvalEntity));
}
}
--
Gitblit v1.9.3