Merge branch 'wangdingyi' into 'dev'

车型试验原始记录转为图片

See merge request !373

quality-review/src/main/java/com/ruoyi/service/impl/TaskServiceImpl.java

@@ -844,12 +844,18 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
         return testSchemeId;
     }
 
+    /**
+     * pdf转图片
+     * @param request
+     * @return
+     * @throws IOException
+     */
     @Override
     public String getPicture(TaskPictureRequest request) throws IOException {
 
         Task task = taskMapper.selectById(request.getTaskId());
 
-        if (task.getPictureUrl() != null) {
+        if (!Objects.equals(task.getPictureUrl(), "") && task.getPictureUrl() != null) {
             return task.getPictureUrl();
         } else {
             String pictureUrl = processRemotePDF(request.getUrl());
@@ -860,6 +866,12 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
         }
     }
 
+    /**
+     * pdf转图片
+     * @param urlStr
+     * @return
+     * @throws IOException
+     */
     public String processRemotePDF(String urlStr) throws IOException {
         URL url = new URL(urlStr);
         String pictureUrl = "";

ruoyi-admin/src/test/java/com/ruoyi/TestPdfBox.java

@@ -24,17 +24,20 @@ public class TestPdfBox {
     private static String bucketName = "vehicle-quality-review-oss";
 
 //    @Value("${minio.url}")
-    private static String minioEndpoint = "http://106.3.99.64:22013";
+//    private static String minioEndpoint = "http://106.3.99.64:22013";
+    private static String minioEndpoint = "http://10.12.48.79:22038";
 
 //    @Value("${minio.accessKey}")
-    private static String accessKey = "FNGqDZnHJhrugLlZBh77";
+//    private static String accessKey = "FNGqDZnHJhrugLlZBh77";
+    private static String accessKey = "jockOVg2UG0dy2GZ";
 
 //    @Value("${minio.secretKey}")
-    private static String secretKey = "TvnWeQxAQ1OYiAN68qlzEDJl5RqZ7tQYTMJ8XM0M";
+//    private static String secretKey = "TvnWeQxAQ1OYiAN68qlzEDJl5RqZ7tQYTMJ8XM0M";
+    private static String secretKey = "AIZ4Ppls4xYrheSZfik8vbq4v6i1wm7m";
 
     @Test
     public static void main(String[] args) throws IOException {
-        String url = "http://106.3.99.64:22013/vehicle-quality-review-oss/2024/06/14/车型审查原始记录-202406141755.pdf";
+        String url = "http://10.12.48.79:22038/vehicle-quality-review-oss/2024/06/24/车型审查原始记录-202406241741.pdf";
         String pictureUrl = processRemotePDF(url);
         System.out.println(pictureUrl);
     }