应急空间新增字典，查询修改

zhongrj

2024-12-10 a9a2d0f1d8d271985869dd2b26ac29217191ab51

 src/main/java/org/springblade/modules/yw/service/impl/EmergencySpaceServiceImpl.java

@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.cache.DictBizCache;
import org.springblade.common.cache.SysCache;
import org.springblade.common.utils.PositionUtil;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.modules.yw.entity.EmergencySpaceEntity;
@@ -39,7 +41,12 @@
    */
   @Override
   public IPage<EmergencySpaceVO> selectEmergencySpacePage(IPage<EmergencySpaceVO> page, EmergencySpaceVO emergencySpace) {
      return page.setRecords(baseMapper.selectEmergencySpacePage(page, emergencySpace));
      List<EmergencySpaceVO> emergencySpaceVOS = baseMapper.selectEmergencySpacePage(page, emergencySpace);
      for (EmergencySpaceVO emergencySpaceVO : emergencySpaceVOS) {
         // 设置应急空间主要用途
         emergencySpaceVO.setMainFuncName(DictBizCache.getValues("emergency_space_use",emergencySpaceVO.getMainFunc()));
      }
      return page.setRecords(emergencySpaceVOS);
   }

   /**
@@ -53,17 +60,21 @@
      for (EmergencySpaceExcel emergencySpaceExcel : data) {
         // 数据拷贝
         EmergencySpaceEntity emergencySpaceEntity = Objects.requireNonNull(BeanUtil.copy(emergencySpaceExcel, EmergencySpaceEntity.class));
         // 防控转换
         // 类型转换
         if (!Strings.isBlank(emergencySpaceExcel.getType())){
            emergencySpaceEntity.setType(Integer.parseInt(emergencySpaceExcel.getType()));
         }
         // 防控级别转换
         if (!Strings.isBlank(emergencySpaceExcel.getPreLevel())){
            emergencySpaceEntity.setPreLevel(Integer.parseInt(emergencySpaceExcel.getPreLevel()));
         }
         // 经纬度转换
         if (!Strings.isBlank(emergencySpaceExcel.getLng())) {
            emergencySpaceEntity.setLng(PositionUtil.tranformPos(emergencySpaceExcel.getLng()).toString());
         }
         if (!Strings.isBlank(emergencySpaceExcel.getLat())) {
            emergencySpaceEntity.setLat(PositionUtil.tranformPos(emergencySpaceExcel.getLat()).toString());
         }
//         if (!Strings.isBlank(emergencySpaceExcel.getLng())) {
//            emergencySpaceEntity.setLng(PositionUtil.tranformPos(emergencySpaceExcel.getLng()).toString());
//         }
//         if (!Strings.isBlank(emergencySpaceExcel.getLat())) {
//            emergencySpaceEntity.setLat(PositionUtil.tranformPos(emergencySpaceExcel.getLat()).toString());
//         }
         // 设置企业id
         setFirm(emergencySpaceExcel,emergencySpaceEntity);
         // 是否已入库
@@ -91,6 +102,9 @@
      QueryWrapper<EmergencySpaceEntity> wrapper = new QueryWrapper<>();
      wrapper.eq("name",emergencySpaceEntity.getName())
         .eq("is_deleted",0);
      if (null!=emergencySpaceEntity.getFirmId()){
         wrapper.eq("firm_id",emergencySpaceEntity.getFirmId());
      }
      EmergencySpaceEntity one = getOne(wrapper);
      if (null!=one){
         return one.getId();
@@ -124,4 +138,13 @@
      List<Map<String,Object>> list = baseMapper.getStatisticData(emergencySpace);
      return list;
   }

   /**
    * 获取应急池容量
    * @return
    */
   @Override
   public String getEmePool() {
      return baseMapper.getEmePool();
   }
}