|
|
@@ -6,6 +6,7 @@ import com.qmth.boot.api.exception.ApiException;
|
|
|
import com.qmth.distributed.print.business.entity.TBTask;
|
|
|
import com.qmth.distributed.print.business.enums.TaskResultEnum;
|
|
|
import com.qmth.distributed.print.business.enums.TaskStatusEnum;
|
|
|
+import com.qmth.distributed.print.business.enums.TaskTypeEnum;
|
|
|
import com.qmth.distributed.print.business.enums.UploadFileEnum;
|
|
|
import com.qmth.distributed.print.business.service.TBTaskService;
|
|
|
import com.qmth.distributed.print.business.util.OssUtil;
|
|
|
@@ -98,14 +99,15 @@ public abstract class AsyncImportTaskTemplete {
|
|
|
byte[] bookByteAry = out.toByteArray();
|
|
|
inputStream = new ByteArrayInputStream(bookByteAry);
|
|
|
StringJoiner stringJoiner = new StringJoiner("");
|
|
|
+ if (tbTask.getType() == TaskTypeEnum.CREATE_PDF) {
|
|
|
+ path = path.replaceAll(UploadFileEnum.PDF.getTitle(), UploadFileEnum.FILE.getTitle());
|
|
|
+ }
|
|
|
|
|
|
if (Objects.equals(type, SystemConstant.OSS)) {//上传至oss
|
|
|
path = path.substring(0, path.lastIndexOf("/") + 1);
|
|
|
stringJoiner.add(path).add(SystemConstant.getUuid()).add(TXT_PREFIX).toString();
|
|
|
ossUtil.ossUpload(stringJoiner.toString(), inputStream, null);
|
|
|
} else {//上传至服务器
|
|
|
- path = path.substring(0, path.lastIndexOf(File.separator) + 1);
|
|
|
- stringJoiner.add(path).add(SystemConstant.getUuid()).add(TXT_PREFIX).toString();
|
|
|
File finalFile = new File(stringJoiner.toString());
|
|
|
if (!finalFile.exists()) {
|
|
|
finalFile.getParentFile().mkdirs();
|
|
|
@@ -144,6 +146,11 @@ public abstract class AsyncImportTaskTemplete {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
tbTask.setStatus(TaskStatusEnum.FINISH);
|
|
|
+ if (tbTask.getType() == TaskTypeEnum.CREATE_PDF) {
|
|
|
+ tbTask.setResultFilePath(tbTask.getImportFilePath());
|
|
|
+ tbTask.setImportFileName(null);
|
|
|
+ tbTask.setImportFilePath(null);
|
|
|
+ }
|
|
|
tbTaskService.updateById(tbTask);
|
|
|
}
|
|
|
}
|
wangliang