From bbc3d8a4b43256e6cafefc7ab33f34e1459aed9b Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 09 Jan 2026 15:02:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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 831b6ef..731cf45 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,6 +16,9 @@
*/
package org.sxkj.fw.device.mapper;
+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.FwDeviceVO;
import org.sxkj.fw.device.excel.FwDeviceExcel;
@@ -28,7 +31,7 @@
/**
* 设备表 Mapper 接口
*
- * @author Aix
+ * @author aix
* @since 2026-01-08
*/
public interface FwDeviceMapper extends BaseMapper<FwDeviceEntity> {
@@ -40,7 +43,7 @@
* @param fwDevice
* @return
*/
- List<FwDeviceVO> selectFwDevicePage(IPage page, FwDeviceVO fwDevice);
+ List<FwDeviceEntity> selectFwDevicePage(IPage page, FwDeviceDTO fwDevice);
/**
@@ -51,4 +54,15 @@
*/
List<FwDeviceExcel> exportFwDevice(@Param("ew") Wrapper<FwDeviceEntity> queryWrapper);
+ /**
+ * 设备统计
+ * @return
+ */
+ List<DeviceStatisticsVO> statisticalDeviceType();
+
+ /**
+ *
+ * @return
+ */
+ AlarmStatisticsVO statisticalDeviceAtt();
}
--
Gitblit v1.9.3