From 66bfbdb9251c22ffa2b5f05595a76a3547a2f5eb Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 09 Feb 2026 11:00:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceTrackController.java | 11 ++---------
1 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceTrackController.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceTrackController.java
index 4b748d1..5c88f9c 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceTrackController.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceTrackController.java
@@ -63,7 +63,6 @@
public class FwDeviceTrackController extends BladeController {
private final IFwDeviceTrackService fwDeviceTrackService;
- private final IFwDeviceService fwDeviceService;
/**
* 设备跟踪流转表 详情
@@ -99,17 +98,11 @@
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入fwDeviceTrack")
public R submit(@Valid @RequestBody FwDeviceTrackDTO fwDeviceTrack) {
-
if (null == fwDeviceTrack.getDeviceId()) {
return R.fail("设备ID不能为空");
}
-
- boolean saved = fwDeviceTrackService.saveOrUpdate(FwDeviceTrackWrapper.build().entityDTO(fwDeviceTrack));
- if (!saved) {
- return R.status(false);
- }
-
- return R.status(fwDeviceService.updateTrackStatusByDeviceId(fwDeviceTrack.getDeviceId(), 1));
+ boolean saved = fwDeviceTrackService.saveOrUpdateFwDeviceTrack(FwDeviceTrackWrapper.build().entityDTO(fwDeviceTrack));
+ return R.status(saved);
}
/**
--
Gitblit v1.9.3