Merge remote-tracking branch 'origin/master'

rain

2026-01-14 46b35a8bbb4767b2a28b03a88f705d18c9dbf426

 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
    */