Merge remote-tracking branch 'origin/master'

linwei

2026-01-28 c04afebf9cebfd65bf55c2395e732f36f558d208

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

@@ -19,9 +19,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import io.swagger.annotations.*;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
@@ -90,8 +88,9 @@
   @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()));
   }
@@ -113,7 +112,7 @@
   @ApiOperationSupport(order = 4)
   @ApiOperation(value = "新增或修改", notes = "传入fwDevice")
   public R submit(@Valid @RequestBody FwDeviceDTO fwDevice) {
      return R.status(fwDeviceService.saveOrUpdate(FwDeviceWrapper.build().entityDTO(fwDevice)));
      return R.status(fwDeviceService.saveOrUpdateDevice(FwDeviceWrapper.build().entityDTO(fwDevice)));
   }

   /**
@@ -138,14 +137,17 @@
   }

   /**
    * 设备类型统计
    * 设备出库去向统计
    * @return 统计数据
    */
   @GetMapping("/statisticalDeviceOut")
   @ApiOperationSupport(order = 7)
   @ApiOperation(value = "设备出库去向统计", notes = "设备出库去向统计")
   public R<List<DeviceStatisticsVO>> statisticalDeviceOut() {
      return R.data(fwDeviceService.getDeviceOutStatistics());
   @ApiImplicitParams({
      @ApiImplicitParam(name = "effectiveRangeKmIsNotNull", value = "有效范围是否为空：0-不处理 1-不为空 2-为空", paramType = "query", dataType = "string")
   })
   public R<List<DeviceStatisticsVO>> statisticalDeviceOut(String effectiveRangeKmIsNotNull) {
      return R.data(fwDeviceService.getDeviceOutStatistics(effectiveRangeKmIsNotNull));
   }

   /**
@@ -160,6 +162,20 @@
   }

   /**
    * 设备区域绑定校验
    */
   @GetMapping("/checkAreaBind")
   @ApiOperationSupport(order = 9)
   @ApiOperation(value = "设备区域绑定校验", notes = "传入deviceId")
   public R<Boolean> checkAreaBind(@ApiParam(value = "设备ID", required = true) @RequestParam Long deviceId) {
      FwDeviceEntity device = fwDeviceService.getById(deviceId);
      if (device == null || (device.getIsDeleted() != null && device.getIsDeleted() != 0)) {
         return R.fail("该设备不存在");
      }
      return R.data(fwDeviceService.existsAreaBindByDeviceId(deviceId));
   }

   /**
    * 导出数据
    */
   @GetMapping("/export-fwDevice")