|
@@ -262,15 +262,23 @@ public class OrderController extends BaseWebController {
|
|
|
//视频处理
|
|
//视频处理
|
|
|
//先压缩视频再处理
|
|
//先压缩视频再处理
|
|
|
if(file.getSize() /1024L/1024L >3L){
|
|
if(file.getSize() /1024L/1024L >3L){
|
|
|
- tempFile = ossUtils.compressVideo(tempFile);
|
|
|
|
|
- inputStream = new FileInputStream(tempFile);
|
|
|
|
|
- }
|
|
|
|
|
- File imageFile = ossUtils.generateCover(tempFile);
|
|
|
|
|
- dto = distinctionService.checkImg(imageFile,orderId,uidList);
|
|
|
|
|
- if(dto.getOrderId() ==null){
|
|
|
|
|
- VaultsResponse<String> vaultsResponse = ossUtils.uploadOneFile(file,orderId,inputStream);
|
|
|
|
|
- dto.setUrl(vaultsResponse.getData());
|
|
|
|
|
|
|
+ File tempFile2 = ossUtils.compressVideo(tempFile);
|
|
|
|
|
+ File imageFile = ossUtils.generateCover(tempFile2);
|
|
|
|
|
+ dto = distinctionService.checkImg(imageFile,orderId,uidList);
|
|
|
|
|
+ if(dto.getOrderId() ==null){
|
|
|
|
|
+ VaultsResponse<String> vaultsResponse = ossUtils.uploadOneFile(file,orderId,new FileInputStream(tempFile2));
|
|
|
|
|
+ dto.setUrl(vaultsResponse.getData());
|
|
|
|
|
+ }
|
|
|
|
|
+ // tempFile2.deleteOnExit();
|
|
|
|
|
+ }else{
|
|
|
|
|
+ File imageFile = ossUtils.generateCover(tempFile);
|
|
|
|
|
+ dto = distinctionService.checkImg(imageFile,orderId,uidList);
|
|
|
|
|
+ if(dto.getOrderId() ==null){
|
|
|
|
|
+ VaultsResponse<String> vaultsResponse = ossUtils.uploadOneFile(file,orderId,inputStream);
|
|
|
|
|
+ dto.setUrl(vaultsResponse.getData());
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
//imageFile.delete();
|
|
//imageFile.delete();
|
|
|
}else{
|
|
}else{
|
|
|
//图片处理
|
|
//图片处理
|