소스 검색

fix 国任保险上传影像问题

liub 4 달 전
부모
커밋
38cef15f0e
1개의 변경된 파일26개의 추가작업 그리고 40개의 파일을 삭제
  1. 26 40
      tenant/insurance/quotation-guoren/src/main/java/com/jzg/quotation/guoren/api/service/Impl/GuoRenApiRequestImpl.java

+ 26 - 40
tenant/insurance/quotation-guoren/src/main/java/com/jzg/quotation/guoren/api/service/Impl/GuoRenApiRequestImpl.java

@@ -666,56 +666,42 @@ public class GuoRenApiRequestImpl implements GuoRenApiRequest {
             // 根据影像类型确定fileGroup
             String fileGroup = getFileGroup(imageVo);
 
+            byte[] imageBytes;
+            String fileName;
+
             for (InsuranceImageVo.ImageDTO imageDTO : imageList) {
                 if (imageDTO == null) {
                     logger.warn("国任上传影像失败,图片DTO为空");
                     continue;
                 }
 
-                byte[] imageBytes = imageDTO.getImageByte();
-                String fileName = imageDTO.getImageName();
-
-                // 如果imageByte为空,根据imageId查询文件并下载
-                if (imageBytes == null && StringUtils.isNotEmpty(imageDTO.getImageId())) {
-                    try {
-                        // 根据imageId查询文件信息
-                        SysUploadFiles uploadFile = platformClient.getUploadFile(imageDTO.getImageId());
-                        if (uploadFile == null) {
-                            logger.error("国任上传影像失败,未找到文件信息,imageId:{}", imageDTO.getImageId());
-                            continue;
-                        }
-
-                        // 获取文件名
-                        fileName = uploadFile.getFileName();
-
-                        // 获取文件流
-//                        String presignedUrl = MinioUtils.getPresignedObjectUrl(uploadFile.getBucketName(), fileName);
-                        InputStream inputStream = minioUtils.getObject(uploadFile.getBucketName(), fileName);
-                        if (inputStream == null) {
-                            logger.error("国任上传影像失败,获取文件预签名URL失败,imageId:{}", imageDTO.getImageId());
-                            continue;
-                        }
-
-                        // 下载文件内容为byte[]
-                        imageBytes = IOUtils.toByteArray(inputStream);
-                        if (imageBytes == null || imageBytes.length == 0) {
-                            logger.error("国任上传影像失败,文件内容为空,imageId:{}", imageDTO.getImageId());
-                            continue;
-                        }
-
-                        logger.info("国任下载影像成功,imageId:{},fileName:{}", imageDTO.getImageId(), fileName);
-                    } catch (Exception e) {
-                        logger.error("国任下载影像异常,imageId:{},error:{}", imageDTO.getImageId(), e.getMessage(), e);
+                try {  // 根据imageId查询文件信息
+                    SysUploadFiles uploadFile = platformClient.getUploadFile(imageDTO.getImageId());
+                    if (uploadFile == null) {
+                        logger.error("国任上传影像失败,未找到文件信息,imageId:{}", imageDTO.getImageId());
                         continue;
                     }
-                }
 
-                if (imageBytes == null || imageBytes.length == 0) {
-                    logger.warn("国任上传影像失败,图片字节数组为空,imageId:{}", imageDTO.getImageId());
-                    continue;
-                }
+                    // 获取文件名
+                    fileName = uploadFile.getFileName();
+
+                    // 获取文件流
+                    InputStream inputStream = minioUtils.getObject(uploadFile.getBucketName(), fileName);
+                    if (inputStream == null) {
+                        logger.error("国任上传影像失败,获取文件预签名URL失败,imageId:{}", imageDTO.getImageId());
+                        continue;
+                    }
+
+                    // 下载文件内容为byte[]
+                    imageBytes = IOUtils.toByteArray(inputStream);
+                    if (imageBytes == null || imageBytes.length == 0) {
+                        logger.error("国任上传影像失败,文件内容为空,imageId:{}", imageDTO.getImageId());
+                        continue;
+                    }
+
+                    logger.info("国任下载影像成功,imageId:{},fileName:{}", imageDTO.getImageId(), fileName);
+
 
-                try {
                     // 生成临时文件
                     String fileSuffix = getFileSuffix(fileName);
                     File tempFile = File.createTempFile("upload_temp_", fileSuffix);