权限优化

linwei

2026-01-30 e474fbac34a413e955c17a69ecffd15bb43fa7c1

 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;
@@ -37,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;
@@ -90,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()));
   }
@@ -113,7 +125,16 @@
   @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)));
   }
   /**
    * 设备表 新增或修改
    */
   @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));
   }

   /**
@@ -138,14 +159,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 +184,17 @@
   }

   /**
    * 查询非本部门区域的设备
    * @return 设备列表
    */
   @GetMapping("/nonDeptAreaDevices")
   @ApiOperationSupport(order = 9)
   @ApiOperation(value = "查询非本部门区域的设备", notes = "查询不在当前部门及其子部门区域内的设备")
   public R<List<FwDeviceVO>> getNonDeptAreaDevices() {
      return R.data(fwDeviceService.getNonDeptAreaDevices());
   }

   /**
    * 设备区域绑定校验
    */
   @GetMapping("/checkAreaBind")