消防检查优化

linwei

2024-02-03 b7df6735bcb2d447cae7fcfba2d12accf3dd2fcc

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

@@ -153,6 +153,8 @@
      placeVO.setUpdateTime(new Date());
      // 查看是否包含houseCode,如果有，则更新
      if (!Strings.isBlank(placeVO.getHouseCode())) {
         // 比对是否1km 范围内(现场)采集
         setIsScene(placeVO);
         // 更新,先查询场所信息
         QueryWrapper<PlaceEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("is_deleted", 0).eq("house_code", placeVO.getHouseCode());
@@ -173,6 +175,8 @@
         // 设置基础数据
         placeVO.setCreateUser(AuthUtil.getUserId());
         placeVO.setCreateTime(new Date());
         // 比对是否1km 范围内(现场)采集
         setIsSceneNotHouseCode(placeVO);
         // 设置来源( 1：地址总表  2：国控采集)
         placeVO.setSource(2);
         // 并生成36位的houseCode
@@ -192,10 +196,64 @@
      gridBind(placeVO);
      // 网格编号绑定场所-新
      gridCodeBind(placeVO);
      // 警务网格绑定
      jwGridCodeBind(placeVO);
      // 房屋编号绑定
//      houseCodeBind(placeVO);
      // 返回结果
      return flag;
   }

   /**
    * 警务网格绑定
    *
    * @param placeVO
    */
   public void jwGridCodeBind(PlaceVO placeVO) {
      if (!Strings.isBlank(placeVO.getLng())) {
         String point = "'POINT(" + placeVO.getLng() + " " + placeVO.getLat() + ")'";
         // 点落面警务网格
         List<PoliceAffairsGridEntity> policeAffairsGridEntities
            = SpringUtil.getBean(IPoliceAffairsGridService.class).spatialAnalysis(point);
         if (policeAffairsGridEntities.size() > 0) {
            // 设置警务网格并更新
            placeVO.setJwGridCode(policeAffairsGridEntities.get(0).getJwGridCode());
            // 更新
            updateById(placeVO);
         }
      }
   }

   /**
    * 设置是否现场采集（1km 范围内）
    *
    * @param placeVO
    */
   public void setIsScene(PlaceVO placeVO) {
      if (!Strings.isBlank(placeVO.getX()) && !Strings.isBlank(placeVO.getLng())) {
         Integer placeEntity = baseMapper.comparisonPosition(placeVO);
         if (placeEntity == 1) {
            placeVO.setIsScene(1);
         } else {
            placeVO.setIsScene(2);
         }
      }
   }

   /**
    * 设置是否现场采集（1km 范围内）,非地址总表数据
    *
    * @param placeVO
    */
   public void setIsSceneNotHouseCode(PlaceVO placeVO) {
      if (!Strings.isBlank(placeVO.getX()) && !Strings.isBlank(placeVO.getLng())) {
         boolean flag = baseMapper.comparisonPositionNotHouseCode(placeVO);
         if (flag) {
            placeVO.setIsScene(1);
         } else {
            placeVO.setIsScene(2);
         }
      }
   }

   /**
@@ -1164,7 +1222,13 @@
      for (NinePlaceExcel ninePlaceExcel : aa) {
         for (DictBiz dictBiz : nineType) {
            if (StringUtils.isNotBlank(ninePlaceExcel.getNineType()) && ninePlaceExcel.getNineType().equals(dictBiz.getDictKey())) {
               ninePlaceExcel.setNineType(dictBiz.getDictValue());
               if (ninePlaceExcel.getNineType().contains("10,11,12")) {
                  ninePlaceExcel.setNineType("小学校（幼儿园、校外培训机构）- " + dictBiz.getDictValue());
               } else if (ninePlaceExcel.getNineType().contains("13,14,15")) {
                  ninePlaceExcel.setNineType("小医院（诊所、养老院）- " + dictBiz.getDictValue());
               } else {
                  ninePlaceExcel.setNineType(dictBiz.getDictValue());
               }
            }
         }
      }