From 769724ab08ba5695aff1a64ea8f48c9b1a4bd5da Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Fri, 23 Jan 2026 10:24:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdManageDeviceController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 f03217d..828b8b7 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
@@ -39,6 +39,7 @@
import org.sxkj.gd.workorder.dto.GdManageDeviceDTO;
import org.sxkj.gd.workorder.entity.GdManageDeviceEntity;
import org.sxkj.gd.workorder.excel.GdManageDeviceExcel;
+import org.sxkj.gd.workorder.param.GdManageDevicePageParam;
import org.sxkj.gd.workorder.service.IGdManageDeviceService;
import org.sxkj.gd.workorder.vo.GdManageDeviceVO;
import org.sxkj.gd.workorder.wrapper.GdManageDeviceWrapper;
@@ -83,7 +84,7 @@
@GetMapping("/list")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "不分页", notes = "传入gdManageDevice")
- public R<List<GdManageDeviceVO>> page(GdManageDeviceVO gdManageDevice) {
+ public R<List<GdManageDeviceVO>> page(GdManageDevicePageParam gdManageDevice) {
List<GdManageDeviceVO> pages = gdManageDeviceService.selectGdManageDevice(gdManageDevice);
return R.data(pages);
}
@@ -94,7 +95,7 @@
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入gdManageDevice")
- public R<IPage<GdManageDeviceVO>> page(GdManageDeviceVO gdManageDevice, Query query) {
+ public R<IPage<GdManageDeviceVO>> page(GdManageDevicePageParam gdManageDevice, Query query) {
IPage<GdManageDeviceVO> pages = gdManageDeviceService.selectGdManageDevicePage(Condition.getPage(query), gdManageDevice);
return R.data(pages);
}
@@ -104,7 +105,7 @@
*/
@PostMapping("/submitExternal")
@ApiOperationSupport(order = 6)
- @ApiOperation(value = "新增或修改", notes = "传入gdManageDevice")
+ @ApiOperation(value = "新增或修改", notes = "传入gdManageDevice，设备编码相同则修改")
public R submitExternal(@Valid @RequestBody GdManageDeviceDTO gdManageDevice) throws Exception {
if (StringUtil.isBlank(gdManageDevice.getDeviceSn())) {
--
Gitblit v1.9.3