吉安感知网项目-后端
rain
2026-01-17 e96a70dc7177a9010a15648a9a72941c7d588a6c
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwDefenseZoneController.java
@@ -35,9 +35,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.sxkj.fw.area.dto.FwDefenseZoneDTO;
import org.sxkj.fw.area.entity.FwDefenseZoneEntity;
import org.sxkj.fw.area.vo.FwAreaDivideVO;
import org.sxkj.fw.area.vo.FwDefenseZoneVO;
import org.sxkj.fw.area.excel.FwDefenseZoneExcel;
import org.sxkj.fw.area.wrapper.FwDefenseZoneWrapper;
import org.sxkj.fw.area.service.IFwDefenseZoneService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
@@ -73,8 +73,28 @@
      if (id == null) {
         return R.fail("主键不能为空");
      }
      FwDefenseZoneEntity detail = fwDefenseZoneService.getById(id);
      return R.data(FwDefenseZoneWrapper.build().entityVO(detail));
      FwDefenseZoneVO detail = fwDefenseZoneService.selectFwDefenseZoneDetail(id);
      if (detail == null) {
         return R.fail("数据不存在");
      }
      return R.data(detail);
   }
   /**
    * 根据防区id获取区域列表
    */
   @GetMapping("/areaList")
   @ApiOperationSupport(order = 2)
   @ApiOperation(value = "区域列表", notes = "传入防区id")
   public R<List<FwAreaDivideVO>> areaList(@ApiParam(value = "防区id", required = true) @RequestParam Long zoneId) {
      if (zoneId == null) {
         return R.fail("防区id不能为空");
      }
      List<FwAreaDivideVO> list = fwDefenseZoneService.selectFwAreaDivideListByZoneId(zoneId);
      if (list == null) {
         return R.fail("防区不存在");
      }
      return R.data(list);
   }
//   /**
//    * 防区管理表 分页
@@ -93,7 +113,7 @@
   @GetMapping("/page")
   @ApiOperationSupport(order = 3)
   @ApiOperation(value = "分页", notes = "传入fwDefenseZone")
   public R<IPage<FwDefenseZoneVO>> page(FwDefenseZoneVO fwDefenseZone, Query query) {
   public R<IPage<FwDefenseZoneVO>> page(FwDefenseZoneDTO fwDefenseZone, Query query) {
      IPage<FwDefenseZoneVO> pages = fwDefenseZoneService.selectFwDefenseZonePage(Condition.getPage(query), fwDefenseZone);
      return R.data(pages);
   }