From 6e2ffa951a5a08366e001a6bdec958eba9abcf99 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 19 Jan 2026 15:15:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceScrapServiceImpl.java | 6 ++++++
1 files changed, 6 insertions(+), 0 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..6ce9d12 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
@@ -47,6 +47,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,6 +59,7 @@
FwDeviceEntity fwDevice = new FwDeviceEntity();
fwDevice.setId(dto.getDeviceId());
fwDevice.setStatus(3);
+ fwDevice.setIsDeleted(1);
isSuccess = fwDeviceService.updateById(fwDevice);
}
return isSuccess;
--
Gitblit v1.9.3