From d9969f509099240514f10421c6cfad4d914b7b7c Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 12 Jan 2026 15:45:29 +0800
Subject: [PATCH] 数据驾驶舱优化
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/service/impl/CockpitServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/service/impl/CockpitServiceImpl.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/service/impl/CockpitServiceImpl.java
index 8f60a5c..12709fc 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/service/impl/CockpitServiceImpl.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/service/impl/CockpitServiceImpl.java
@@ -11,7 +11,9 @@
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.CockpitFwDeviceVO;
import org.sxkj.fw.record.dto.FwDroneAlarmRecordDTO;
+import org.sxkj.fw.record.entity.FwDroneAlarmRecordEntity;
import org.sxkj.fw.record.service.IFwDroneAlarmRecordService;
import org.sxkj.fw.record.vo.FwDroneAlarmRecordVO;
@@ -37,8 +39,8 @@
}
@Override
- public IPage<FwDeviceEntity> selectFwDevicePage(IPage<FwDeviceEntity> page, FwDeviceDTO fwDevice) {
- return fwDeviceService.selectFwDevicePage(page, fwDevice);
+ public IPage<CockpitFwDeviceVO> selectCockpitDevicePage(IPage<CockpitFwDeviceVO> page, FwDeviceDTO fwDevice) {
+ return fwDeviceService.selectCockpitDevicePage(page, fwDevice);
}
@Override
@@ -48,6 +50,10 @@
@Override
public boolean saveOrUpdate(FwEffectEvalEntity fwEffectEvalEntity) {
+ FwDroneAlarmRecordEntity alarmRecordEntity = fwDroneAlarmRecordService.getById(fwEffectEvalEntity.getAlarmRecordId());
+ FwDeviceEntity device = fwDeviceService.getById(alarmRecordEntity.getDeviceId());
+ fwEffectEvalEntity.setDeviceId(alarmRecordEntity.getDeviceId());
+ fwEffectEvalEntity.setCounterEffect("1");
return fwEffectEvalService.saveOrUpdate(fwEffectEvalEntity);
}
--
Gitblit v1.9.3