Merge remote-tracking branch 'origin/master'

linwei

2026-01-14 bc1a6bb5bb2803ed6a5669a976bf2b47f3dacfca

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java

@@ -25,11 +25,14 @@
import org.sxkj.fw.device.excel.FwDeviceExcel;
import org.sxkj.fw.device.mapper.FwDeviceMapper;
import org.sxkj.fw.device.service.IFwDeviceService;
import org.sxkj.fw.area.service.IFwAreaDivideService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;

/**
 * 设备表 服务实现类
@@ -39,6 +42,9 @@
 */
@Service
public class FwDeviceServiceImpl extends BaseServiceImpl<FwDeviceMapper, FwDeviceEntity> implements IFwDeviceService {

   @Resource
   private IFwAreaDivideService fwAreaDivideService;

   @Override
   public IPage<FwDeviceEntity> selectFwDevicePage(IPage<FwDeviceEntity> page, FwDeviceDTO fwDevice) {
@@ -88,4 +94,9 @@
   public AlarmStatisticsVO statisticalDeviceAtt() {
      return baseMapper.statisticalDeviceAtt();
   }

   @Override
   public Map<Long, String> selectSceneNameByDeviceIds(List<Long> deviceIds) {
      return fwAreaDivideService.selectSceneNameByDeviceIds(deviceIds);
   }
}