From 46b35a8bbb4767b2a28b03a88f705d18c9dbf426 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Wed, 14 Jan 2026 15:02:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.java | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.java
index cc4efee..d69f38f 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.java
@@ -16,17 +16,18 @@
*/
package org.sxkj.fw.device.mapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
import org.sxkj.fw.cockpit.vo.AlarmStatisticsVO;
+import org.sxkj.fw.device.vo.DeviceTypeStatisticsVO;
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 com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.apache.ibatis.annotations.Param;
+import org.sxkj.fw.device.vo.CockpitFwDeviceVO;
+
import java.util.List;
/**
@@ -58,19 +59,36 @@
/**
* 获取导出数据
- *
* @param queryWrapper
* @return
*/
List<FwDeviceExcel> exportFwDevice(@Param("ew") Wrapper<FwDeviceEntity> queryWrapper);
/**
- * 设备统计
- * @return
+ * 设备统计 - 驾驶舱使用
+ * @return 统计数据
*/
List<DeviceStatisticsVO> statisticalDeviceType();
/**
+ * 设备统计 - 按类型统计
+ * @return 统计数据
+ */
+ List<DeviceTypeStatisticsVO> getDeviceTypeStatistics();
+
+ /**
+ * 设备出库去向统计
+ * @return 统计数据
+ */
+ List<DeviceStatisticsVO> getDeviceOutStatistics();
+
+ /**
+ * 设备生产厂商统计
+ * @return 统计数据
+ */
+ List<DeviceStatisticsVO> getDeviceManufacturerStatistics();
+
+ /**
* 告警统计
* @return
*/
--
Gitblit v1.9.3