Merge remote-tracking branch 'origin/master'

rain

2026-02-09 66bfbdb9251c22ffa2b5f05595a76a3547a2f5eb

 drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/service/impl/GdFlyerServiceImpl.java

@@ -17,6 +17,7 @@
package org.sxkj.gd.flyer.service.impl;

import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.StringUtil;
import org.sxkj.gd.flyer.entity.GdFlyerEntity;
import org.sxkj.gd.flyer.param.GdFlyerPageParam;
import org.sxkj.gd.flyer.vo.GdFlyerVO;
@@ -27,8 +28,10 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.sxkj.gd.utils.GdGeoAddressUtil;
import org.sxkj.system.cache.SysCache;

import java.util.ArrayList;
import java.util.List;

/**
@@ -42,8 +45,20 @@

   @Override
   public IPage<GdFlyerVO> selectGdFlyerPage(IPage<GdFlyerVO> page, GdFlyerPageParam gdFlyer) {
      List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
      gdFlyer.setDeptList(deptList);
       if (!AuthUtil.isAdministrator()) {
         List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
         gdFlyer.setDeptList(deptList);
      }
            // 通过经纬度获取行政区划
      if (StringUtil.isNotBlank(gdFlyer.getLongitude()) && StringUtil.isNotBlank(gdFlyer.getLatitude())) {
         String areaCode = GdGeoAddressUtil.getCountyCode(Double.valueOf(gdFlyer.getLongitude()), Double.valueOf(gdFlyer.getLatitude()));
         // 去掉前面三位数字
         if (areaCode != null && areaCode.length() > 3) {
            areaCode = areaCode.substring(3);
         }
         gdFlyer.setAreaCode(areaCode);
      }

      return page.setRecords(baseMapper.selectGdFlyerPage(page, gdFlyer));
   }

@@ -51,7 +66,7 @@
   @Override
   public List<GdFlyerExcel> exportGdFlyer(Wrapper<GdFlyerEntity> queryWrapper) {
      List<GdFlyerExcel> gdFlyerList = baseMapper.exportGdFlyer(queryWrapper);
      //gdFlyerList.forEach(gdFlyer -> {
      // gdFlyerList.forEach(gdFlyer -> {
      //   gdFlyer.setTypeName(DictCache.getValue(DictEnum.YES_NO, GdFlyer.getType()));
      //});
      return gdFlyerList;