Merge remote-tracking branch 'origin/master'

linwei

2026-01-28 016caee2dd92a8c352834c382fd340b39fddc9ab

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

@@ -54,7 +54,8 @@
    * @param areaId
    * @return
    */
   List<FwDeviceEntity> selectFwDeviceList(@Param("isAreaSelect") Integer isAreaSelect, @Param("areaId") Long areaId);
   List<FwDeviceEntity> selectFwDeviceList(@Param("isAreaSelect") Integer isAreaSelect, @Param("areaId") Long areaId,
      @Param("status") Integer status, @Param("isTrack") Integer isTrack);


   /**
@@ -68,31 +69,31 @@
    * 设备统计 - 驾驶舱使用
    * @return 统计数据
    */
   List<DeviceStatisticsVO> statisticalDeviceType();
   List<DeviceStatisticsVO> statisticalDeviceType(List<Long> deptList);

   /**
    * 设备统计 - 按类型统计
    * @return 统计数据
    */
   List<DeviceTypeStatisticsVO> getDeviceTypeStatistics();
   List<DeviceTypeStatisticsVO> getDeviceTypeStatistics(List<Long> deptList);

   /**
    * 设备出库去向统计
    * @return 统计数据
    */
   List<DeviceStatisticsVO> getDeviceOutStatistics();
   List<DeviceStatisticsVO> getDeviceOutStatistics(String effectiveRangeKmIsNotNull,List<Long> deptList);

   /**
    * 设备生产厂商统计
    * @return 统计数据
    */
   List<DeviceStatisticsVO> getDeviceManufacturerStatistics();
   List<DeviceStatisticsVO> getDeviceManufacturerStatistics(List<Long> deptList);

   /**
    * 告警统计
    * @return
    */
   AlarmStatisticsVO statisticalDeviceAtt();
   AlarmStatisticsVO statisticalDeviceAtt(List<Long> deptList);

   /**
    * 获取设备列表
@@ -101,4 +102,13 @@
    * @return
    */
   List<CockpitFwDeviceVO> selectCockpitDevicePage(IPage<CockpitFwDeviceVO> page, FwDeviceDTO fwDevice);

   /**
    * 按设备ID更新出入库状态
    *
    * @param deviceId 设备ID
    * @param trackStatus 出入库状态
    * @return 影响行数
    */
   int updateTrackStatusByDeviceId(@Param("deviceId") Long deviceId, @Param("trackStatus") Integer trackStatus);
}