Merge remote-tracking branch 'origin/master'

rain

2026-02-09 66bfbdb9251c22ffa2b5f05595a76a3547a2f5eb

 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;
@@ -32,16 +30,17 @@
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
import org.springframework.web.bind.annotation.*;
import org.sxkj.fw.cockpit.vo.DeviceStatisticsVO;
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;
import org.sxkj.fw.device.service.IFwDeviceService;
import org.sxkj.fw.device.vo.CockpitFwDeviceVO;
import org.sxkj.fw.device.vo.DeviceTypeStatisticsVO;
import org.sxkj.fw.device.vo.FwDeviceVO;
import org.sxkj.fw.device.wrapper.FwDeviceWrapper;
@@ -88,10 +87,26 @@
    */
   @GetMapping("/list")
   @ApiOperationSupport(order = 2)
   @ApiOperation(value = "列表", notes = "传入isAreaSelect和区域id")
   @ApiOperation(value = "列表", notes = "传入isAreaSelect、areaId、areaIds、status")
   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);
                           @RequestParam(value = "areaId", required = false) Long areaId,
                           @RequestParam(value = "areaIds", required = false) String areaIds,
                           @RequestParam(value = "status", required = false) Integer status,
                           @RequestParam(value = "isTrack", required = false) Integer isTrack) {
      List<Long> areaIdList = Func.toLongList(areaIds);
      List<FwDeviceEntity> list = fwDeviceService.selectFwDeviceList(isAreaSelect, areaId, areaIdList, 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()));
   }
@@ -103,21 +118,7 @@
   @ApiOperationSupport(order = 3)
   @ApiOperation(value = "分页", notes = "传入fwDevice")
   public R<IPage<FwDeviceVO>> page(FwDevicePageParam fwDevice, Query query) {
      IPage<FwDeviceEntity> pages = fwDeviceService.selectFwDevicePage(Condition.getPage(query), GenericConverter.convert(fwDevice, FwDeviceDTO.class));
      IPage<FwDeviceVO> result = FwDeviceWrapper.build().pageVO(pages);
      List<FwDeviceVO> records = result.getRecords();
      if (records != null && !records.isEmpty()) {
         List<Long> deviceIds = records.stream()
            .map(FwDeviceVO::getId)
            .filter(id -> id != null)
            .collect(Collectors.toList());
         Map<Long, String> sceneNameMap = fwDeviceService.selectSceneNameByDeviceIds(deviceIds);
         for (FwDeviceVO record : records) {
            String sceneName = sceneNameMap.get(record.getId());
            record.setSceneName(StringUtil.isBlank(sceneName) ? "/" : sceneName);
         }
      }
      return R.data(result);
      return R.data(fwDeviceService.selectFwDevicePageVo(fwDevice, query));
   }

   /**
@@ -127,7 +128,17 @@
   @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, "", ""));
   }

   /**
@@ -142,6 +153,7 @@

   /**
    * 设备类型统计
    *
    * @return 统计数据
    */
   @GetMapping("/statisticalDeviceType")
@@ -152,18 +164,23 @@
   }

   /**
    * 设备类型统计
    * 设备出库去向统计
    *
    * @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));
   }

   /**
    * 设备生产厂商统计
    *
    * @return 统计数据
    */
   @GetMapping("/statisticalDeviceManufacturer")
@@ -171,6 +188,40 @@
   @ApiOperation(value = "设备生产厂商统计", notes = "设备生产厂商统计")
   public R<List<DeviceStatisticsVO>> statisticalDeviceManufacturer() {
      return R.data(fwDeviceService.getDeviceManufacturerStatistics());
   }

   /**
    * 查询非本部门区域的设备
    *
    * @param regionCode 区域编码，用于查询不在该区域内的设备
    * @param deptId     机构ID，用于限定查询范围
    * @return 设备列表
    */
   @GetMapping("/nonDeptAreaDevices")
   @ApiOperationSupport(order = 9)
   @ApiOperation(value = "查询非本部门区域的设备", notes = "查询不在当前部门及其子部门区域内的设备")
   @ApiImplicitParams({
      @ApiImplicitParam(name = "regionCode", value = "区域编码", paramType = "query", dataType = "string", required = true),
      @ApiImplicitParam(name = "deptId", value = "机构ID", paramType = "query", dataType = "string", required = true)
   })
   public R<List<FwDeviceVO>> getNonDeptAreaDevices(
      @ApiParam(value = "区域编码", required = true) @RequestParam String regionCode,
      @ApiParam(value = "机构ID", required = true) @RequestParam String deptId) {
      return R.data(fwDeviceService.getNonDeptAreaDevices(regionCode, deptId));
   }

   /**
    * 设备区域绑定校验
    */
   @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));
   }

   /**
@@ -182,12 +233,19 @@
   @ApiIgnore
   public void exportFwDevice(@ApiIgnore @RequestParam Map<String, Object> fwDevice, BladeUser bladeUser, HttpServletResponse response) {
      QueryWrapper<FwDeviceEntity> queryWrapper = Condition.getQueryWrapper(fwDevice, FwDeviceEntity.class);
      //if (!AuthUtil.isAdministrator()) {
      // if (!AuthUtil.isAdministrator()) {
      //   queryWrapper.lambda().eq(FwDevice::getTenantId, bladeUser.getTenantId());
      //}
      queryWrapper.lambda().eq(FwDeviceEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
      List<FwDeviceExcel> list = fwDeviceService.exportFwDevice(queryWrapper);
      ExcelUtil.export(response, "设备表数据" + DateUtil.time(), "设备表数据表", list, FwDeviceExcel.class);
   }

   // 任务调度使用
   @GetMapping("/listByTask")
   @ApiOperationSupport(order = 10)
   @ApiOperation(value = "任务调度使用")
   public R<IPage<CockpitFwDeviceVO>> listByTask(FwDeviceDTO fwDevice, Query query) {
      IPage<CockpitFwDeviceVO> pages = fwDeviceService.selectCockpitDevicePage(Condition.getPage(query), fwDevice);
       return R.data(pages);
   }
}