|
@@ -51,10 +51,9 @@ public class ShiwanFileUploadServiceImpl extends ServiceImpl<ShiwanFileUploadMap
|
|
|
|
|
|
@Override
|
|
|
public ShiwanFileUpload saveOrUpdateFile(MultipartFile file, String userId, Long accountId, String fileType, Long parentId, String uuid) {
|
|
|
- ShiwanFileUpload existFiles = getExistFiles(userId, accountId, file.getOriginalFilename(), fileType, parentId);
|
|
|
StringBuffer path = new StringBuffer();
|
|
|
path.append(downloadPath).append(DateUtils.getNowDate(DateUtils.WEB_FORMAT)).append("/").append(UUID.randomUUID().toString()).append("/");
|
|
|
- log.info("----------下载到服务器地址:{}", path.toString());
|
|
|
+ log.info("-------下载到服务器地址:{}", path.toString());
|
|
|
ShiwanFileUpload shiwanFileUpload = null;
|
|
|
String newFileUrl = FileUtil.approvalFile(file, path.toString());
|
|
|
String md5 = null;
|
|
@@ -63,25 +62,40 @@ public class ShiwanFileUploadServiceImpl extends ServiceImpl<ShiwanFileUploadMap
|
|
|
} catch (IOException e) {
|
|
|
log.error("获取MD5签名失败", e);
|
|
|
}
|
|
|
+ ShiwanFileUpload existFiles = getExistFiles(userId, accountId, file.getOriginalFilename(), fileType, parentId, md5);
|
|
|
if (!Check.isNull(existFiles)) {
|
|
|
+ long start = System.currentTimeMillis();
|
|
|
existFiles.setSignature(md5);
|
|
|
- shiwanFileUpload = updateFile(file, existFiles);
|
|
|
+ try {
|
|
|
+ shiwanFileUpload = updateFile(file, existFiles);
|
|
|
+ } catch (IOException e) {
|
|
|
+ log.error("更新文件,上传SOC异常", e);
|
|
|
+ }
|
|
|
if (!Check.isNull(shiwanFileUpload)) {
|
|
|
List<String> urlList = unzipFiles(shiwanFileUpload, path.toString(), newFileUrl);
|
|
|
saveInnerFiles(shiwanFileUpload, urlList);
|
|
|
}
|
|
|
+ long end = System.currentTimeMillis();
|
|
|
+ log.info("文件更新完成,耗时:{} ms", (end - start));
|
|
|
} else {
|
|
|
+ long start = System.currentTimeMillis();
|
|
|
ShiwanFileUpload fileUpload = new ShiwanFileUpload();
|
|
|
fileUpload.setSignature(md5);
|
|
|
fileUpload.setUserId(userId);
|
|
|
fileUpload.setAccountId(accountId);
|
|
|
fileUpload.setFileType(fileType);
|
|
|
- fileUpload.setParentId(parentId);
|
|
|
- shiwanFileUpload = saveFile(file, fileUpload, uuid);
|
|
|
+ try {
|
|
|
+ //新增zip包
|
|
|
+ shiwanFileUpload = saveFile(file, fileUpload, null);
|
|
|
+ } catch (IOException e) {
|
|
|
+ log.error("新增文件,上传SOC异常", e);
|
|
|
+ }
|
|
|
if (!Check.isNull(shiwanFileUpload)) {
|
|
|
List<String> urlList = unzipFiles(shiwanFileUpload, path.toString(), newFileUrl);
|
|
|
saveInnerFiles(shiwanFileUpload, urlList);
|
|
|
}
|
|
|
+ long end = System.currentTimeMillis();
|
|
|
+ log.info("文件新增完成,耗时:{} ms", (end - start));
|
|
|
}
|
|
|
return shiwanFileUpload;
|
|
|
}
|
|
@@ -94,7 +108,7 @@ public class ShiwanFileUploadServiceImpl extends ServiceImpl<ShiwanFileUploadMap
|
|
|
* @throws
|
|
|
* @author ZHAOXA
|
|
|
*/
|
|
|
- private ShiwanFileUpload updateFile(MultipartFile file, ShiwanFileUpload existFiles) {
|
|
|
+ private ShiwanFileUpload updateFile(MultipartFile file, ShiwanFileUpload existFiles) throws IOException {
|
|
|
ResFileDTO resultFile = null;
|
|
|
String url = "";
|
|
|
ShiwanFileUpload fileUpload = new ShiwanFileUpload();
|
|
@@ -103,14 +117,20 @@ public class ShiwanFileUploadServiceImpl extends ServiceImpl<ShiwanFileUploadMap
|
|
|
} else {
|
|
|
url = "try-play/zip/";
|
|
|
}
|
|
|
+ InputStream inputStream = null;
|
|
|
try {
|
|
|
- resultFile = CosUtils.uploadDetailInputStreamV2(file.getInputStream(), existFiles.getCfileName(), existFiles.getFileSuffix(), file.getSize(), url);
|
|
|
+ inputStream = file.getInputStream();
|
|
|
+ resultFile = CosUtils.uploadDetailInputStreamV2(inputStream, existFiles.getCfileName(), existFiles.getFileSuffix(), file.getSize(), url);
|
|
|
} catch (IOException e) {
|
|
|
log.error("更新文件,上传COS失败", e);
|
|
|
+ } finally {
|
|
|
+ if (inputStream != null) {
|
|
|
+ inputStream.close();
|
|
|
+ }
|
|
|
}
|
|
|
QueryWrapper<ShiwanFileUpload> queryWrapper = new QueryWrapper<>();
|
|
|
queryWrapper.eq("id", existFiles.getId());
|
|
|
- existFiles.setFileSize(resultFile.getFileSize() + "b");
|
|
|
+ existFiles.setFileSize(resultFile.getFileSize() + "B");
|
|
|
existFiles.setUploadTime(new Date());
|
|
|
shiwanFileUploadMapper.update(existFiles, queryWrapper);
|
|
|
shiwanFileUploadMapper.deleteByParentId(existFiles.getId());
|
|
@@ -125,7 +145,7 @@ public class ShiwanFileUploadServiceImpl extends ServiceImpl<ShiwanFileUploadMap
|
|
|
* @throws
|
|
|
* @author ZHAOXA
|
|
|
*/
|
|
|
- private ShiwanFileUpload saveFile(MultipartFile file, ShiwanFileUpload fileUpload, String uuid) {
|
|
|
+ private ShiwanFileUpload saveFile(MultipartFile file, ShiwanFileUpload fileUpload, String uuid) throws IOException {
|
|
|
String filename = file.getOriginalFilename();
|
|
|
ResFileDTO resultFile = null;
|
|
|
String url = "";
|
|
@@ -136,10 +156,16 @@ public class ShiwanFileUploadServiceImpl extends ServiceImpl<ShiwanFileUploadMap
|
|
|
url = "try-play/inner-file/".concat(uuid).concat("/");
|
|
|
}
|
|
|
String fileSuffix = filename.substring(filename.lastIndexOf(".") + 1).toLowerCase();
|
|
|
+ InputStream inputStream = null;
|
|
|
try {
|
|
|
- resultFile = CosUtils.uploadDetailInputStream(file.getInputStream(), filename, fileSuffix, file.getSize(), url);
|
|
|
+ inputStream = file.getInputStream();
|
|
|
+ resultFile = CosUtils.uploadDetailInputStreamV2(inputStream, filename, fileSuffix, file.getSize(), url);
|
|
|
} catch (IOException e) {
|
|
|
log.error("上传COS异常", e);
|
|
|
+ } finally {
|
|
|
+ if (inputStream != null) {
|
|
|
+ inputStream.close();
|
|
|
+ }
|
|
|
}
|
|
|
if (!Check.isNull(resultFile)) {
|
|
|
fileUpload.setCfileName(resultFile.getCFileName());
|
|
@@ -151,7 +177,7 @@ public class ShiwanFileUploadServiceImpl extends ServiceImpl<ShiwanFileUploadMap
|
|
|
fileUpload.setFileLevel(NoEn.NO1.valueInt());
|
|
|
}
|
|
|
fileUpload.setFileStatus(NoEn.NO1.valueStr());
|
|
|
- fileUpload.setFileSize(resultFile.getFileSize() + "b");
|
|
|
+ fileUpload.setFileSize(resultFile.getFileSize() + "B");
|
|
|
fileUpload.setFileUrl(resultFile.getFileUrl());
|
|
|
fileUpload.setUploadTime(new Date());
|
|
|
shiwanFileUploadMapper.insert(fileUpload);
|
|
@@ -206,6 +232,7 @@ public class ShiwanFileUploadServiceImpl extends ServiceImpl<ShiwanFileUploadMap
|
|
|
* @author ZHAOXA
|
|
|
*/
|
|
|
private List<String> unzipFiles(ShiwanFileUpload fileUpload, String path, String innerZipPath) {
|
|
|
+ long start = System.currentTimeMillis();
|
|
|
List<String> urlList = new ArrayList<>();
|
|
|
//下载到本地服务器
|
|
|
if (Check.isNull(innerZipPath)) {
|
|
@@ -251,6 +278,8 @@ public class ShiwanFileUploadServiceImpl extends ServiceImpl<ShiwanFileUploadMap
|
|
|
log.error("解压原zip文件失败 ", e);
|
|
|
}
|
|
|
deletelocalFiles(innerZipPath);
|
|
|
+ long end = System.currentTimeMillis();
|
|
|
+ log.info("文件解压完成,耗时:{} ms", (end - start));
|
|
|
return urlList;
|
|
|
}
|
|
|
|
|
@@ -298,13 +327,25 @@ public class ShiwanFileUploadServiceImpl extends ServiceImpl<ShiwanFileUploadMap
|
|
|
shiwanFileUpload.setAccountId(newZipEntity.getAccountId());
|
|
|
shiwanFileUpload.setFileType(newZipEntity.getFileType());
|
|
|
shiwanFileUpload.setParentId(newZipEntity.getId());
|
|
|
+ String urlpath = url.substring(0, url.lastIndexOf("/"));
|
|
|
+ String lastFileName = urlpath.substring(urlpath.lastIndexOf("/") + 1);
|
|
|
+ String cosFilePath = "";
|
|
|
+ if ("innerFiles".equals(lastFileName)) {
|
|
|
+ cosFilePath = newZipEntity.getCfileName();
|
|
|
+ } else {
|
|
|
+ cosFilePath = newZipEntity.getCfileName().concat("/").concat(lastFileName);
|
|
|
+ }
|
|
|
try {
|
|
|
shiwanFileUpload.setSignature(LoadFileUtil.getMD5(url));
|
|
|
} catch (IOException e) {
|
|
|
log.error("获取MD5签名失败", e);
|
|
|
}
|
|
|
mulFileByPath = FileUtil.getMulFileByPath(url);
|
|
|
- saveFile(mulFileByPath, shiwanFileUpload, newZipEntity.getCfileName());
|
|
|
+ try {
|
|
|
+ saveFile(mulFileByPath, shiwanFileUpload, cosFilePath);
|
|
|
+ } catch (IOException e) {
|
|
|
+ log.error("新增内部文件,上传SOC异常", e);
|
|
|
+ }
|
|
|
deletelocalFiles(url);
|
|
|
}
|
|
|
}
|
|
@@ -332,13 +373,14 @@ public class ShiwanFileUploadServiceImpl extends ServiceImpl<ShiwanFileUploadMap
|
|
|
* @throws
|
|
|
* @author ZHAOXA
|
|
|
*/
|
|
|
- private ShiwanFileUpload getExistFiles(String userId, Long accountId, String fileName, String fileType, Long parentId) {
|
|
|
+ private ShiwanFileUpload getExistFiles(String userId, Long accountId, String fileName, String fileType, Long parentId, String md5) {
|
|
|
JSONObject job = new JSONObject();
|
|
|
job.put("useId", userId);
|
|
|
job.put("accountId", accountId);
|
|
|
job.put("fileName", fileName);
|
|
|
job.put("fileType", fileType);
|
|
|
job.put("parentId", parentId);
|
|
|
+ job.put("signature", md5);
|
|
|
ShiwanFileUpload fileEntity = shiwanFileUploadMapper.selectEntity(job);
|
|
|
if (Check.isNull(fileEntity)) {
|
|
|
return null;
|