Merge remote-tracking branch 'origin/master'

linwei

2026-01-08 70464cc66f77cf847464ffe71f2fd456ee11b0fb

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

@@ -33,7 +33,7 @@
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import org.sxkj.fw.device.dto.FwDeviceAndTrackDTO;
import org.sxkj.fw.device.dto.FwDeviceDTO;
import org.sxkj.fw.device.entity.FwDeviceEntity;
import org.sxkj.fw.device.excel.FwDeviceExcel;
import org.sxkj.fw.device.service.IFwDeviceService;
@@ -49,7 +49,7 @@
/**
 * 设备表 控制器
 *
 * @author Aix
 * @author aix
 * @since 2026-01-08
 */
@RestController
@@ -66,8 +66,13 @@
   @GetMapping("/detail")
   @ApiOperationSupport(order = 1)
   @ApiOperation(value = "详情", notes = "传入fwDevice")
   public R<FwDeviceVO> detail(FwDeviceEntity fwDevice) {
      FwDeviceEntity detail = fwDeviceService.getOne(Condition.getQueryWrapper(fwDevice));
   public R<FwDeviceVO> detail(FwDeviceDTO fwDevice) {
      FwDeviceEntity detail = fwDeviceService.getOne(Condition.getQueryWrapper(FwDeviceWrapper.build().entityDTO(fwDevice)));

      if (detail == null) {
         return R.fail("该设备不存在");
      }

      return R.data(FwDeviceWrapper.build().entityVO(detail));
   }

@@ -75,29 +80,28 @@
    * 设备表 自定义分页
    */
   @GetMapping("/page")
   @ApiOperationSupport(order = 3)
   @ApiOperationSupport(order = 2)
   @ApiOperation(value = "分页", notes = "传入fwDevice")
   public R<IPage<FwDeviceVO>> page(FwDeviceVO fwDevice, Query query) {
      IPage<FwDeviceVO> pages = fwDeviceService.selectFwDevicePage(Condition.getPage(query), fwDevice);
      return R.data(pages);
   public R<IPage<FwDeviceVO>> page(FwDeviceDTO fwDevice, Query query) {
      IPage<FwDeviceEntity> pages = fwDeviceService.selectFwDevicePage(Condition.getPage(query), fwDevice);
      return R.data(FwDeviceWrapper.build().pageVO(pages));
   }


   /**
    * 设备表 新增或修改
    */
   @PostMapping("/submit")
   @ApiOperationSupport(order = 6)
   @ApiOperationSupport(order = 3)
   @ApiOperation(value = "新增或修改", notes = "传入fwDevice")
   public R submit(@Valid @RequestBody FwDeviceAndTrackDTO dto) {
      return R.status(fwDeviceService.saveFwDevice(dto));
   public R submit(@Valid @RequestBody FwDeviceDTO fwDevice) {
      return R.status(fwDeviceService.saveOrUpdate(FwDeviceWrapper.build().entityDTO(fwDevice)));
   }

   /**
    * 设备表 删除
    */
   @PostMapping("/remove")
   @ApiOperationSupport(order = 7)
   @ApiOperationSupport(order = 4)
   @ApiOperation(value = "逻辑删除", notes = "传入ids")
   public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
      return R.status(fwDeviceService.deleteLogic(Func.toLongList(ids)));
@@ -108,8 +112,9 @@
    * 导出数据
    */
   @GetMapping("/export-fwDevice")
   @ApiOperationSupport(order = 9)
   @ApiOperationSupport(order = 5)
   @ApiOperation(value = "导出数据", notes = "传入fwDevice")
   @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()) {