Эх сурвалжийг харах

Merge branch 'master' of E:\newcpms with conflicts.

wangggziwen 2 өдөр өмнө
parent
commit
a75fee9744

+ 35 - 1
master/src/main/java/com/ruoyi/framework/task/ImageCompressionTask.java

@@ -33,8 +33,42 @@ public class ImageCompressionTask extends BaseController {
                 "D:/ruoyi",
                 "D:/ruoyi",
                 "/u03/cpmsfile/uploadPath/xxxx",
                 "/u03/cpmsfile/uploadPath/xxxx",
                 "/u03/cpmsfile/uploadPath/upload/eyewash",
                 "/u03/cpmsfile/uploadPath/upload/eyewash",
-                "/u03/cpmsfile/uploadPath/upload/annihilator"
+                "/u03/cpmsfile/uploadPath/upload/annihilator",
                 // 在这里添加更多需要压缩的文件夹路径
                 // 在这里添加更多需要压缩的文件夹路径
+                // H110-H118,H130
+                "/u03/cpmsfile/uploadPath/furnancePressurePass1",
+                "/u03/cpmsfile/uploadPath/furnancePressurePass2",
+                "/u03/cpmsfile/uploadPath/furnancePressurePass3",
+                "/u03/cpmsfile/uploadPath/furnancePressurePass4",
+                "/u03/cpmsfile/uploadPath/furnancePressurePass5",
+                "/u03/cpmsfile/uploadPath/furnancePressurePass6",
+                "/u03/cpmsfile/uploadPath/furnancePressurePass7",
+                "/u03/cpmsfile/uploadPath/furnancePressurePass8",
+                "/u03/cpmsfile/uploadPath/furnancePressurePass9",
+                "/u03/cpmsfile/uploadPath/furnancePressurePass10",
+                "/u03/cpmsfile/uploadPath/furnancePressurePass11",
+                "/u03/cpmsfile/uploadPath/furnancePressurePass12",
+                "/u03/cpmsfile/uploadPath/furnancePressurePass13",
+                "/u03/cpmsfile/uploadPath/furnancePressurePass14",
+                "/u03/cpmsfile/uploadPath/furnancePressurePass15",
+                "/u03/cpmsfile/uploadPath/furnancePressurePass16",
+                // H109
+                "/u03/cpmsfile/uploadPath/furnancePressurePass1A",
+                "/u03/cpmsfile/uploadPath/furnancePressurePass1B",
+                "/u03/cpmsfile/uploadPath/furnancePressurePass2A",
+                "/u03/cpmsfile/uploadPath/furnancePressurePass2B",
+                "/u03/cpmsfile/uploadPath/furnancePressurePass3A",
+                "/u03/cpmsfile/uploadPath/furnancePressurePass3B",
+                "/u03/cpmsfile/uploadPath/furnancePressurePass4A",
+                "/u03/cpmsfile/uploadPath/furnancePressurePass4B",
+                "/u03/cpmsfile/uploadPath/furnancePressurePass5A",
+                "/u03/cpmsfile/uploadPath/furnancePressurePass5B",
+                "/u03/cpmsfile/uploadPath/furnancePressurePass6A",
+                "/u03/cpmsfile/uploadPath/furnancePressurePass6B",
+                "/u03/cpmsfile/uploadPath/furnancePressurePass7A",
+                "/u03/cpmsfile/uploadPath/furnancePressurePass7B",
+                "/u03/cpmsfile/uploadPath/furnancePressurePass8A",
+                "/u03/cpmsfile/uploadPath/furnancePressurePass8B"
             );
             );
 
 
             if (directories.isEmpty()) {
             if (directories.isEmpty()) {