From c07cd59c94cb3e447a6cfe2674ed23162e4ba02f Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Mon, 19 Jan 2026 15:49:06 +0800
Subject: [PATCH] update-设备报废

---
 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