设备和区域场景list 过滤时增加id返回已绑定的子数据

rain

2026-01-13 f0ad850a7a962dcf53c6c88e31de4bc2b1e20457

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java

@@ -85,9 +85,10 @@
    */
   @GetMapping("/list")
   @ApiOperationSupport(order = 2)
   @ApiOperation(value = "列表", notes = "仅传入isAreaSelect")
   public R<List<FwDeviceVO>> list(@RequestParam(value = "isAreaSelect", required = false) Integer isAreaSelect) {
      List<FwDeviceEntity> list = fwDeviceService.selectFwDeviceList(isAreaSelect);
   @ApiOperation(value = "列表", notes = "传入isAreaSelect和区域id")
   public R<List<FwDeviceVO>> list(@RequestParam(value = "isAreaSelect", required = false) Integer isAreaSelect,
                           @RequestParam(value = "areaId", required = false) Long areaId) {
      List<FwDeviceEntity> list = fwDeviceService.selectFwDeviceList(isAreaSelect, areaId);
      FwDeviceWrapper wrapper = FwDeviceWrapper.build();
      return R.data(list.stream().map(wrapper::entityVO).collect(Collectors.toList()));
   }