吉安感知网项目-后端
linwei
2026-01-29 ba12d5d8e844146c334223ef5939a51c8e5d76ca
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java
@@ -35,6 +35,7 @@
import org.sxkj.fw.common.GenericConverter;
import org.sxkj.fw.common.IdParam;
import org.sxkj.fw.device.dto.FwDeviceDTO;
import org.sxkj.fw.device.dto.FwDevicePolygonQueryDTO;
import org.sxkj.fw.device.entity.FwDeviceEntity;
import org.sxkj.fw.device.excel.FwDeviceExcel;
import org.sxkj.fw.device.param.FwDevicePageParam;
@@ -88,8 +89,21 @@
   @ApiOperation(value = "列表", notes = "传入isAreaSelect、areaId、status")
   public R<List<FwDeviceVO>> list(@RequestParam(value = "isAreaSelect", required = false) Integer isAreaSelect,
                           @RequestParam(value = "areaId", required = false) Long areaId,
                           @RequestParam(value = "status", required = false) Integer status) {
      List<FwDeviceEntity> list = fwDeviceService.selectFwDeviceList(isAreaSelect, areaId, status);
                           @RequestParam(value = "status", required = false) Integer status,
                           @RequestParam(value = "isTrack", required = false) Integer isTrack) {
      List<FwDeviceEntity> list = fwDeviceService.selectFwDeviceList(isAreaSelect, areaId, status, isTrack);
      FwDeviceWrapper wrapper = FwDeviceWrapper.build();
      return R.data(list.stream().map(wrapper::entityVO).collect(Collectors.toList()));
   }
   /**
    * 设备表 列表(多边形过滤)
    */
   @PostMapping("/listByPolygons")
   @ApiOperationSupport(order = 2)
   @ApiOperation(value = "列表-多边形过滤", notes = "传入isAreaSelect、areaId、status、isTrack、polygons")
   public R<List<FwDeviceVO>> listByPolygons(@Valid @RequestBody FwDevicePolygonQueryDTO query) {
      List<FwDeviceEntity> list = fwDeviceService.selectFwDeviceListByPolygons(query);
      FwDeviceWrapper wrapper = FwDeviceWrapper.build();
      return R.data(list.stream().map(wrapper::entityVO).collect(Collectors.toList()));
   }
@@ -112,6 +126,15 @@
   @ApiOperation(value = "新增或修改", notes = "传入fwDevice")
   public R submit(@Valid @RequestBody FwDeviceDTO fwDevice) {
      return R.status(fwDeviceService.saveOrUpdateDevice(FwDeviceWrapper.build().entityDTO(fwDevice)));
   }
   /**
    * 设备表 新增或修改
    */
   @PostMapping("/updateTrackStatus")
   @ApiOperationSupport(order = 4)
   @ApiOperation(value = "修改设备出入库状态", notes = "传入fwDevice")
   public R updateTrackStatus(@ApiParam(value = "", required = true) @RequestParam Long deviceId) {
      return R.status(fwDeviceService.updateTrackStatusByDeviceId(deviceId,0));
   }
   /**
@@ -161,6 +184,17 @@
   }
   /**
    * 查询非本部门区域的设备
    * @return 设备列表
    */
   @GetMapping("/nonDeptAreaDevices")
   @ApiOperationSupport(order = 9)
   @ApiOperation(value = "查询非本部门区域的设备", notes = "查询不在当前部门及其子部门区域内的设备")
   public R<List<FwDeviceVO>> getNonDeptAreaDevices() {
      return R.data(fwDeviceService.getNonDeptAreaDevices());
   }
   /**
    * 设备区域绑定校验
    */
   @GetMapping("/checkAreaBind")