From ac3d3e016125892964104f9b4d06978fa8d71063 Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Wed, 14 Jan 2026 14:57:34 +0800
Subject: [PATCH] add-6.设备-类型分析,7.设备-出库去向统计8.设备-产商统计

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java |   54 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 53 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 38f7350..1d0636a 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
@@ -20,15 +20,20 @@
 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.DeviceTypeStatisticsVO;
 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;
 
 /**
  * 设备表 服务实现类
@@ -39,9 +44,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);
 	}
 
 
@@ -55,7 +68,18 @@
 	}
 
 	/**
-	 *
+	 * 获取设备列表
+	 * @param page
+	 * @param fwDevice
+	 * @return
+	 */
+	@Override
+	public IPage<CockpitFwDeviceVO> selectCockpitDevicePage(IPage<CockpitFwDeviceVO> page, FwDeviceDTO fwDevice) {
+		return page.setRecords(baseMapper.selectCockpitDevicePage(page, fwDevice));
+	}
+
+	/**
+	 * 设备类型统计
 	 * @return
 	 */
 	@Override
@@ -63,8 +87,36 @@
 		return baseMapper.statisticalDeviceType();
 	}
 
+	/**
+	 * 设备统计 - 按类型统计
+	 * @return 统计数据
+	 */
+	@Override
+	public List<DeviceTypeStatisticsVO> getDeviceTypeStatistics() {
+		return baseMapper.getDeviceTypeStatistics();
+	}
+
+	@Override
+	public List<DeviceStatisticsVO> getDeviceOutStatistics() {
+		return baseMapper.getDeviceOutStatistics();
+	}
+
+	@Override
+	public List<DeviceStatisticsVO> getDeviceManufacturerStatistics() {
+		return baseMapper.getDeviceManufacturerStatistics();
+	}
+
+	/**
+	 * 设备属性统计
+	 * @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