Merge remote-tracking branch 'origin/master'

linwei

2026-01-30 4db2325a48fa099337835cec2ebb49e817275a7d

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

@@ -54,7 +54,7 @@
@RestController
@AllArgsConstructor
@RequestMapping("area/fwDefenseScene")
@Api(value = "防控场景表", tags = "防控场景表接口")
@Api(value = "场景配置表", tags = "场景配置表接口")
public class FwDefenseSceneController extends BladeController {

   private final IFwDefenseSceneService fwDefenseSceneService;
@@ -77,11 +77,14 @@
    */
   @GetMapping("/list")
   @ApiOperationSupport(order = 2)
   @ApiOperation(value = "列表", notes = "传入filterSelected或id")
   @ApiOperation(value = "列表", notes = "传入filterSelected或zoneId或areaId或unbound或sceneManageId")
   public R<List<FwDefenseSceneVO>> list(
      @ApiParam(value = "是否过滤已被选择的数据（1过滤 0不过滤）") @RequestParam(required = false) Integer filterSelected,
      @ApiParam(value = "区域id") @RequestParam(required = false) Long id) {
      List<FwDefenseSceneVO> list = fwDefenseSceneService.selectFwDefenseSceneList(filterSelected, id);
      @ApiParam(value = "防区id") @RequestParam(required = false) Long zoneId,
      @ApiParam(value = "区域id") @RequestParam(required = false) Long areaId,
      @ApiParam(value = "是否仅返回未被场景管理绑定的数据（1是 0或空否）") @RequestParam(required = false) Integer unbound,
      @ApiParam(value = "场景管理id（编辑回显使用）") @RequestParam(required = false) Long sceneManageId) {
      List<FwDefenseSceneVO> list = fwDefenseSceneService.selectFwDefenseSceneList(filterSelected, zoneId, areaId, unbound, sceneManageId);
      return R.data(list);
   }