update-场景管理

xiebin

2026-01-30 b3edfcbd0267cf66d4a908d47dbe5d97533dcb33

 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwAreaDivideController.java

@@ -28,7 +28,6 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -85,11 +84,12 @@
    */
   @GetMapping("/list")
   @ApiOperationSupport(order = 2)
   @ApiOperation(value = "列表-不带分页", notes = "传入filterSelected或sceneId")
   @ApiOperation(value = "列表-不带分页", notes = "传入filterSelected或sceneId或areaTypeKeys")
   public R<List<FwAreaDivideVO>> list(
      @ApiParam(value = "是否过滤已被选择的数据（1过滤 0不过滤）") @RequestParam(required = false) Integer filterSelected,
      @ApiParam(value = "场景id") @RequestParam(required = false) Long sceneId) {
      List<FwAreaDivideVO> list = fwAreaDivideService.selectFwAreaDivideList(filterSelected, sceneId);
      @ApiParam(value = "场景id") @RequestParam(required = false) Long sceneId,
      @ApiParam(value = "区域类型key集合（逗号分隔）") @RequestParam(required = false) String areaTypeKeys) {
      List<FwAreaDivideVO> list = fwAreaDivideService.selectFwAreaDivideList(filterSelected, sceneId, areaTypeKeys);
      return R.data(list);
   }

@@ -164,9 +164,6 @@
         return R.fail("区域信息不能为空");
      }
      FwAreaDivideEntity fwAreaDivideEntity = fwAreaDivideSubmit.getAreaDivide();
//      if (isGeomInvalid(fwAreaDivideEntity.getGeom())) {
//         return R.fail("几何数据格式不正确");
//      }
      return R.status(fwAreaDivideService.saveOrUpdateWithExt(fwAreaDivideEntity, fwAreaDivideSubmit.getAreaDivideExtList()));
   }

@@ -196,14 +193,6 @@
      queryWrapper.lambda().eq(FwAreaDivideEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
      List<FwAreaDivideExcel> list = fwAreaDivideService.exportFwAreaDivide(queryWrapper);
      ExcelUtil.export(response, "区域划分表数据" + DateUtil.time(), "区域划分表数据表", list, FwAreaDivideExcel.class);
   }

   private boolean isGeomInvalid(String geom) {
      if (StringUtil.isBlank(geom)) {
         return false;
      }
      String upper = geom.trim().toUpperCase();
      return !upper.contains("POLYGON");
   }

}