订单图片

log.txt

@@ -36,3 +36,4 @@
 [2018-09-03 16:12:59] [WARN ] - Bad pool size config, start 3 < min 5. Using 5 as start.
 [2018-09-03 16:14:31] [WARN ] - Bad pool size config, start 3 < min 5. Using 5 as start.
 [2018-09-03 16:19:40] [WARN ] - Bad pool size config, start 3 < min 5. Using 5 as start.
+[2018-09-03 18:07:29] [WARN ] - Bad pool size config, start 3 < min 5. Using 5 as start.

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

@@ -29,5 +29,7 @@ public interface ImageUploadLogMapper{
     ImageUploadLog queryImageUploadLog(ImageUploadLog record);
 
     List<ImageUploadLog> query(ImageUploadLog record);
+
+    List<ImageUploadLog> queryDelOssImage(Map<String,Object> parameter);
 }
 

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

@@ -501,5 +501,31 @@
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             </where>
         order by id desc
     </select>
+
+    <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 order_id =  #{orderId}
+            UNION
+            SELECT
+            finished_image AS image_url
+            FROM
+            order_image
+            WHERE
+            del_flag = 'N'
+            and order_id =  #{orderId}
+            )
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </where>
+        order by id desc
+    </select>
 </mapper>
 

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

@@ -236,7 +236,7 @@
         where id = #{id,jdbcType=INTEGER}
     </update>
     <select id="queryOrderImageByPage" parameterType="java.util.Map"
-            resultMap="AllInfoForGetOne">
+            resultType="com.izouma.awesomeadmin.model.OrderImage">
         select
         <include refid="Base_Column_List"/>
 
@@ -263,7 +263,7 @@
         <where>
             and del_flag = 'N'
             <if test="record.baseRepairId != null and !&quot;&quot;.equals(record.baseRepairId)">
-                and id in ( SELECT image_id FROM order_repair_detail WHERE repair_id = #{record.baseRepairId})
+                and  id in ( SELECT image_id FROM order_repair_detail WHERE repair_id = #{record.baseRepairId})
             </if>
             <if test="record.id != null and !&quot;&quot;.equals(record.id)">
                 and id = #{record.id}
@@ -500,7 +500,7 @@
 
         id desc
     </select>
-    <select id="queryOrderImage" parameterType="java.util.Map" resultMap="AllInfoForGetOne">
+    <select id="queryOrderImage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.OrderImage">
         select
         <include refid="Base_Column_List"/>
         from order_image
@@ -573,22 +573,5 @@
         </where>
         order by id desc
     </select>
-
-    <resultMap id="AllInfoForGetOne" type="com.izouma.awesomeadmin.model.OrderImage" extends="BaseResultMap">
-
-
-        <association property="originalImageInfo"
-                     javaType="com.izouma.awesomeadmin.model.ImageUploadLog"
-                     select="com.izouma.awesomeadmin.dao.ImageUploadLogMapper.queryImageUploadLog"
-                     column="{ id = original_image }"/>
-
-        <association property="finishedImageInfo"
-                     javaType="com.izouma.awesomeadmin.model.ImageUploadLog"
-                     select="com.izouma.awesomeadmin.dao.ImageUploadLogMapper.queryImageUploadLog"
-                     column="{ id = finished_image }"/>
-
-
-    </resultMap>
-
 </mapper>
 

src/main/java/com/izouma/awesomeadmin/service/ImageUploadLogService.java

@@ -1,14 +1,15 @@
 package com.izouma.awesomeadmin.service;
 
 import java.util.*;
+
 import com.izouma.awesomeadmin.dto.Page;
 import com.izouma.awesomeadmin.model.ImageUploadLog;
 
 
 /**
-*  service接口类
-*/
-public interface ImageUploadLogService{
+ * service接口类
+ */
+public interface ImageUploadLogService {
 
     List<ImageUploadLog> getImageUploadLogList(ImageUploadLog record);
 
@@ -23,5 +24,7 @@ public interface ImageUploadLogService{
     boolean deleteImageUploadLog(String id);
 
     boolean updateImageUploadLog(ImageUploadLog record);
+
+    List<ImageUploadLog> queryDelOssImage(String orderId);
 }
 

src/main/java/com/izouma/awesomeadmin/service/impl/ImageUploadLogServiceImpl.java

@@ -1,20 +1,23 @@
 package com.izouma.awesomeadmin.service.impl;
 
-import java.util.*;
-import org.apache.log4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import com.izouma.awesomeadmin.constant.AppConstant;
+import com.izouma.awesomeadmin.dao.ImageUploadLogMapper;
 import com.izouma.awesomeadmin.dto.Page;
 import com.izouma.awesomeadmin.model.ImageUploadLog;
 import com.izouma.awesomeadmin.service.ImageUploadLogService;
-import com.izouma.awesomeadmin.dao.ImageUploadLogMapper;
+import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
-*  service接口实现类
-*/
+ * service接口实现类
+ */
 @Service
-public class ImageUploadLogServiceImpl implements ImageUploadLogService{
+public class ImageUploadLogServiceImpl implements ImageUploadLogService {
 
     private static Logger logger = Logger.getLogger(ImageUploadLogServiceImpl.class);
 
@@ -27,26 +30,27 @@ public class ImageUploadLogServiceImpl implements ImageUploadLogService{
         logger.info("getImageUploadLogList");
         try {
 
-        return imageUploadLogMapper.queryAllImageUploadLog(record);
+            return imageUploadLogMapper.queryAllImageUploadLog(record);
         } catch (Exception e) {
-        logger.error("getImageUploadLogList", e);
+            logger.error("getImageUploadLogList", e);
         }
 
         return null;
     }
+
     @Override
     public List<ImageUploadLog> getImageUploadLogByPage(Page page, ImageUploadLog record) {
 
         logger.info("getImageUploadLogByPage");
         try {
 
-        Map<String, Object> parameter = new HashMap<String, Object>();
-        parameter.put("record", record);
-        parameter.put(AppConstant.PAGE, page);
+            Map<String, Object> parameter = new HashMap<String, Object>();
+            parameter.put("record", record);
+            parameter.put(AppConstant.PAGE, page);
 
-        return imageUploadLogMapper.queryImageUploadLogByPage(parameter);
+            return imageUploadLogMapper.queryImageUploadLogByPage(parameter);
         } catch (Exception e) {
-        logger.error("getImageUploadLogByPage", e);
+            logger.error("getImageUploadLogByPage", e);
         }
 
         return null;
@@ -60,7 +64,7 @@ public class ImageUploadLogServiceImpl implements ImageUploadLogService{
 
             return imageUploadLogMapper.selectByPrimaryKey(Integer.valueOf(id));
         } catch (Exception e) {
-        logger.error("getImageUploadLogById", e);
+            logger.error("getImageUploadLogById", e);
         }
 
         return null;
@@ -74,7 +78,7 @@ public class ImageUploadLogServiceImpl implements ImageUploadLogService{
 
             return imageUploadLogMapper.queryImageUploadLog(record);
         } catch (Exception e) {
-        logger.error("getImageUploadLog", e);
+            logger.error("getImageUploadLog", e);
         }
 
         return null;
@@ -89,7 +93,7 @@ public class ImageUploadLogServiceImpl implements ImageUploadLogService{
             int updates = imageUploadLogMapper.insertSelective(record);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
             logger.error("createImageUploadLog", e);
@@ -104,13 +108,13 @@ public class ImageUploadLogServiceImpl implements ImageUploadLogService{
         logger.info("deleteImageUploadLog");
         try {
 
-             int updates = imageUploadLogMapper.delete(id);
+            int updates = imageUploadLogMapper.delete(id);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
-             logger.error("deleteImageUploadLog", e);
+            logger.error("deleteImageUploadLog", e);
         }
 
         return false;
@@ -125,13 +129,30 @@ public class ImageUploadLogServiceImpl implements ImageUploadLogService{
             int updates = imageUploadLogMapper.updateByPrimaryKeySelective(record);
 
             if (updates > 0) {
-                 return true;
+                return true;
             }
         } catch (Exception e) {
-             logger.error("updateImageUploadLog", e);
+            logger.error("updateImageUploadLog", e);
         }
 
         return false;
     }
+
+    @Override
+    public List<ImageUploadLog> queryDelOssImage(String orderId) {
+
+        logger.info("queryDelOssImage");
+        try {
+
+            Map<String, Object> parameter = new HashMap<String, Object>();
+            parameter.put("orderId", orderId);
+
+            return imageUploadLogMapper.queryDelOssImage(parameter);
+        } catch (Exception e) {
+            logger.error("queryDelOssImage", e);
+        }
+
+        return null;
+    }
 }
 

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

@@ -9,6 +9,8 @@ import com.izouma.awesomeadmin.service.ImageUploadLogService;
 import com.izouma.awesomeadmin.service.OSSFileService;
 import com.izouma.awesomeadmin.service.OrderImageService;
 import com.izouma.awesomeadmin.util.ExportExcelUtil;
+import com.izouma.awesomeadmin.util.PropertiesFileLoader;
+import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -237,5 +239,24 @@ public class OrderImageController {
         }
         return new Result(false, "上传失败");
     }
+
+
+    @RequestMapping(value = "/delOssImage", method = RequestMethod.POST)
+    @ResponseBody
+    public Result delOssImage(@RequestParam(required = true, value = "orderId") String orderId) {
+
+
+        List<ImageUploadLog> imageUploadLogs = imageUploadLogService.queryDelOssImage(orderId);
+
+        for (ImageUploadLog imageUploadLog : imageUploadLogs) {
+
+            String imageName = imageUploadLog.getUrl().replace(PropertiesFileLoader.getProperties("aliImageSever") + "/", "");
+            OSSFileService.deleteObject(imageName);
+
+        }
+
+
+        return new Result(true, "删除成功");
+    }
 }
 

src/test/java/OrderServiceTest.java

@@ -32,7 +32,7 @@ public class OrderServiceTest {
 
     @Test
     public void testDeleteImage() {
-        oSSFileService.deleteObject("http://oss.izouma.com/tutuxiang/null/null/null/2.jpg");
+        oSSFileService.deleteObject("tutuxiang/null/null/null/2.jpg");
     }
 
 }