Merge branch 'dev-sweet' into pre

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/basicServices/AlOssController.java

@@ -6,7 +6,9 @@ import com.aliyun.oss.common.utils.BinaryUtil;
 import com.aliyun.oss.model.GenericResult;
 import com.aliyun.oss.model.ProcessObjectRequest;
 import com.aliyun.oss.model.PutObjectRequest;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.FilesUtils;
 import com.liquidnet.commons.lang.util.IDGenerator;
@@ -27,6 +29,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.File;
 import java.time.LocalDateTime;
 import java.util.Formatter;
+import java.util.List;
 import java.util.UUID;
 
 /**
@@ -77,9 +80,12 @@ public class AlOssController {
 
         // file md5
         String fileMD5 = FilesUtils.getFileMD5(fileNew);
-        PlatformOssFiles platformOssFiles = platformOssFilesMapper.selectOne(Wrappers.lambdaQuery(PlatformOssFiles.class).eq(PlatformOssFiles::getMd5str, fileMD5));
+        List<PlatformOssFiles> platformOssFiles = platformOssFilesMapper.selectList(
+                Wrappers.lambdaQuery(PlatformOssFiles.class)
+                        .eq(PlatformOssFiles::getMd5str, fileMD5)
+        );
         UploadVo uploadVo = new UploadVo();
-        if (null == platformOssFiles) {
+        if (CollectionUtils.isEmpty(platformOssFiles)) {
             String filename = file.getResource().getFilename();// time.jpeg
             //这里文件名用了uuid 防止重复，可以根据自己的需要来写
             String uploadName = UUID.randomUUID() + filename.substring(filename.lastIndexOf("."));// 078a77e0-cf80-481b-824c-5935247cff15.jpeg
@@ -122,7 +128,8 @@ public class AlOssController {
 
             BeanUtils.copyProperties(platformOssFilesDate, uploadVo);
         } else {
-            BeanUtils.copyProperties(platformOssFiles, uploadVo);
+            PlatformOssFiles platformOssFilesOne = platformOssFiles.get(0);
+            BeanUtils.copyProperties(platformOssFilesOne, uploadVo);
         }
         return ResponseDto.success(uploadVo);
     }