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 | 55 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 35 insertions(+), 20 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 4566e5c..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,11 +16,11 @@
*/
package org.sxkj.fw.device.service.impl;
-import lombok.AllArgsConstructor;
-import org.sxkj.fw.device.dto.FwDeviceAndTrackDTO;
+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.entity.FwDeviceTrackEntity;
-import org.sxkj.fw.device.service.IFwDeviceTrackService;
+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;
@@ -29,26 +29,25 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
-import org.sxkj.fw.device.wrapper.FwDeviceTrackWrapper;
-import org.sxkj.fw.device.wrapper.FwDeviceWrapper;
-
import java.util.List;
/**
* 设备表 服务实现类
*
- * @author Aix
+ * @author aix
* @since 2026-01-08
*/
@Service
-@AllArgsConstructor
public class FwDeviceServiceImpl extends BaseServiceImpl<FwDeviceMapper, FwDeviceEntity> implements IFwDeviceService {
- private final IFwDeviceTrackService fwDeviceTrackService;
+ @Override
+ public IPage<FwDeviceEntity> selectFwDevicePage(IPage<FwDeviceEntity> page, FwDeviceDTO fwDevice) {
+ return page.setRecords(baseMapper.selectFwDevicePage(page, fwDevice));
+ }
@Override
- public IPage<FwDeviceVO> selectFwDevicePage(IPage<FwDeviceVO> page, FwDeviceVO fwDevice) {
- return page.setRecords(baseMapper.selectFwDevicePage(page, fwDevice));
+ public List<FwDeviceEntity> selectFwDeviceList(Integer isAreaSelect, Long areaId) {
+ return baseMapper.selectFwDeviceList(isAreaSelect, areaId);
}
@@ -61,16 +60,32 @@
return fwDeviceList;
}
+ /**
+ * 获取设备列表
+ * @param page
+ * @param fwDevice
+ * @return
+ */
@Override
- public Boolean saveFwDevice(FwDeviceAndTrackDTO dto) {
- // 保存设备信息
- FwDeviceEntity entity = FwDeviceWrapper.build().entityDTO(dto.getFwDeviceDTO());
- save(entity);
+ public IPage<CockpitFwDeviceVO> selectCockpitDevicePage(IPage<CockpitFwDeviceVO> page, FwDeviceDTO fwDevice) {
+ return page.setRecords(baseMapper.selectCockpitDevicePage(page, fwDevice));
+ }
- // 保存设备跟踪信息
- FwDeviceTrackEntity trackEntity = FwDeviceTrackWrapper.build().entityDTO(dto.getFwDeviceTrackDTO());
- trackEntity.setDeviceId(entity.getId());
+ /**
+ * 设备类型统计
+ * @return
+ */
+ @Override
+ public List<DeviceStatisticsVO> statisticalDeviceType() {
+ return baseMapper.statisticalDeviceType();
+ }
- return fwDeviceTrackService.save(trackEntity);
+ /**
+ * 设备属性统计
+ * @return
+ */
+ @Override
+ public AlarmStatisticsVO statisticalDeviceAtt() {
+ return baseMapper.statisticalDeviceAtt();
}
}
--
Gitblit v1.9.3