From c04afebf9cebfd65bf55c2395e732f36f558d208 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 28 Jan 2026 10:30:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java
index 6bdc141..085d7cb 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java
@@ -88,8 +88,9 @@
@ApiOperation(value = "列表", notes = "传入isAreaSelect、areaId、status")
public R<List<FwDeviceVO>> list(@RequestParam(value = "isAreaSelect", required = false) Integer isAreaSelect,
@RequestParam(value = "areaId", required = false) Long areaId,
- @RequestParam(value = "status", required = false) Integer status) {
- List<FwDeviceEntity> list = fwDeviceService.selectFwDeviceList(isAreaSelect, areaId, status);
+ @RequestParam(value = "status", required = false) Integer status,
+ @RequestParam(value = "isTrack", required = false) Integer isTrack) {
+ List<FwDeviceEntity> list = fwDeviceService.selectFwDeviceList(isAreaSelect, areaId, status, isTrack);
FwDeviceWrapper wrapper = FwDeviceWrapper.build();
return R.data(list.stream().map(wrapper::entityVO).collect(Collectors.toList()));
}
@@ -111,7 +112,7 @@
@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)));
}
/**
--
Gitblit v1.9.3