驾驶舱代码

linwe

2023-12-08 91e2a286bb5b72172bb2e2d5f96be03439c51f72

 src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java

@@ -95,13 +95,31 @@
         if (null!=region){
            gridEntity.setCommunityCode(region.getCode());
         }
         gridEntity.setGridName(split[1]);
         gridEntity.setGeom(gridExcel.getGeom());
         gridEntity.setCreateUser(AuthUtil.getUserId());
         gridEntity.setCreateTime(new Date());
         gridEntity.setUpdateUser(AuthUtil.getUserId());
         gridEntity.setUpdateTime(new Date());
         list.add(gridEntity);
         // 比对网格是否存在，如果已存在则更新，否则则新增
         QueryWrapper<GridEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_deleted",0)
            .eq("grid_name",split[1])
            .eq("community_code",region.getCode());
         GridEntity one = getOne(queryWrapper);
         if (null!=one){
            one.setGridCode(gridExcel.getGridCode());
            one.setGridName(split[1]);
            one.setGeom(gridExcel.getGeom());
            one.setUpdateUser(AuthUtil.getUserId());
            one.setUpdateTime(new Date());
            // 更新
            updateById(one);
         }else {
            // 设置网格数据
            gridEntity.setGridCode(gridExcel.getGridCode());
            gridEntity.setGridName(split[1]);
            gridEntity.setGeom(gridExcel.getGeom());
            gridEntity.setCreateUser(AuthUtil.getUserId());
            gridEntity.setCreateTime(new Date());
            gridEntity.setUpdateUser(AuthUtil.getUserId());
            gridEntity.setUpdateTime(new Date());
            list.add(gridEntity);
         }
      }
      // 批量导入
      saveBatch(list);
@@ -134,7 +152,7 @@
   @Transactional(rollbackFor = Exception.class)
   public Object spatialAnalysis() {
      // 按社区
      String name = "万达社区居民委员会";
      String name = null;
//      String name = "茶山路社区居民委员会";
      //查询社区信息
      List<DoorplateAddressEntity> doorplateAddressEntities = doorplateAddressService.getAllDoorplateAddress(name);