批量上传图片

src/main/java/com/izouma/awesomeadmin/dao/ImageUploadLogMapper.xml

@@ -523,65 +523,63 @@
 
     <select id="queryDelOssImage" parameterType="java.util.Map"
             resultType="com.izouma.awesomeadmin.model.ImageUploadLog">
-        select
-        <include refid="Base_Column_List"/>
-        from image_upload_log
-        <where>
-            and del_flag = 'N'
-            and order_id = #{orderId}
-            AND url NOT IN (
-            SELECT
-            original_image AS image_url
-            FROM
-            order_image
-            WHERE
-            del_flag = 'N'
-            AND original_image IS NOT NULL
-            AND original_image != ''
-            AND order_id = #{orderId}
-            UNION
-            SELECT
-            finished_image AS image_url
-            FROM
-            order_image
-            WHERE
-            del_flag = 'N'
-            AND finished_image IS NOT NULL
-            AND finished_image != ''
-            AND order_id = #{orderId}
-            )
-            AND artwork_url NOT IN (
-            SELECT
-            original_artwork AS image_url
-            FROM
-            order_image
-            WHERE
-            del_flag = 'N'
-            AND original_artwork IS NOT NULL
-            AND original_artwork != ''
-            AND order_id = #{orderId}
-            UNION
-            SELECT
-            finished_artwork AS image_url
-            FROM
-            order_image
-            WHERE
-            del_flag = 'N'
-            AND finished_artwork IS NOT NULL
-            AND finished_artwork != ''
-            AND order_id = #{orderId}
-            )
-            AND image_name NOT IN (
-            SELECT DISTINCT
-            image_name
-            FROM
-            order_image
-            WHERE
-            del_flag = 'N'
-            AND order_id = #{orderId}
-            )
-        </where>
-        order by id desc
+       SELECT
+	url AS url
+FROM
+	`image_upload_log`
+WHERE
+	del_flag = 'N'
+AND order_id = #{orderId}
+AND url NOT IN (
+	SELECT
+		original_image AS image_url
+	FROM
+		order_image
+	WHERE
+		del_flag = 'N'
+	AND original_image IS NOT NULL
+	AND original_image != ''
+	AND order_id = #{orderId}
+	UNION
+		SELECT
+			finished_image AS image_url
+		FROM
+			order_image
+		WHERE
+			del_flag = 'N'
+		AND finished_image IS NOT NULL
+		AND finished_image != ''
+		AND order_id = #{orderId}
+)
+UNION
+	SELECT
+		artwork_url AS url
+	FROM
+		`image_upload_log`
+	WHERE
+		del_flag = 'N'
+	AND order_id = #{orderId}
+	AND artwork_url NOT IN (
+		SELECT
+			original_artwork AS image_url
+		FROM
+			order_image
+		WHERE
+			del_flag = 'N'
+		AND original_artwork IS NOT NULL
+		AND original_artwork != ''
+		AND order_id = #{orderId}
+		UNION
+			SELECT
+				finished_artwork AS image_url
+			FROM
+				order_image
+			WHERE
+				del_flag = 'N'
+			AND finished_artwork IS NOT NULL
+			AND finished_artwork != ''
+			AND order_id = #{orderId}
+	)
     </select>
 </mapper>
 

src/main/java/com/izouma/awesomeadmin/web/OrderImageController.java

@@ -355,14 +355,17 @@ public class OrderImageController {
 
         for (ImageUploadLog imageUploadLog : imageUploadLogs) {
 
-            String imageName = imageUploadLog.getUrl().replace(PropertiesFileLoader.getProperties("aliImageSever") + "/", "");
-            OSSFileService.deleteObject(imageName);
+            try {
 
-            if (StringUtils.isNotEmpty(imageUploadLog.getArtworkUrl()) && !imageUploadLog.getUrl().equals(imageUploadLog.getArtworkUrl())) {
-                String artwork = imageUploadLog.getArtworkUrl().replace(PropertiesFileLoader.getProperties("aliImageSever") + "/", "");
-                OSSFileService.deleteObject(artwork);
+                if (StringUtils.isNotEmpty(imageUploadLog.getUrl())) {
+                    String artwork = imageUploadLog.getUrl().replace(PropertiesFileLoader.getProperties("aliImageSever") + "/", "");
+                    OSSFileService.deleteObject(artwork);
+                }
+            } catch (Exception e) {
+                logger.error("删除图片异常", e);
             }
 
+
         }