导出优化

linwei

2024-02-03 7a867acb6c49c5d4774bdfa6be83043017176e39

 src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java

@@ -18,12 +18,14 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import liquibase.repackaged.org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.cache.SysCache;
import org.springblade.common.node.TreeStringNode;
import org.springblade.common.utils.IdUtils;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.SpringUtil;
@@ -53,8 +55,10 @@
import org.springblade.modules.police.entity.PoliceAffairsGridEntity;
import org.springblade.modules.police.service.IPoliceAffairsGridService;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.DictBiz;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IDictBizService;
import org.springblade.modules.system.service.IUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -1153,6 +1157,15 @@
         }
      }
      List<NinePlaceExcel> aa = baseMapper.export(place, list, regionChildCodesList, isAdministrator);
      IDictBizService bean = SpringUtils.getBean(IDictBizService.class);
      List<DictBiz> nineType = bean.list(Wrappers.<DictBiz>lambdaQuery().eq(DictBiz::getCode, "nineType").eq(DictBiz::getIsDeleted, 0));
      for (NinePlaceExcel ninePlaceExcel : aa) {
         for (DictBiz dictBiz : nineType) {
            if (StringUtils.isNotBlank(ninePlaceExcel.getNineType()) && ninePlaceExcel.getNineType().equals(dictBiz.getDictKey())) {
               ninePlaceExcel.setNineType(dictBiz.getDictValue());
            }
         }
      }
      return aa;
   }

@@ -1165,14 +1178,14 @@
      List<PlaceEntity> list = baseMapper.getPlaceNotJwGridCode();
      // 遍历
      for (PlaceEntity placeEntity : list) {
         if (!Strings.isBlank(placeEntity.getLng())){
         if (!Strings.isBlank(placeEntity.getLng())) {
            // 空间分析
            //点坐标解析
            String point = "'POINT(" + placeEntity.getLng() + " " + placeEntity.getLat() +")'";
            String point = "'POINT(" + placeEntity.getLng() + " " + placeEntity.getLat() + ")'";
            //String point = "'POINT(" + villageInfoExcel.getLatitude() + " " + villageInfoExcel.getLongitude() +")'";
            List<PoliceAffairsGridEntity> policeAffairsGridEntities
               = SpringUtil.getBean(IPoliceAffairsGridService.class).spatialAnalysis(point);
            if (policeAffairsGridEntities.size()>0){
            if (policeAffairsGridEntities.size() > 0) {
               PoliceAffairsGridEntity policeAffairsGridEntity = policeAffairsGridEntities.get(0);
               placeEntity.setJwGridCode(policeAffairsGridEntity.getJwGridCode());
               // 更新