Merge remote-tracking branch 'origin/master'

linwei

2026-01-09 bbc3d8a4b43256e6cafefc7ab33f34e1459aed9b

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.java

@@ -16,6 +16,8 @@
 */
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;
@@ -41,7 +43,7 @@
    * @param fwDevice
    * @return
    */
   List<FwDeviceVO> selectFwDevicePage(IPage page, FwDeviceDTO fwDevice);
   List<FwDeviceEntity> selectFwDevicePage(IPage page, FwDeviceDTO fwDevice);


   /**
@@ -52,4 +54,15 @@
    */
   List<FwDeviceExcel> exportFwDevice(@Param("ew") Wrapper<FwDeviceEntity> queryWrapper);

   /**
    * 设备统计
    * @return
    */
   List<DeviceStatisticsVO> statisticalDeviceType();

   /**
    *
    * @return
    */
   AlarmStatisticsVO statisticalDeviceAtt();
}