更新内容：

1. 新增图片间隔
2. 优化多图片合并慢的问题

pom.xml

@@ -28,6 +28,12 @@
         <commons.version>2.6</commons.version>
     </properties>
     <dependencies>
+        <!-- 阿里云oss -->
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+            <version>3.15.1</version>
+        </dependency>
 
         <!-- SpringBoot Web容器 -->
         <dependency>

src/main/java/com/pavis/ctr/audit/common/constant/Constants.java

@@ -66,6 +66,19 @@ public class Constants {
     public static final String CLIENT_ID = "YaVhT98Vx87SEqEVAbnzoHMd9MSf9yAo";
     public static final String CLIENT_SECRET = "pLSNxTWGGWOdI6aHTeQRGbH7ZGt8hYRO";
 
+    /**
+     * oss相关参数
+     */
+    public static final String ACCESS_KEY_ID = "LTAI5tKZhT2e1fVxJGuPZ7rj";
+
+    public static final String ACCESS_SECRET = "JRImmcRNBCTs6S5xv6Gefq6KBFPSRW";
+
+    public static final String OSS_ENDPOINT = "https://oss-cn-beijing.aliyuncs.com/";
+
+    public static final String OSS_URL = "https://ims-ocr-oss.ctsp.com.cn/";
+
+    public static final String OSS_BUCKET = "ims-ocr-oss";
+
     // 北京
     public static final String BOS_ENDPOINT = "https://ctrimgs.bj.bcebos.com/";
 
@@ -130,6 +143,11 @@ public class Constants {
 
     public static final String WSGM_FLAG = "7";
 
+    /**
+     * 拼接图片的间隔高度
+     */
+    public static final int SPACE_HEIGHT = 20;
+
 }
 
 

src/main/java/com/pavis/ctr/audit/common/utils/ImageUtils.java

@@ -1,13 +1,25 @@
 package com.pavis.ctr.audit.common.utils;
 
+import com.alibaba.fastjson2.JSON;
+import com.aliyun.oss.ClientException;
+import com.aliyun.oss.OSS;
+import com.aliyun.oss.OSSException;
+import com.aliyun.oss.model.PutObjectResult;
 import com.baidubce.services.bos.BosClient;
+import com.pavis.ctr.audit.common.constant.Constants;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.imageio.ImageIO;
+import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.*;
 
 /**
  * @author semi
@@ -33,7 +45,8 @@ public class ImageUtils {
         for (int i = 0; i < imgs.length; i++) {
             BufferedImage img = imgs[i];
             allw += img.getWidth();
-            allh += img.getHeight();
+            // 宽度+10，作为位移宽度
+            allh += img.getHeight() + Constants.SPACE_HEIGHT;
             if (img.getWidth() > allwMax) {
                 allwMax = img.getWidth();
             }
@@ -47,6 +60,10 @@ public class ImageUtils {
         } else {
             destImage = new BufferedImage(allwMax, allh, BufferedImage.TYPE_INT_RGB);
         }
+        // 为图片设置背景色
+        Graphics graphics = destImage.getGraphics();
+        graphics.setColor(Color.YELLOW);
+        graphics.fillRect(0, 0, destImage.getWidth(), destImage.getHeight());
         // 合并所有子图片到新图片
         int wx = 0, wy = 0;
         for (int i = 0; i < imgs.length; i++) {
@@ -55,14 +72,19 @@ public class ImageUtils {
             int h1 = img.getHeight();
             // 从图片中读取RGB
             int[] ImageArrayOne = new int[w1 * h1];
-            ImageArrayOne = img.getRGB(0, 0, w1, h1, ImageArrayOne, 0, w1); // 逐行扫描图像中各个像素的RGB到数组中
-            if (isHorizontal) { // 水平方向合并
-                destImage.setRGB(wx, 0, w1, h1, ImageArrayOne, 0, w1); // 设置上半部分或左半部分的RGB
-            } else { // 垂直方向合并
-                destImage.setRGB(0, wy, w1, h1, ImageArrayOne, 0, w1); // 设置上半部分或左半部分的RGB
+            // 逐行扫描图像中各个像素的RGB到数组中
+            ImageArrayOne = img.getRGB(0, 0, w1, h1, ImageArrayOne, 0, w1);
+            // 水平方向合并
+            if (isHorizontal) {
+                // 设置上半部分或左半部分的RGB
+                destImage.setRGB(wx, 0, w1, h1, ImageArrayOne, 0, w1);
+            } else {
+                // 垂直方向合并
+                // 设置上半部分或左半部分的RGB
+                destImage.setRGB(0, wy, w1, h1, ImageArrayOne, 0, w1);
             }
             wx += w1;
-            wy += h1;
+            wy += h1 + Constants.SPACE_HEIGHT;
         }
         return destImage;
     }
@@ -77,6 +99,7 @@ public class ImageUtils {
      */
     public static String joinImageListVertical(String[] pics, String type, String dstPic, BosClient client) {
         try {
+            System.out.println(DateUtils.getNowDate().toString());
             int len = pics.length;
             if (len == 1) {
                 return pics[0];
@@ -88,11 +111,141 @@ public class ImageUtils {
             BufferedImage dstImg = mergeImage(false, images);
             File file = new File(dstPic);
             ImageIO.write(dstImg, type, file);
+            System.out.println(DateUtils.getNowDate().toString());
             // 上传至bos
-            return BosUtils.putByName(client, StringUtils.substringAfterLast(dstPic, "/"), file);
+            String mergeImgUrl = BosUtils.putByName(client, StringUtils.substringAfterLast(dstPic, "/"), file);
+            System.out.println(DateUtils.getNowDate().toString());
+            System.out.println("merge img url:" + mergeImgUrl);
+            return mergeImgUrl;
         } catch (IOException e) {
             e.printStackTrace();
             return "";
         }
     }
+
+    /**
+     * 纵向拼接一组（多张）图像
+     *
+     * @param pics   将要拼接的图像数组
+     * @param type   写入图像类型
+     * @param dstPic 写入图像路径
+     * @return
+     */
+    public static String joinImagesVertical(String[] pics, String type, String dstPic, BosClient client) {
+        String mergeImgUrl = "";
+        try {
+            System.out.println(DateUtils.getNowDate().toString());
+            // 加载图片并计算总宽度和高度
+            int maxWidth = 0;
+            int totalHeight = 0;
+            BufferedImage[] images = new BufferedImage[pics.length];
+            System.out.println(DateUtils.getNowDate().toString());
+            for (int i = 0; i < pics.length; i++) {
+                URL url = new URL(pics[i]);
+                BufferedImage image = ImageIO.read(url);
+                images[i] = image;
+                maxWidth = Math.max(maxWidth, image.getWidth());
+                totalHeight += image.getHeight() + Constants.SPACE_HEIGHT;
+            }
+            System.out.println(DateUtils.getNowDate().toString());
+            // 创建拼接后的图片
+            BufferedImage joinedImage = new BufferedImage(maxWidth, totalHeight, BufferedImage.TYPE_INT_RGB);
+            // 设置背景颜色
+            Graphics2D g = joinedImage.createGraphics();
+            g.setColor(Color.YELLOW);
+            g.fillRect(0, 0, joinedImage.getWidth(), joinedImage.getHeight());
+            // 拼接图片
+            int y = 0;
+            for (BufferedImage image : images) {
+                g.drawImage(image, 0, y, null);
+                y += image.getHeight() + Constants.SPACE_HEIGHT;
+            }
+            System.out.println(DateUtils.getNowDate().toString());
+            File file = new File(dstPic);
+            // 保存拼接后的图片
+            ImageIO.write(joinedImage, type, file);
+            // 上传至bos
+            mergeImgUrl = BosUtils.putByName(client, StringUtils.substringAfterLast(dstPic, "/"), file);
+            System.out.println(DateUtils.getNowDate().toString());
+            System.out.println(DateUtils.getNowDate().toString());
+            System.out.println("merge img url:" + mergeImgUrl);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mergeImgUrl;
+    }
+
+    public static BufferedImage[] imageDownloader(String[] pics) {
+        // 创建线程池,根据实际情况调整线程池大小
+        int corePoolSize = pics.length / 2;
+        int maximumPoolSize = pics.length;
+        long keepAliveTime = 60L;
+        TimeUnit unit = TimeUnit.SECONDS;
+        BlockingQueue<Runnable> workQueue = new LinkedBlockingQueue<>();
+        ThreadPoolExecutor executor = new ThreadPoolExecutor(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue);
+        // 并发下载图片
+        List<Future<BufferedImage>> futures = new ArrayList<>();
+        for (String imageUrl : pics) {
+            Future<BufferedImage> future = executor.submit(() -> {
+                URL url = new URL(imageUrl);
+                InputStream in = url.openStream();
+                BufferedImage image = ImageIO.read(in);
+                in.close();
+                System.out.println(imageUrl + " downloaded successfully.");
+                return image;
+            });
+            futures.add(future);
+        }
+        // 关闭线程池
+        executor.shutdown();
+        // 处理下载结果
+        List<BufferedImage> images = new ArrayList<>();
+        for (Future<BufferedImage> future : futures) {
+            try {
+                BufferedImage image = future.get();
+                images.add(image);
+            } catch (Exception e) {
+                System.out.println("Error downloading image: " + e.getMessage());
+            }
+        }
+        // 将所有下载成功的图片存储在BufferedImage数组中返回
+        return images.toArray(new BufferedImage[0]);
+    }
+
+    public static String joinImageListHtml(String[] pics, String dstHtml, OSS ossClient) {
+        try {
+            if (pics.length > 0) {
+                StringBuilder builder = new StringBuilder();
+                builder.append("<html>\n" +
+                        "<head></head>\n" +
+                        "<body>\n");
+                for (String pic : pics) {
+                    String s = String.format("<img src=\"%s\">\n", pic);
+                    builder.append(s);
+                }
+                builder.append("</body>\n" +
+                        "</html>");
+                InputStream is = IOUtils.toInputStream(builder.toString(), "UTF-8");
+                PutObjectResult result = ossClient.putObject(Constants.OSS_BUCKET, dstHtml, is);
+                System.out.println("put result:" + JSON.toJSONString(result));
+            }
+        } catch (OSSException oe) {
+            System.out.println("Caught an OSSException, which means your request made it to OSS, "
+                    + "but was rejected with an error response for some reason.");
+            System.out.println("Error Message:" + oe.getErrorMessage());
+            System.out.println("Error Code:" + oe.getErrorCode());
+            System.out.println("Request ID:" + oe.getRequestId());
+            System.out.println("Host ID:" + oe.getHostId());
+        } catch (ClientException ce) {
+            System.out.println("Caught an ClientException, which means the client encountered "
+                    + "a serious internal problem while trying to communicate with OSS, "
+                    + "such as not being able to access the network.");
+            System.out.println("Error Message:" + ce.getMessage());
+        } catch (IOException ie) {
+            System.out.println("Error Message:" + ie.getMessage());
+        }
+        String mergeUrl = Constants.OSS_URL + dstHtml;
+        System.out.println("merge url:" + mergeUrl);
+        return mergeUrl;
+    }
 }

src/main/java/com/pavis/ctr/audit/framework/config/ApplicationConfig.java

@@ -1,5 +1,7 @@
 package com.pavis.ctr.audit.framework.config;
 
+import com.aliyun.oss.OSS;
+import com.aliyun.oss.OSSClientBuilder;
 import com.baidubce.auth.DefaultBceCredentials;
 import com.baidubce.services.bos.BosClient;
 import com.baidubce.services.bos.BosClientConfiguration;
@@ -41,4 +43,9 @@ public class ApplicationConfig {
         config.setEndpoint(Constants.BOS_ENDPOINT);
         return new BosClient(config);
     }
+
+    @Bean
+    public OSS ossClient() {
+        return new OSSClientBuilder().build(Constants.OSS_ENDPOINT, Constants.ACCESS_KEY_ID, Constants.ACCESS_SECRET);
+    }
 }

src/main/java/com/pavis/ctr/audit/project/domain/AuditTripResult.java

@@ -66,6 +66,11 @@ public class AuditTripResult extends BaseEntity {
      */
     private String mergeImgUrl;
 
+    /**
+     * 合并html的链接
+     */
+    private String mergeHtmlUrl;
+
     public String getUploadId() {
         return uploadId;
     }
@@ -130,6 +135,14 @@ public class AuditTripResult extends BaseEntity {
         this.mergeImgUrl = mergeImgUrl;
     }
 
+    public String getMergeHtmlUrl() {
+        return mergeHtmlUrl;
+    }
+
+    public void setMergeHtmlUrl(String mergeHtmlUrl) {
+        this.mergeHtmlUrl = mergeHtmlUrl;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -145,6 +158,7 @@ public class AuditTripResult extends BaseEntity {
                 .append("listUUID", getListUuid())
                 .append("dateDir", getDateDir())
                 .append("mergeImgUrl", getMergeImgUrl())
+                .append("mergeHtmlUrl",getMergeHtmlUrl())
                 .append("remark", getRemark()).toString();
     }
 

src/main/java/com/pavis/ctr/audit/project/service/impl/AuditTripResultServiceImpl.java

@@ -1,6 +1,7 @@
 package com.pavis.ctr.audit.project.service.impl;
 
 
+import com.aliyun.oss.OSS;
 import com.baidubce.services.bos.BosClient;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pavis.ctr.audit.common.utils.ConvertObjUtils;
@@ -49,8 +50,11 @@ public class AuditTripResultServiceImpl extends ServiceImpl<AuditTripResultMappe
     @Autowired
     private BosClient client;
 
+    @Autowired
+    private OSS ossClient;
+
     @Override
-    public void emptyAuditedTrip(Long userId ,String username) {
+    public void emptyAuditedTrip(Long userId, String username) {
         List<AuditTripResult> auditTripResults = query().eq("user_id", userId).eq("audit_status", 2).list();
         if (auditTripResults != null && auditTripResults.size() > 0) {
             for (AuditTripResult auditTripResult : auditTripResults) {
@@ -346,12 +350,17 @@ public class AuditTripResultServiceImpl extends ServiceImpl<AuditTripResultMappe
         AuditTripResult auditTripResult = ConvertObjUtils.converResult(auditTripResultVo);
         AuditTripMain auditTripMain = ConvertObjUtils.converMain(auditTripResultVo);
         if (imgs.size() > 0) {
-            String dstPic = basePath + auditTripResultVo.getUploadId() + ".jpg";
             String[] imgArr = new String[imgs.size()];
-            String mergeImgUrl = ImageUtils.joinImageListVertical(imgs.toArray(imgArr), "jpg", dstPic, client);
-            if (StringUtils.isNotBlank(mergeImgUrl)) {
+            String dstPic = basePath + auditTripResultVo.getUploadId() + ".jpg";
+            String mergeImgUrl = ImageUtils.joinImagesVertical(imgs.toArray(imgArr), "jpg", dstPic, client);
+            // String mergeImgUrl = "test";
+            String dstHtml = auditTripResultVo.getUploadId() + ".html";
+            String mergeHtmlUrl = ImageUtils.joinImageListHtml(imgs.toArray(imgArr), dstHtml, ossClient);
+            // String mergeHtmlUrl = "test";
+            if (StringUtils.isNotBlank(mergeImgUrl) && StringUtils.isNotBlank(mergeHtmlUrl)) {
                 System.out.println("图片拼接成功！");
                 auditTripResult.setMergeImgUrl(mergeImgUrl);
+                auditTripResult.setMergeHtmlUrl(mergeHtmlUrl);
             } else {
                 System.out.println("图片拼接失败！");
             }

src/main/resources/mybatis/mapper/AuditTripResultMapper.xml

@@ -15,6 +15,8 @@
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
         <result property="listUuid" column="list_uuid"/>
+        <result property="mergeImgUrl" column="merge_img_url"/>
+        <result property="mergeHtmlUrl" column="merge_html_url"/>
     </resultMap>
 
 
@@ -52,6 +54,7 @@
             update_by=#{updateBy},
             update_time=#{updateTime},
             merge_img_url=#{mergeImgUrl},
+            merge_html_url=#{mergeHtmlUrl},
             remark=#{remark}
         where upload_id=#{uploadId}
     </update>
@@ -66,7 +69,7 @@
 
 
     <select id="selectByUserId" parameterType="Long" resultMap="AuditTripResult">
-        select upload_id,user_id,audit_status,audit_conclusion,audit_error,create_by,create_time
+        select *
         from audit_trip_result
         <where>
             <if test="startTime==null || endTime==null">
@@ -79,7 +82,7 @@
     </select>
 
     <select id="selectAllAuditedTrip" parameterType="Long" resultMap="AuditTripResult">
-        select upload_id, user_id, audit_status, audit_conclusion, audit_error, create_by, create_time
+        select *
         from audit_trip_result where user_id = #{userId} and audit_status = 1
     </select>
 
@@ -116,7 +119,7 @@
     </select>
 
     <select id="selectByUserIdList" resultMap="AuditTripResult">
-        select upload_id,user_id,audit_status,audit_conclusion,audit_error,create_by,create_time,list_uuid
+        select *
         from audit_trip_result
         where list_uuid=#{listUuid} and upload_id in
         <foreach collection="uploadId" item="item" open="(" close=")" separator=",">