diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/device/controller/DeviceController.java b/src/main/java/com/zsc/edu/gateway/modules/iot/device/controller/DeviceController.java index d5d2ef4..216a4e6 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/iot/device/controller/DeviceController.java +++ b/src/main/java/com/zsc/edu/gateway/modules/iot/device/controller/DeviceController.java @@ -171,12 +171,4 @@ public class DeviceController { return service.toggle(id); } - /** - * 删除图片或预览图 - */ - @DeleteMapping("/attachment/{id}") - @OperationLogAnnotation(content = "'设备图片或预览图'", operationType = "删除") - public Boolean deleteIconOrPreview(@PathVariable("id") Long id, String attachmentId) { - return service.deleteIconOrPreview(id, attachmentId); - } } diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/DeviceService.java b/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/DeviceService.java index 4ba2474..04b8b34 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/DeviceService.java +++ b/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/DeviceService.java @@ -39,5 +39,4 @@ public interface DeviceService extends IService { int toggle(Long id); - boolean deleteIconOrPreview(Long id, String attachmentId); } diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/impl/DeviceServiceImpl.java b/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/impl/DeviceServiceImpl.java index 2f7f331..181451e 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/impl/DeviceServiceImpl.java +++ b/src/main/java/com/zsc/edu/gateway/modules/iot/device/service/impl/DeviceServiceImpl.java @@ -254,20 +254,4 @@ public class DeviceServiceImpl extends ServiceImpl imp return baseMapper.updateById(device); } - /** - * 删除设备头像 - */ - @Override - public boolean deleteIconOrPreview(Long id, String attachmentId) { - Device device = baseMapper.selectById(id); - if (device.getIconId().equals(attachmentId)) { - device.setIconId(""); - } - if (device.getPreviewId().equals(attachmentId)) { - device.setPreviewId(""); - } - attachmentService.delete(attachmentId); - baseMapper.updateById(device); - return true; - } } \ No newline at end of file diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/product/controller/ProductController.java b/src/main/java/com/zsc/edu/gateway/modules/iot/product/controller/ProductController.java index 47b1d67..165357b 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/iot/product/controller/ProductController.java +++ b/src/main/java/com/zsc/edu/gateway/modules/iot/product/controller/ProductController.java @@ -112,5 +112,15 @@ public class ProductController { public Object status() { return service.status(); } + + + /** + * 删除图片或预览图 + */ + @DeleteMapping("/attachment/{id}") + @OperationLogAnnotation(content = "'设备图片或预览图'", operationType = "删除") + public Boolean deleteIconOrPreview(@PathVariable("id") Long id, String attachmentId) { + return service.deleteIconOrPreview(id, attachmentId); + } } diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/product/service/ProductService.java b/src/main/java/com/zsc/edu/gateway/modules/iot/product/service/ProductService.java index 73f89c7..24b01d9 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/iot/product/service/ProductService.java +++ b/src/main/java/com/zsc/edu/gateway/modules/iot/product/service/ProductService.java @@ -25,4 +25,6 @@ public interface ProductService extends IService { List list(ProductQuery query); ProductStatusVo status(); + + boolean deleteIconOrPreview(Long id, String attachmentId); } diff --git a/src/main/java/com/zsc/edu/gateway/modules/iot/product/service/impl/ProductServiceImpl.java b/src/main/java/com/zsc/edu/gateway/modules/iot/product/service/impl/ProductServiceImpl.java index 3a4df6a..21ba1ce 100644 --- a/src/main/java/com/zsc/edu/gateway/modules/iot/product/service/impl/ProductServiceImpl.java +++ b/src/main/java/com/zsc/edu/gateway/modules/iot/product/service/impl/ProductServiceImpl.java @@ -3,6 +3,7 @@ package com.zsc.edu.gateway.modules.iot.product.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zsc.edu.gateway.exception.ConstraintException; +import com.zsc.edu.gateway.modules.attachment.service.AttachmentService; import com.zsc.edu.gateway.modules.iot.product.dto.ProductDto; import com.zsc.edu.gateway.modules.iot.product.entity.Product; import com.zsc.edu.gateway.modules.iot.product.mapper.ProductMapper; @@ -27,6 +28,7 @@ import java.util.List; public class ProductServiceImpl extends ServiceImpl implements ProductService { private final ProductMapper mapper; private final ParamService paramService; + private final AttachmentService attachmentService; /** * 新建产品 @@ -100,4 +102,22 @@ public class ProductServiceImpl extends ServiceImpl vo.disabledCount = baseMapper.selectCount(new LambdaQueryWrapper().eq(Product::getEnabled, false)); return vo; } + + + /** + * 删除设备头像 + */ + @Override + public boolean deleteIconOrPreview(Long id, String attachmentId) { + Product product = baseMapper.selectById(id); + if (product.getIconId().equals(attachmentId)) { + product.setIconId(""); + } + if (product.getPreviewId().equals(attachmentId)) { + product.setPreviewId(""); + } + attachmentService.delete(attachmentId); + baseMapper.updateById(product); + return true; + } } diff --git a/storage/attachment/83908a0b3bc79d1d94d966c8e860b4559fee8776 b/storage/attachment/83908a0b3bc79d1d94d966c8e860b4559fee8776 deleted file mode 100644 index be3826c..0000000 Binary files a/storage/attachment/83908a0b3bc79d1d94d966c8e860b4559fee8776 and /dev/null differ diff --git a/storage/attachment/87dcbb41f9208e9da32c400a2b04201631ec9ecc b/storage/attachment/87dcbb41f9208e9da32c400a2b04201631ec9ecc deleted file mode 100644 index c0991e8..0000000 Binary files a/storage/attachment/87dcbb41f9208e9da32c400a2b04201631ec9ecc and /dev/null differ