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/service/impl/FwDeviceScrapServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceScrapServiceImpl.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceScrapServiceImpl.java
index 5b786ae..3d5ce98 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceScrapServiceImpl.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceScrapServiceImpl.java
@@ -32,6 +32,7 @@
import org.sxkj.fw.device.vo.FwDeviceScrapVO;
import org.sxkj.fw.device.wrapper.FwDeviceScrapWrapper;
+import java.util.Collections;
import java.util.List;
/**
@@ -47,6 +48,11 @@
private final IFwDeviceService fwDeviceService;
@Override
+ public FwDeviceScrapVO getFwDeviceScrapById(Long id) {
+ return baseMapper.getFwDeviceScrapById(id);
+ }
+
+ @Override
@Transactional
public boolean saveFwDeviceScrap(FwDeviceScrapDTO dto) {
boolean isSuccess = super.save(FwDeviceScrapWrapper.build().entityDTO(dto));
@@ -54,7 +60,7 @@
FwDeviceEntity fwDevice = new FwDeviceEntity();
fwDevice.setId(dto.getDeviceId());
fwDevice.setStatus(3);
- isSuccess = fwDeviceService.updateById(fwDevice);
+ isSuccess = fwDeviceService.updateById(fwDevice) && fwDeviceService.deleteLogic(Collections.singletonList(fwDevice.getId()));
}
return isSuccess;
}
--
Gitblit v1.9.3