From ce5a5c3bcbbd0a77d0a6efb951762a006fb89156 Mon Sep 17 00:00:00 2001 From: BenjaminNH <1249376374@qq.com> Date: Tue, 8 Jul 2025 18:23:31 +0800 Subject: [PATCH] =?UTF-8?q?bugfix:=E4=BF=AE=E5=A4=8D=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=9B=BE=E7=89=87=E6=97=B6=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E8=AF=BB=E5=8F=96=E4=B8=8D=E5=88=B0=E8=AE=BE=E5=A4=87id?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E8=BF=94=E5=9B=9E=E7=9A=84?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AFid=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E4=BD=BF=E7=94=A8DeviceAdminVO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipreservebackend/controller/DeviceController.java | 8 ++++---- .../service/impl/DeviceServiceImpl.java | 8 ++++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/java/github/benjamin/equipreservebackend/controller/DeviceController.java b/src/main/java/github/benjamin/equipreservebackend/controller/DeviceController.java index 41e0821..f269410 100644 --- a/src/main/java/github/benjamin/equipreservebackend/controller/DeviceController.java +++ b/src/main/java/github/benjamin/equipreservebackend/controller/DeviceController.java @@ -53,10 +53,10 @@ public class DeviceController { @PreAuthorize("hasRole('DEVICE_ADMIN')") @PostMapping("/{userId}") - public ResponseResult addDevice(@PathVariable("userId") Long userId, + public ResponseResult addDevice(@PathVariable("userId") Long userId, @RequestBody Device device) { deviceService.addDevice(userId, device); - return ResponseResult.success(device); + return ResponseResult.success(new DeviceAdminVO(device)); } @PreAuthorize("hasRole('DEVICE_ADMIN')") @@ -68,11 +68,11 @@ public class DeviceController { @PreAuthorize("hasRole('DEVICE_ADMIN')") @PutMapping("/{id}") - public ResponseResult updateDevice(@PathVariable("id") Long id, + public ResponseResult updateDevice(@PathVariable("id") Long id, @RequestBody Device device) { device.setId(id); Device updatedDevice = deviceService.updateDevice(device); - return ResponseResult.success(updatedDevice); + return ResponseResult.success(new DeviceAdminVO(updatedDevice)); } @PreAuthorize("hasRole('DEVICE_ADMIN')") diff --git a/src/main/java/github/benjamin/equipreservebackend/service/impl/DeviceServiceImpl.java b/src/main/java/github/benjamin/equipreservebackend/service/impl/DeviceServiceImpl.java index caba509..103a3d3 100644 --- a/src/main/java/github/benjamin/equipreservebackend/service/impl/DeviceServiceImpl.java +++ b/src/main/java/github/benjamin/equipreservebackend/service/impl/DeviceServiceImpl.java @@ -80,6 +80,14 @@ public class DeviceServiceImpl implements DeviceService { @Override public void deleteDevice(Long id) { + Device device = deviceMapper.selectById(id); + if (StringUtils.hasText(device.getImagePath())) { + Path fullPath = Paths.get(System.getProperty("user.dir"), device.getImagePath()).normalize(); + File file = fullPath.toFile(); + if (file.exists() && file.isFile()) { + file.delete(); + } + } deviceMapper.delete(new LambdaQueryWrapper() .eq(Device::getId, id)); }