From bc1a6bb5bb2803ed6a5669a976bf2b47f3dacfca Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 14 Jan 2026 11:27:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 insertions(+), 0 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 bb515d1..8ec85e3 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,17 +16,23 @@
*/
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;
import org.sxkj.fw.device.service.IFwDeviceService;
+import org.sxkj.fw.area.service.IFwAreaDivideService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
import java.util.List;
+import java.util.Map;
+import javax.annotation.Resource;
/**
* 设备表 服务实现类
@@ -37,9 +43,17 @@
@Service
public class FwDeviceServiceImpl extends BaseServiceImpl<FwDeviceMapper, FwDeviceEntity> implements IFwDeviceService {
+ @Resource
+ private IFwAreaDivideService fwAreaDivideService;
+
@Override
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 +66,37 @@
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();
+ }
+
+ @Override
+ public Map<Long, String> selectSceneNameByDeviceIds(List<Long> deviceIds) {
+ return fwAreaDivideService.selectSceneNameByDeviceIds(deviceIds);
+ }
}
--
Gitblit v1.9.3