createTxtBUG修复

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/importData/AsyncImportTaskTemplete.java

@@ -3,27 +3,24 @@ package com.qmth.distributed.print.business.templete.importData;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.qmth.boot.api.exception.ApiException;
+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.SysConfig;
 import com.qmth.teachcloud.common.entity.TBTask;
 import com.qmth.teachcloud.common.enums.*;
 import com.qmth.teachcloud.common.service.CommonCacheService;
-import com.qmth.teachcloud.common.service.SysConfigService;
 import com.qmth.teachcloud.common.service.TBTaskService;
 import com.qmth.teachcloud.common.util.FileStoreUtil;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.scheduling.annotation.Async;
 
-import javax.annotation.Resource;
 import java.io.*;
-import java.nio.charset.StandardCharsets;
 import java.text.MessageFormat;
 import java.time.LocalDateTime;
 import java.util.Date;
@@ -97,15 +94,27 @@ public abstract class AsyncImportTaskTemplete {
         try {
             JSONObject jsonObject = JSONObject.parseObject(tbTask.getImportFilePath());
             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(dictionaryConfig.fssLocalFileDomain().getConfig()).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);
+                if (dictionaryConfig.sysDomain().isOss()) {
+                    jsonObject.put(SystemConstant.TYPE, SystemConstant.OSS);
+                } else {
+                    jsonObject.put(SystemConstant.TYPE, SystemConstant.LOCAL);
+                }
                 jsonObject.put(SystemConstant.PATH, stringJoiner.toString());
             }
             String path = (String) jsonObject.get(SystemConstant.PATH);
@@ -138,7 +147,7 @@ public abstract class AsyncImportTaskTemplete {
                 fileStoreUtil.ossUpload(stringJoiner.toString(), inputStream, DigestUtils.md5Hex(new ByteArrayInputStream(bookByteAry)), fileStoreUtil.getUploadEnumByPath(stringJoiner.toString()).getFssType());
             } else {//上传至服务器
                 FileStoreUtil fileStoreUtil = SpringContextHolder.getBean(FileStoreUtil.class);
-                fileStoreUtil.copyInputStreamToFile(inputStream,new File(stringJoiner.toString()),DigestUtils.md5Hex(new ByteArrayInputStream(bookByteAry)),LocalCatalogEnum.LOCAL_FILE);
+                fileStoreUtil.copyInputStreamToFile(inputStream, new File(stringJoiner.toString()), DigestUtils.md5Hex(new ByteArrayInputStream(bookByteAry)), LocalCatalogEnum.LOCAL_FILE);
             }
             JSONObject json = new JSONObject();
             json.put(SystemConstant.PATH, stringJoiner.toString());