接口格式更改

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

@@ -83,58 +83,53 @@ public class AlOssController {
         // file md5
         String fileMD5 = FilesUtils.getFileMD5(fileNew);
         PlatformOssFiles platformOssFiles = platformOssFilesMapper.selectOne(Wrappers.lambdaQuery(PlatformOssFiles.class).eq(PlatformOssFiles::getMd5str, fileMD5));
-        if (null != platformOssFiles) {
-            UploadVo uploadVo = new UploadVo();
-            uploadVo.setOssPath(platformOssFiles.getOssPath());
-            uploadVo.setSize(platformOssFiles.getSize());
-            uploadVo.setContentType(platformOssFiles.getContentType());
-            return ResponseDto.success(uploadVo);
-        }
-
-        String filename = file.getResource().getFilename();// time.jpeg
-        //这里文件名用了uuid 防止重复，可以根据自己的需要来写
-        String uploadName = UUID.randomUUID() + filename.substring(filename.lastIndexOf("."));// 078a77e0-cf80-481b-824c-5935247cff15.jpeg
-        uploadName = uploadName.replace("-", "");// 078a77e0cf80481b824c5935247cff15.jpeg
-        String uploadpath = pathName + "/" + DateUtil.format(LocalDateTime.now(), DateUtil.Formatter.yyyy_MM_dd2) + "/" + uploadName;
-        String buckName = "img-zhengzai-tv";
-        if (2 == buckType) {
-            buckName = "app-zhengzai-tv";
-        }
-        PutObjectRequest putObjectRequest = new PutObjectRequest(buckName, uploadpath, fileNew);
-        ossClient.putObject(putObjectRequest);
-        if (resize > 0) {
-            // 将图片缩放
-            StringBuilder sbStyle = new StringBuilder();
-            Formatter styleFormatter = new Formatter(sbStyle);
-            String styleType = "image/resize,w_" + resize;
-//            String styleType = "image/resize,m_fixed,w_100,h_100";
-            styleFormatter.format("%s|sys/saveas,o_%s,b_%s", styleType,
-                    BinaryUtil.toBase64String(uploadpath.getBytes()),
-                    BinaryUtil.toBase64String(buckName.getBytes()));
-            ProcessObjectRequest request = new ProcessObjectRequest(buckName, uploadpath, sbStyle.toString());
-            GenericResult processResult = ossClient.processObject(request);
-        }
+        UploadVo uploadVo = new UploadVo();
+        if (null == platformOssFiles) {
+            String filename = file.getResource().getFilename();// time.jpeg
+            //这里文件名用了uuid 防止重复，可以根据自己的需要来写
+            String uploadName = UUID.randomUUID() + filename.substring(filename.lastIndexOf("."));// 078a77e0-cf80-481b-824c-5935247cff15.jpeg
+            uploadName = uploadName.replace("-", "");// 078a77e0cf80481b824c5935247cff15.jpeg
+            String uploadpath = pathName + "/" + DateUtil.format(LocalDateTime.now(), DateUtil.Formatter.yyyy_MM_dd2) + "/" + uploadName;
+            String buckName = "img-zhengzai-tv";
+            if (2 == buckType) {
+                buckName = "app-zhengzai-tv";
+            }
+            PutObjectRequest putObjectRequest = new PutObjectRequest(buckName, uploadpath, fileNew);
+            ossClient.putObject(putObjectRequest);
+            if (resize > 0) {
+                // 将图片缩放
+                StringBuilder sbStyle = new StringBuilder();
+                Formatter styleFormatter = new Formatter(sbStyle);
+                String styleType = "image/resize,w_" + resize;
+                // String styleType = "image/resize,m_fixed,w_100,h_100";
+                styleFormatter.format("%s|sys/saveas,o_%s,b_%s", styleType,
+                        BinaryUtil.toBase64String(uploadpath.getBytes()),
+                        BinaryUtil.toBase64String(buckName.getBytes()));
+                ProcessObjectRequest request = new ProcessObjectRequest(buckName, uploadpath, sbStyle.toString());
+                GenericResult processResult = ossClient.processObject(request);
+            }
 
 
-        ossClient.shutdown();
-        FilesUtils.delteTempFile(fileNew); // 删除临时文件
+            ossClient.shutdown();
+            FilesUtils.delteTempFile(fileNew); // 删除临时文件
 
-        // 入库
-        PlatformOssFiles platformOssFilesDate = new PlatformOssFiles();
-        String ossFilesId = IDGenerator.nextSnowId();
-        platformOssFilesDate.setOssFilesId(ossFilesId);
-        platformOssFilesDate.setOssPath(uploadpath);
-        platformOssFilesDate.setFileName(filename);
-        platformOssFilesDate.setContentType(file.getContentType());
-        platformOssFilesDate.setSize((int) file.getSize());
-        platformOssFilesDate.setMd5str(fileMD5);
-        platformOssFilesDate.setBuckType(buckType);
-        platformOssFilesDate.setCreatedAt(DateUtil.getNowTime());
-        platformOssFilesMapper.insert(platformOssFilesDate);
+            // 入库
+            PlatformOssFiles platformOssFilesDate = new PlatformOssFiles();
+            String ossFilesId = IDGenerator.nextSnowId();
+            platformOssFilesDate.setOssFilesId(ossFilesId);
+            platformOssFilesDate.setOssPath(uploadpath);
+            platformOssFilesDate.setFileName(filename);
+            platformOssFilesDate.setContentType(file.getContentType());
+            platformOssFilesDate.setSize((int) file.getSize());
+            platformOssFilesDate.setMd5str(fileMD5);
+            platformOssFilesDate.setBuckType(buckType);
+            platformOssFilesDate.setCreatedAt(DateUtil.getNowTime());
+            platformOssFilesMapper.insert(platformOssFilesDate);
 
-        // 返回值
-        UploadVo uploadVo = new UploadVo();
-        BeanUtils.copyProperties(platformOssFilesDate, uploadVo);
+            BeanUtils.copyProperties(platformOssFilesDate, uploadVo);
+        } else {
+            BeanUtils.copyProperties(platformOssFiles, uploadVo);
+        }
         return ResponseDto.success(uploadVo);
     }