From fa5d39677dbae1a255a70e10b4d92f7be554d950 Mon Sep 17 00:00:00 2001
From: huguanghan <ghhul@isoftstone.com>
Date: Wed, 25 Dec 2024 09:37:48 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=84=E5=B1=9E=E5=B1=9E=E6=80=A7=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/EquipmentController.java       | 12 +++++++++-
 .../service/SysEquipmentService.java          |  2 ++
 .../service/impl/SysEquipmentServiceImpl.java | 24 +++++++++++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/das/src/main/java/com/das/modules/equipment/controller/EquipmentController.java b/das/src/main/java/com/das/modules/equipment/controller/EquipmentController.java
index a9b1ebd8..e35f05c6 100644
--- a/das/src/main/java/com/das/modules/equipment/controller/EquipmentController.java
+++ b/das/src/main/java/com/das/modules/equipment/controller/EquipmentController.java
@@ -208,7 +208,7 @@ public class EquipmentController {
         return R.success(fileList);
     }
 
-    @RequestMapping(value = "/file/read", method = RequestMethod.GET)
+    @RequestMapping(value = "/file/read", method = RequestMethod.POST)
     public void readFile(String path, HttpServletResponse response) throws IOException {
         if (StringUtils.isBlank(path)){
             throw new ServiceException("请输入浏览的文件路径");
@@ -217,4 +217,14 @@ public class EquipmentController {
         sysEquipmentService.readFileToSteam(path, response.getOutputStream());
 
     }
+
+    @RequestMapping(value = "/file/delete", method = RequestMethod.GET)
+    public void deleteFile(String path, HttpServletResponse response) throws IOException {
+        if (StringUtils.isBlank(path)){
+            throw new ServiceException("请输入浏览的文件路径");
+        }
+        response.setContentType("application/octet-stream");
+        sysEquipmentService.readFileToSteam(path, response.getOutputStream());
+
+    }
 }
diff --git a/das/src/main/java/com/das/modules/equipment/service/SysEquipmentService.java b/das/src/main/java/com/das/modules/equipment/service/SysEquipmentService.java
index 6ae6453a..90ba395f 100644
--- a/das/src/main/java/com/das/modules/equipment/service/SysEquipmentService.java
+++ b/das/src/main/java/com/das/modules/equipment/service/SysEquipmentService.java
@@ -45,4 +45,6 @@ public interface SysEquipmentService {
     List<SysEquipmentDocs> getFileList(Long deviceId, String component);
 
     void readFileToSteam(String path, OutputStream stream);
+
+    void deleteFile(String path);
 }
diff --git a/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java b/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java
index 9134390f..0524103c 100644
--- a/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java
+++ b/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java
@@ -420,6 +420,17 @@ public class SysEquipmentServiceImpl implements SysEquipmentService {
     @Override
     public void deleteSysEquipmentExtProps(Long id) {
         sysGenExtPropsMapper.deleteById(id);
+        //查询设备下的所有图片
+        QueryWrapper<SysEquipmentDocs> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("deviceid",id);
+        List<SysEquipmentDocs> sysEquipmentDocsList = sysEquipmentDocsMapper.selectList(queryWrapper);
+        if (CollectionUtils.isNotEmpty(sysEquipmentDocsList)){
+            for (SysEquipmentDocs item : sysEquipmentDocsList){
+                deleteFile(item.getUrl());
+                sysEquipmentDocsMapper.deleteById(item.getId());
+            }
+
+        }
     }
 
     @Override
@@ -471,6 +482,19 @@ public class SysEquipmentServiceImpl implements SysEquipmentService {
         minioViewsServcie.readFileToStream(path, stream);
     }
 
+    @Override
+    public void deleteFile(String path) {
+        try {
+            minioViewsServcie.removeFile(minioAutoProperties.getPublicBucket(), path,false);
+            //删除缩略图
+            String thumbnailPath = path.replace("pic", "thumbnailPic");
+            minioViewsServcie.removeFile(minioAutoProperties.getPublicBucket(), thumbnailPath,false);
+        }catch (Exception e){
+            log.error("文件删除失败");
+        }
+
+    }
+
     public File scale(MultipartFile file) throws IOException {
         // 获取原始文件名和文件类型
         String originalFileName = file.getOriginalFilename();