区域划分调整

rain

2026-01-29 5b23a8cb9294506d88330f0750f39b9a2cbabbdc

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

@@ -27,13 +27,12 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
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;
import org.sxkj.fw.area.dto.FwAreaDivideDTO;
import org.sxkj.fw.area.dto.FwAreaDivideSubmitDTO;
import org.sxkj.fw.area.dto.FwAreaDivideStatisticsDTO;
import org.sxkj.fw.area.entity.FwAreaDivideEntity;
import org.sxkj.fw.area.vo.FwAreaDivideVO;
@@ -48,7 +47,6 @@
import springfox.documentation.annotations.ApiIgnore;
import java.util.Map;
import java.util.List;
import java.util.Objects;
import javax.servlet.http.HttpServletResponse;

/**
@@ -86,11 +84,11 @@
    */
   @GetMapping("/list")
   @ApiOperationSupport(order = 2)
   @ApiOperation(value = "列表", notes = "传入filterSelected或id")
   @ApiOperation(value = "列表-不带分页", notes = "传入filterSelected或sceneId")
   public R<List<FwAreaDivideVO>> list(
      @ApiParam(value = "是否过滤已被选择的数据（1过滤 0不过滤）") @RequestParam(required = false) Integer filterSelected,
      @ApiParam(value = "场景id") @RequestParam(required = false) Long id) {
      List<FwAreaDivideVO> list = fwAreaDivideService.selectFwAreaDivideList(filterSelected, id);
      @ApiParam(value = "场景id") @RequestParam(required = false) Long sceneId) {
      List<FwAreaDivideVO> list = fwAreaDivideService.selectFwAreaDivideList(filterSelected, sceneId);
      return R.data(list);
   }

@@ -155,16 +153,17 @@

   /**
    * 区域划分表 新增或修改
    * 说明：入参包含主表对象与扩展面列表；保存主表成功后批量写入扩展面数据
    */
   @PostMapping("/submit")
   @ApiOperationSupport(order = 6)
   @ApiOperation(value = "新增或修改", notes = "传入fwAreaDivide")
   public R submit(@Valid @RequestBody FwAreaDivideDTO fwAreaDivide) {
      FwAreaDivideEntity fwAreaDivideEntity = Objects.requireNonNull(BeanUtil.copy(fwAreaDivide, FwAreaDivideEntity.class));
      if (isGeomInvalid(fwAreaDivideEntity.getGeom())) {
         return R.fail("几何数据格式不正确");
   @ApiOperation(value = "新增或修改", notes = "传入主表对象与扩展面列表")
   public R submit(@Valid @RequestBody FwAreaDivideSubmitDTO fwAreaDivideSubmit) {
      if (fwAreaDivideSubmit == null || fwAreaDivideSubmit.getAreaDivide() == null) {
         return R.fail("区域信息不能为空");
      }
      return R.status(fwAreaDivideService.saveOrUpdate(fwAreaDivideEntity));
      FwAreaDivideEntity fwAreaDivideEntity = fwAreaDivideSubmit.getAreaDivide();
      return R.status(fwAreaDivideService.saveOrUpdateWithExt(fwAreaDivideEntity, fwAreaDivideSubmit.getAreaDivideExtList()));
   }

   /**
@@ -193,14 +192,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");
   }

}