From c04afebf9cebfd65bf55c2395e732f36f558d208 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 28 Jan 2026 10:30:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.java | 69 ++++++++++++++++++++++++++++++----
1 files changed, 60 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 759da12..8aea3ee 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,20 +16,25 @@
*/
package org.sxkj.fw.device.mapper;
-import org.sxkj.fw.device.entity.FwDeviceEntity;
-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.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.excel.FwDeviceExcel;
+import org.sxkj.fw.device.vo.CockpitFwDeviceVO;
+
import java.util.List;
/**
- * 反无设备表 Mapper 接口
+ * 设备表 Mapper 接口
*
- * @author AIX
- * @since 2026-01-06
+ * @author aix
+ * @since 2026-01-08
*/
public interface FwDeviceMapper extends BaseMapper<FwDeviceEntity> {
@@ -40,15 +45,61 @@
* @param fwDevice
* @return
*/
- List<FwDeviceVO> selectFwDevicePage(IPage page, FwDeviceVO fwDevice);
+ List<FwDeviceEntity> selectFwDevicePage(IPage page, FwDeviceDTO fwDevice);
+
+ /**
+ * 列表查询
+ *
+ * @param isAreaSelect
+ * @param areaId
+ * @return
+ */
+ List<FwDeviceEntity> selectFwDeviceList(@Param("isAreaSelect") Integer isAreaSelect, @Param("areaId") Long areaId,
+ @Param("status") Integer status, @Param("isTrack") Integer isTrack);
/**
* 获取导出数据
- *
* @param queryWrapper
* @return
*/
List<FwDeviceExcel> exportFwDevice(@Param("ew") Wrapper<FwDeviceEntity> queryWrapper);
+ /**
+ * 设备统计 - 驾驶舱使用
+ * @return 统计数据
+ */
+ List<DeviceStatisticsVO> statisticalDeviceType();
+
+ /**
+ * 设备统计 - 按类型统计
+ * @return 统计数据
+ */
+ List<DeviceTypeStatisticsVO> getDeviceTypeStatistics();
+
+ /**
+ * 设备出库去向统计
+ * @return 统计数据
+ */
+ List<DeviceStatisticsVO> getDeviceOutStatistics(String effectiveRangeKmIsNotNull);
+
+ /**
+ * 设备生产厂商统计
+ * @return 统计数据
+ */
+ List<DeviceStatisticsVO> getDeviceManufacturerStatistics();
+
+ /**
+ * 告警统计
+ * @return
+ */
+ AlarmStatisticsVO statisticalDeviceAtt();
+
+ /**
+ * 获取设备列表
+ * @param page
+ * @param fwDevice
+ * @return
+ */
+ List<CockpitFwDeviceVO> selectCockpitDevicePage(IPage<CockpitFwDeviceVO> page, FwDeviceDTO fwDevice);
}
--
Gitblit v1.9.3