From 51f67136d3f6ff27a9f879b8c13bd308a7a733e1 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 17 四月 2025 09:14:02 +0800
Subject: [PATCH] 删除工单,物理删除图片调整

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java |   27 +++++++++++++++++++++------
 1 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
index 4a39cdf..80dd2b3 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -622,8 +622,10 @@
                 List<String> imgList = workOrderList.subList(4,workOrderList.size()).stream().map(WorkOrderCheckImg::getImgUrl).collect(Collectors.toList());
                 List<Integer> idList = workOrderList.subList(4, workOrderList.size()).stream().map(WorkOrderCheckImg::getId).collect(Collectors.toList());
                 //鍒犻櫎鐓х墖 锛屽苟涓旂墿鐞嗗垹闄ゆ湇鍔″櫒鍐呭搴旂収鐗囩殑鍚嶅瓧
+
+//                /profile/2024-11-18_1d8e6d37-a4d0-4bba-8473-ff4e50eda83d.png
                 for (String filePath: imgList){
-                    FileUtils.deleteFile( PlatformConfig.getUploadPath()+ filePath);
+                    delImgFormClient(filePath);
                 }
                 workOrderCheckImgMapper.deleteBatchIds(idList);
 
@@ -682,6 +684,23 @@
         return Result.error("鍒犻櫎澶辫触");
     }
 
+    /***
+     * 閫氳繃url鍒犻櫎鏈嶅姟鍣ㄥ唴鐨勫浘鐗�
+     * @param url
+     */
+    public void delImgFormClient(String url){
+        //鎻愬彇鏂囦欢鍚�  /profile/2024-11-17_79c02666-da1e-45ba-9f29-7523c848fa4a.png
+        // 杩欓儴鍒�2024-11-17_79c02666-da1e-45ba-9f29-7523c848fa4a.png
+        String imgPath = FileUtils.getImgName(url);
+        if (imgPath.isEmpty()){
+            log.error("url閿欒锛歿}",imgPath);
+        }else{
+            //鎻愬彇鏃ユ湡閮ㄥ垎 缁勮鐩綍 : /opt/zgyw/uploadPath  + /  + yyyy-MM-dd +
+            String pathName = PlatformConfig.getUploadPath() + "/" + FileUtils.extractDateFromString(url);
+            FileUtils.deleteFile(pathName+"/" + imgPath);
+        }
+    }
+
     /**
      * id鍒犻櫎
      *
@@ -703,9 +722,8 @@
         log.error("鍒犻櫎璺緞:{}",PlatformConfig.getUploadPath());
 
         for (String filePath: workOrderImg){
-            FileUtils.deleteFile( PlatformConfig.getUploadPath()+ filePath);
+            delImgFormClient(filePath);
         }
-        // /home/zgyw/uploadPath
 
         //鍒犻櫎宸ュ崟鍥剧墖璁板綍
         workOrderCheckImgMapper.delete(new QueryWrapper<WorkOrderCheckImg>().eq("work_order_no", workOrderNo));
@@ -715,9 +733,6 @@
         workOrderErrorTypeMapper.delete(new QueryWrapper<WorkOrderErrorType>().eq("work_order_no", workOrderNo));
         //鍒犻櫎宸ュ崟鎯呭喌璁板綍
         workOrderYwConditionRecordMapper.delete(new QueryWrapper<WorkOrderYwConditionRecord>().eq("work_order_no", workOrderNo));
-
-
-
 
         if (baseMapper.deleteById(id) > 0) {
             return Result.ok("鍒犻櫎鎴愬姛");

--
Gitblit v1.8.0