From f0ad850a7a962dcf53c6c88e31de4bc2b1e20457 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Tue, 13 Jan 2026 15:18:16 +0800
Subject: [PATCH] 设备和区域场景list 过滤时增加id返回已绑定的子数据
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java
index aff9e3e..bd5174c 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java
@@ -16,8 +16,11 @@
*/
package org.sxkj.fw.device.service.impl;
+import org.sxkj.fw.cockpit.vo.AlarmStatisticsVO;
+import org.sxkj.fw.cockpit.vo.DeviceStatisticsVO;
import org.sxkj.fw.device.dto.FwDeviceDTO;
import org.sxkj.fw.device.entity.FwDeviceEntity;
+import org.sxkj.fw.device.vo.CockpitFwDeviceVO;
import org.sxkj.fw.device.vo.FwDeviceVO;
import org.sxkj.fw.device.excel.FwDeviceExcel;
import org.sxkj.fw.device.mapper.FwDeviceMapper;
@@ -38,8 +41,13 @@
public class FwDeviceServiceImpl extends BaseServiceImpl<FwDeviceMapper, FwDeviceEntity> implements IFwDeviceService {
@Override
- public IPage<FwDeviceVO> selectFwDevicePage(IPage<FwDeviceVO> page, FwDeviceDTO fwDevice) {
+ public IPage<FwDeviceEntity> selectFwDevicePage(IPage<FwDeviceEntity> page, FwDeviceDTO fwDevice) {
return page.setRecords(baseMapper.selectFwDevicePage(page, fwDevice));
+ }
+
+ @Override
+ public List<FwDeviceEntity> selectFwDeviceList(Integer isAreaSelect, Long areaId) {
+ return baseMapper.selectFwDeviceList(isAreaSelect, areaId);
}
@@ -52,4 +60,32 @@
return fwDeviceList;
}
+ /**
+ * 获取设备列表
+ * @param page
+ * @param fwDevice
+ * @return
+ */
+ @Override
+ public IPage<CockpitFwDeviceVO> selectCockpitDevicePage(IPage<CockpitFwDeviceVO> page, FwDeviceDTO fwDevice) {
+ return page.setRecords(baseMapper.selectCockpitDevicePage(page, fwDevice));
+ }
+
+ /**
+ * 设备类型统计
+ * @return
+ */
+ @Override
+ public List<DeviceStatisticsVO> statisticalDeviceType() {
+ return baseMapper.statisticalDeviceType();
+ }
+
+ /**
+ * 设备属性统计
+ * @return
+ */
+ @Override
+ public AlarmStatisticsVO statisticalDeviceAtt() {
+ return baseMapper.statisticalDeviceAtt();
+ }
}
--
Gitblit v1.9.3