|
|
@@ -4,10 +4,10 @@ import cn.hutool.core.date.DateUtil;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.qmth.boot.api.exception.ApiException;
|
|
|
import com.qmth.distributed.print.business.templete.importData.AsyncImportTaskTemplete;
|
|
|
+import com.qmth.teachcloud.common.config.DictionaryConfig;
|
|
|
import com.qmth.teachcloud.common.contant.SpringContextHolder;
|
|
|
import com.qmth.teachcloud.common.contant.SystemConstant;
|
|
|
import com.qmth.teachcloud.common.entity.TBTask;
|
|
|
-import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
|
|
|
import com.qmth.teachcloud.common.enums.TaskResultEnum;
|
|
|
import com.qmth.teachcloud.common.enums.TaskStatusEnum;
|
|
|
import com.qmth.teachcloud.common.enums.UploadFileEnum;
|
|
|
@@ -70,19 +70,26 @@ public abstract class AsyncExportTaskTemplete {
|
|
|
try {
|
|
|
JSONObject jsonObject = JSONObject.parseObject(tbTask.getResultFilePath());
|
|
|
if (Objects.isNull(jsonObject)) {
|
|
|
+ DictionaryConfig dictionaryConfig = SpringContextHolder.getBean(DictionaryConfig.class);
|
|
|
+
|
|
|
jsonObject = new JSONObject();
|
|
|
LocalDateTime nowTime = LocalDateTime.now();
|
|
|
StringJoiner stringJoiner = new StringJoiner("");
|
|
|
+ if (Objects.nonNull(dictionaryConfig) && dictionaryConfig.sysDomain().isOss()) {
|
|
|
+ jsonObject.put(SystemConstant.TYPE, SystemConstant.OSS);
|
|
|
+ } else {
|
|
|
+ stringJoiner.add(SystemConstant.TEMP_FILES_DIR).add(File.separator);
|
|
|
+ jsonObject.put(SystemConstant.TYPE, SystemConstant.LOCAL);
|
|
|
+ }
|
|
|
stringJoiner.add(UploadFileEnum.FILE.getTitle()).add(File.separator);
|
|
|
stringJoiner.add(String.valueOf(nowTime.getYear())).add(File.separator)
|
|
|
.add(String.format("%02d", nowTime.getMonthValue())).add(File.separator)
|
|
|
.add(String.format("%02d", nowTime.getDayOfMonth()))
|
|
|
.add(File.separator).add(SystemConstant.getUuid()).add(TXT_PREFIX);
|
|
|
- jsonObject.put(SystemConstant.TYPE, SystemConstant.OSS);
|
|
|
jsonObject.put(SystemConstant.PATH, stringJoiner.toString());
|
|
|
}
|
|
|
String path = (String) jsonObject.get(SystemConstant.PATH);
|
|
|
- path = path.replaceAll("\\\\","/");
|
|
|
+ path = path.replaceAll("\\\\", "/");
|
|
|
String type = (String) jsonObject.get(SystemConstant.TYPE);
|
|
|
|
|
|
out = new ByteArrayOutputStream();
|
wangliang