Merge remote-tracking branch 'origin/master'

linwei

2026-01-14 bc1a6bb5bb2803ed6a5669a976bf2b47f3dacfca

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

@@ -64,21 +64,27 @@
    */
   @GetMapping("/detail")
   @ApiOperationSupport(order = 1)
   @ApiOperation(value = "详情", notes = "传入fwDefenseScene")
   public R<FwDefenseSceneVO> detail(FwDefenseSceneEntity fwDefenseScene) {
      FwDefenseSceneEntity detail = fwDefenseSceneService.getOne(Condition.getQueryWrapper(fwDefenseScene));
   @ApiOperation(value = "详情", notes = "传入id")
   public R<FwDefenseSceneVO> detail(@ApiParam(value = "主键id", required = true) @RequestParam Long id) {
      if (id == null) {
         return R.fail("主键不能为空");
      }
      FwDefenseSceneEntity detail = fwDefenseSceneService.getById(id);
      return R.data(FwDefenseSceneWrapper.build().entityVO(detail));
   }
   /**
    * 防控场景表 分页
    * 防控场景表 列表
    */
   // @GetMapping("/list")
   // @ApiOperationSupport(order = 2)
   // @ApiOperation(value = "分页", notes = "传入fwDefenseScene")
   // public R<IPage<FwDefenseSceneVO>> list(@ApiIgnore @RequestParam Map<String, Object> fwDefenseScene, Query query) {
   //    IPage<FwDefenseSceneEntity> pages = fwDefenseSceneService.page(Condition.getPage(query), Condition.getQueryWrapper(fwDefenseScene, FwDefenseSceneEntity.class));
   //    return R.data(FwDefenseSceneWrapper.build().pageVO(pages));
   // }
   @GetMapping("/list")
   @ApiOperationSupport(order = 2)
   @ApiOperation(value = "列表", notes = "传入filterSelected或zoneId或areaId")
   public R<List<FwDefenseSceneVO>> list(
      @ApiParam(value = "是否过滤已被选择的数据（1过滤 0不过滤）") @RequestParam(required = false) Integer filterSelected,
      @ApiParam(value = "防区id") @RequestParam(required = false) Long zoneId,
      @ApiParam(value = "区域id") @RequestParam(required = false) Long areaId) {
      List<FwDefenseSceneVO> list = fwDefenseSceneService.selectFwDefenseSceneList(filterSelected, zoneId, areaId);
      return R.data(list);
   }

   /**
    * 防控场景表 自定义分页
@@ -100,16 +106,16 @@
   // public R save(@Valid @RequestBody FwDefenseSceneEntity fwDefenseScene) {
   //    return R.status(fwDefenseSceneService.save(fwDefenseScene));
   // }

   /**
    * 防控场景表 修改
    */
   @PostMapping("/update")
   @ApiOperationSupport(order = 5)
   @ApiOperation(value = "修改", notes = "传入fwDefenseScene")
   public R update(@Valid @RequestBody FwDefenseSceneEntity fwDefenseScene) {
      return R.status(fwDefenseSceneService.updateById(fwDefenseScene));
   }
//
//   /**
//    * 防控场景表 修改
//    */
//   @PostMapping("/update")
//   @ApiOperationSupport(order = 5)
//   @ApiOperation(value = "修改", notes = "传入fwDefenseScene")
//   public R update(@Valid @RequestBody FwDefenseSceneEntity fwDefenseScene) {
//      return R.status(fwDefenseSceneService.updateById(fwDefenseScene));
//   }

   /**
    * 防控场景表 新增或修改
@@ -135,6 +141,7 @@
   /**
    * 导出数据
    */
   @ApiIgnore
   @GetMapping("/export-fwDefenseScene")
   @ApiOperationSupport(order = 9)
   @ApiOperation(value = "导出数据", notes = "传入fwDefenseScene")