Merge remote-tracking branch 'origin/master'

linwei

2026-01-28 c04afebf9cebfd65bf55c2395e732f36f558d208

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

@@ -16,29 +16,73 @@
 */
package org.sxkj.fw.device.service.impl;

import org.sxkj.fw.cockpit.vo.AlarmStatisticsVO;
import org.sxkj.fw.cockpit.vo.DeviceStatisticsVO;
import org.sxkj.fw.common.GenericConverter;
import org.sxkj.fw.device.dto.FwDeviceDTO;
import org.sxkj.fw.device.entity.FwDeviceEntity;
import org.sxkj.fw.device.param.FwDevicePageParam;
import org.sxkj.fw.device.vo.CockpitFwDeviceVO;
import org.sxkj.fw.device.vo.DeviceTypeStatisticsVO;
import org.sxkj.fw.device.vo.FwDeviceVO;
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.sxkj.fw.device.wrapper.FwDeviceWrapper;
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 org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.utils.StringUtil;

import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import javax.annotation.Resource;

/**
 * 反无设备表 服务实现类
 * 设备表 服务实现类
 *
 * @author AIX
 * @since 2026-01-06
 * @author aix
 * @since 2026-01-08
 */
@Service
public class FwDeviceServiceImpl extends BaseServiceImpl<FwDeviceMapper, FwDeviceEntity> implements IFwDeviceService {

   @Resource
   private IFwAreaDivideService fwAreaDivideService;

   @Override
   public IPage<FwDeviceVO> selectFwDevicePage(IPage<FwDeviceVO> page, FwDeviceVO fwDevice) {
   public IPage<FwDeviceEntity> selectFwDevicePage(IPage<FwDeviceEntity> page, FwDeviceDTO fwDevice) {
      return page.setRecords(baseMapper.selectFwDevicePage(page, fwDevice));
   }

   @Override
   public IPage<FwDeviceVO> selectFwDevicePageVo(FwDevicePageParam fwDevice, Query query) {
      IPage<FwDeviceEntity> pages = selectFwDevicePage(Condition.getPage(query), GenericConverter.convert(fwDevice, FwDeviceDTO.class));
      IPage<FwDeviceVO> result = FwDeviceWrapper.build().pageVO(pages);
      List<FwDeviceVO> records = result.getRecords();
      if (records != null && !records.isEmpty()) {
         List<Long> deviceIds = records.stream()
            .map(FwDeviceVO::getId)
            .filter(id -> id != null)
            .collect(Collectors.toList());
         Map<Long, String> sceneNameMap = selectSceneNameByDeviceIds(deviceIds);
         for (FwDeviceVO record : records) {
            String sceneName = sceneNameMap.get(record.getId());
            record.setSceneName(StringUtil.isBlank(sceneName) ? "/" : sceneName);
         }
      }
      return result;
   }

   @Override
   public List<FwDeviceEntity> selectFwDeviceList(Integer isAreaSelect, Long areaId, Integer status, Integer isTrack) {
      return baseMapper.selectFwDeviceList(isAreaSelect, areaId, status, isTrack);
   }


@@ -51,4 +95,75 @@
      return fwDeviceList;
   }

   /**
    * 获取设备列表
    * @param page
    * @param fwDevice
    * @return
    */
   @Override
   public IPage<CockpitFwDeviceVO> selectCockpitDevicePage(IPage<CockpitFwDeviceVO> page, FwDeviceDTO fwDevice) {
      return page.setRecords(baseMapper.selectCockpitDevicePage(page, fwDevice));
   }

   /**
    * 设备类型统计
    * @return
    */
   @Override
   public List<DeviceStatisticsVO> statisticalDeviceType() {
      return baseMapper.statisticalDeviceType();
   }

   /**
    * 设备统计 - 按类型统计
    * @return 统计数据
    */
   @Override
   public List<DeviceTypeStatisticsVO> getDeviceTypeStatistics() {
      return baseMapper.getDeviceTypeStatistics();
   }

   @Override
   public List<DeviceStatisticsVO> getDeviceOutStatistics(String effectiveRangeKmIsNotNull) {
      return baseMapper.getDeviceOutStatistics(effectiveRangeKmIsNotNull);
   }

   @Override
   public List<DeviceStatisticsVO> getDeviceManufacturerStatistics() {
      return baseMapper.getDeviceManufacturerStatistics();
   }

   /**
    * 设备属性统计
    * @return
    */
   @Override
   public AlarmStatisticsVO statisticalDeviceAtt() {
      return baseMapper.statisticalDeviceAtt();
   }

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

   @Override
   public boolean existsAreaBindByDeviceId(Long deviceId) {
      return fwAreaDivideService.existsAreaByDeviceId(deviceId);
   }

   /**
    * 保存或更新设备信息
    * @param fwDeviceEntity
    * @return
    */
   @Override
   public boolean saveOrUpdateDevice(FwDeviceEntity fwDeviceEntity) {
      if (fwDeviceEntity.getEffectiveRangeKm() == null || fwDeviceEntity.getEffectiveRangeKm().compareTo(BigDecimal.ZERO) == 0 ) {
         fwDeviceEntity.setLatitude("");
         fwDeviceEntity.setLongitude("");
      }
      return saveOrUpdate(fwDeviceEntity);
   }
}