From cdb2e3a30d1b3b246bb62310926a3e2d2c70ac2c Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 20 Jan 2026 21:42:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdManageDeviceController.java | 34 ++++++++--------------------------
1 files changed, 8 insertions(+), 26 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdManageDeviceController.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdManageDeviceController.java
index a3cc6de..bfe24ed 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdManageDeviceController.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdManageDeviceController.java
@@ -69,15 +69,16 @@
GdManageDeviceEntity detail = gdManageDeviceService.getOne(Condition.getQueryWrapper(gdManageDevice));
return R.data(GdManageDeviceWrapper.build().entityVO(detail));
}
+
/**
- * 设备信息 分页
+ * 设备信息 自定义分页
*/
@GetMapping("/list")
- @ApiOperationSupport(order = 2)
- @ApiOperation(value = "分页", notes = "传入gdManageDevice")
- public R<IPage<GdManageDeviceVO>> list(@ApiIgnore @RequestParam Map<String, Object> gdManageDevice, Query query) {
- IPage<GdManageDeviceEntity> pages = gdManageDeviceService.page(Condition.getPage(query), Condition.getQueryWrapper(gdManageDevice, GdManageDeviceEntity.class));
- return R.data(GdManageDeviceWrapper.build().pageVO(pages));
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "不分页", notes = "传入gdManageDevice")
+ public R<List<GdManageDeviceVO>> page(GdManageDeviceVO gdManageDevice) {
+ List<GdManageDeviceVO> pages = gdManageDeviceService.selectGdManageDevice(gdManageDevice);
+ return R.data(pages);
}
/**
@@ -89,26 +90,6 @@
public R<IPage<GdManageDeviceVO>> page(GdManageDeviceVO gdManageDevice, Query query) {
IPage<GdManageDeviceVO> pages = gdManageDeviceService.selectGdManageDevicePage(Condition.getPage(query), gdManageDevice);
return R.data(pages);
- }
-
- /**
- * 设备信息 新增
- */
- @PostMapping("/save")
- @ApiOperationSupport(order = 4)
- @ApiOperation(value = "新增", notes = "传入gdManageDevice")
- public R save(@Valid @RequestBody GdManageDeviceEntity gdManageDevice) {
- return R.status(gdManageDeviceService.save(gdManageDevice));
- }
-
- /**
- * 设备信息 修改
- */
- @PostMapping("/update")
- @ApiOperationSupport(order = 5)
- @ApiOperation(value = "修改", notes = "传入gdManageDevice")
- public R update(@Valid @RequestBody GdManageDeviceEntity gdManageDevice) {
- return R.status(gdManageDeviceService.updateById(gdManageDevice));
}
/**
@@ -137,6 +118,7 @@
*/
@GetMapping("/export-gdManageDevice")
@ApiOperationSupport(order = 9)
+ @ApiIgnore
@ApiOperation(value = "导出数据", notes = "传入gdManageDevice")
public void exportGdManageDevice(@ApiIgnore @RequestParam Map<String, Object> gdManageDevice, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<GdManageDeviceEntity> queryWrapper = Condition.getQueryWrapper(gdManageDevice, GdManageDeviceEntity.class);
--
Gitblit v1.9.3