bug修改

commons/src/main/java/com/jzg/commons/util/BuildDescUtils.java

@@ -3,6 +3,7 @@ package com.jzg.commons.util;
 import com.jzg.commons.entity.po.PtlAgreementUndwrtRulesAttr;
 import com.jzg.commons.entity.po.PtlAgreementUndwrtRulesDictLabal;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -34,7 +35,8 @@ public class BuildDescUtils {
                 if(link.getMinArray() != null && link.getMinArray().length > 0){
                     desc.append(ptlAgreementUndwrtRulesAttr.getAttrName()).append("包含");
                     for (int k=0 ; k<link.getMinArray().length; k++){
-                        desc.append(link.getMinArray()[k]).append("，");
+                        PtlAgreementUndwrtRulesDictLabal ptlAgreementUndwrtRulesDictLabal = ptlAgreementUndwrtRulesAttr.getDictLabal().stream().filter(x -> Arrays.asList(link.getMinArray()).contains(x.getCode())).findFirst().orElse(null);
+                        desc.append(ptlAgreementUndwrtRulesDictLabal.getName()).append("，");
                     }
 
                 }else {

commons/src/main/java/com/jzg/commons/util/MinioUtils.java

@@ -20,6 +20,7 @@ import java.io.*;
 import java.lang.reflect.Field;
 import java.net.URLDecoder;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @program: xxkfz-minio
@@ -452,7 +453,11 @@ public class MinioUtils {
         }
 
         // 生成存储在MinIO中的文件名
-        String objectName = "excel-exports/" + System.currentTimeMillis() + "_" +
+//        String objectName = "excel-exports/" + System.currentTimeMillis() + "_" +
+//                UUID.randomUUID().toString().substring(0, 8) + "_" +
+//                originalFileName + ".xlsx";
+
+        String objectName = System.currentTimeMillis() + "_" +
                 UUID.randomUUID().toString().substring(0, 8) + "_" +
                 originalFileName + ".xlsx";
 
@@ -468,8 +473,18 @@ public class MinioUtils {
             );
             log.info("上传文件到minio. resp.etag=[{}],resp.versionId()=[{}]", resp.etag(), resp.versionId());
         }
-        String baseUrl = minioUrl.endsWith("/") ? minioUrl.substring(0, minioUrl.length() - 1) : minioUrl;
-        return baseUrl + "/" + bucketName + "/" + objectName;
+
+        String fileUrl = minioClient.getPresignedObjectUrl(
+                GetPresignedObjectUrlArgs.builder()
+                        .method(Method.GET)
+                        .bucket(bucketName)
+                        .object(objectName)
+                        .expiry(7, TimeUnit.DAYS)
+                        .build()
+        );
+
+//        String baseUrl = minioUrl.endsWith("/") ? minioUrl.substring(0, minioUrl.length() - 1) : minioUrl;
+        return fileUrl;
     }
 
     // ===================== 【动态列导出】 =====================