From 016caee2dd92a8c352834c382fd340b39fddc9ab Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 28 Jan 2026 16:49:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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 6fd4899..e2a1838 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()));
}
@@ -113,6 +114,15 @@
public R submit(@Valid @RequestBody FwDeviceDTO fwDevice) {
return R.status(fwDeviceService.saveOrUpdateDevice(FwDeviceWrapper.build().entityDTO(fwDevice)));
}
+ /**
+ * 设备表 新增或修改
+ */
+ @PostMapping("/updateTrackStatus")
+ @ApiOperationSupport(order = 4)
+ @ApiOperation(value = "修改设备出入库状态", notes = "传入fwDevice")
+ public R updateTrackStatus(@ApiParam(value = "", required = true) @RequestParam Long deviceId) {
+ return R.status(fwDeviceService.updateTrackStatusByDeviceId(deviceId,0));
+ }
/**
* 设备表 删除
--
Gitblit v1.9.3