吉安感知网项目-后端
linwei
2026-01-12 d9969f509099240514f10421c6cfad4d914b7b7c
drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/controller/CockpitController.java
@@ -19,6 +19,7 @@
import org.sxkj.fw.device.dto.FwDeviceDTO;
import org.sxkj.fw.device.entity.FwDeviceEntity;
import org.sxkj.fw.device.service.IFwDeviceService;
import org.sxkj.fw.device.vo.CockpitFwDeviceVO;
import org.sxkj.fw.device.vo.FwDeviceVO;
import org.sxkj.fw.device.wrapper.FwDeviceWrapper;
import org.sxkj.fw.record.dto.FwDroneAlarmRecordDTO;
@@ -61,9 +62,9 @@
   @GetMapping("/deviceSearch")
   @ApiOperationSupport(order = 2)
   @ApiOperation(value = "设备查询", notes = "传入fwDevice")
   public R<IPage<FwDeviceVO>> page(FwDeviceDTO fwDevice, Query query) {
      IPage<FwDeviceEntity> pages = cockpitService.selectFwDevicePage(Condition.getPage(query), fwDevice);
      return R.data(FwDeviceWrapper.build().pageVO(pages));
   public R<IPage<CockpitFwDeviceVO>> page(FwDeviceDTO fwDevice, Query query) {
      IPage<CockpitFwDeviceVO> pages = cockpitService.selectCockpitDevicePage(Condition.getPage(query), fwDevice);
      return R.data(pages);
   }
   /**