From 497e3161f4e8fc2be2a78a348ccf3dfcfe4ea602 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 17 Jan 2026 15:40:01 +0800
Subject: [PATCH] 反制
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/controller/CockpitController.java | 23 +++++++----------------
1 files changed, 7 insertions(+), 16 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 8900784..1e4ad0d 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
@@ -8,26 +8,18 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
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;
-import org.sxkj.fw.detection.entity.FwEffectEvalEntity;
-import org.sxkj.fw.detection.service.IFwEffectEvalService;
+import org.sxkj.fw.detection.param.FwEffectEvalParam;
import org.sxkj.fw.device.dto.FwDeviceDTO;
-import org.sxkj.fw.device.entity.FwDeviceEntity;
-import org.sxkj.fw.device.service.IFwDeviceService;
-import org.sxkj.fw.device.vo.FwDeviceVO;
-import org.sxkj.fw.device.wrapper.FwDeviceWrapper;
+import org.sxkj.fw.device.vo.CockpitFwDeviceVO;
import org.sxkj.fw.record.dto.FwDroneAlarmRecordDTO;
-import org.sxkj.fw.record.service.IFwDroneAlarmRecordService;
import org.sxkj.fw.record.vo.FwDroneAlarmRecordVO;
import javax.validation.Valid;
import java.util.List;
-import java.util.Objects;
/**
* 数据驾驶舱
@@ -61,9 +53,9 @@
@GetMapping("/deviceSearch")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "设备查询", notes = "传入fwDevice")
- public R<IPage<FwDeviceVO>> page(FwDeviceDTO fwDevice, Query query) {
- IPage<FwDeviceEntity> pages = cockpitService.selectFwDevicePage(Condition.getPage(query), fwDevice);
- return R.data(FwDeviceWrapper.build().pageVO(pages));
+ public R<IPage<CockpitFwDeviceVO>> page(FwDeviceDTO fwDevice, Query query) {
+ IPage<CockpitFwDeviceVO> pages = cockpitService.selectCockpitDevicePage(Condition.getPage(query), fwDevice);
+ return R.data(pages);
}
/**
@@ -94,8 +86,7 @@
@PostMapping("/interferenceAndExpulsion")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "信号干扰，诱导驱离", notes = "传入fwEffectEval")
- public R submit(@Valid @RequestBody FwEffectEvalDTO fwEffectEval) {
- FwEffectEvalEntity fwEffectEvalEntity = Objects.requireNonNull(BeanUtil.copy(fwEffectEval, FwEffectEvalEntity.class));
- return R.status(cockpitService.saveOrUpdate(fwEffectEvalEntity));
+ public R interferenceAndExpulsion(@Valid @RequestBody FwEffectEvalParam fwEffectEvalParam) {
+ return R.status(cockpitService.interferenceAndExpulsion(fwEffectEvalParam));
}
}
--
Gitblit v1.9.3