Merge remote-tracking branch 'origin/dev_v3.1.0' into dev_v3.1.0

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/service/impl/TaskLogicServiceImpl.java

@@ -650,10 +650,15 @@ public class TaskLogicServiceImpl implements TaskLogicService {
 
         String dirName = stringJoiner.toString().replaceAll("\\\\", "/");
 
-//        ossUtil.ossUpload(dirName, in, null);
-        fileStoreUtil.ossUpload(dirName, in, DigestUtils.md5Hex(new ByteArrayInputStream(outputStream.toByteArray())), fileStoreUtil.getUploadEnumByPath(dirName).getFssType());
-        jsonObject.put(SystemConstant.TYPE, SystemConstant.OSS);
-        jsonObject.put(SystemConstant.PATH, dirName);
+        boolean oss = (boolean) map.get(SystemConstant.OSS);
+        if (oss) {//上传至oss
+            fileStoreUtil.ossUpload(dirName, in, DigestUtils.md5Hex(new ByteArrayInputStream(outputStream.toByteArray())), fileStoreUtil.getUploadEnumByPath(dirName).getFssType());
+            jsonObject.put(SystemConstant.TYPE, SystemConstant.OSS);
+            jsonObject.put(SystemConstant.PATH, dirName);
+        } else {
+            jsonObject.put(SystemConstant.TYPE, SystemConstant.LOCAL);
+            jsonObject.put(SystemConstant.PATH, stringJoiner + dirName);
+        }
         jsonObject.put(SystemConstant.UPLOAD_TYPE, UploadFileEnum.FILE);
         map.put(SystemConstant.PATH, jsonObject.toString());
         map.put(SystemConstant.DATA_COUNT, examinationExportDtoList.size());
@@ -930,10 +935,15 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                     }
                     FileUtil.doZip(zipFile, sourceFiles);
                     String ossDirName = dirName.toString().replaceAll("\\\\", "/");
-                    fileStoreUtil.ossUpload(ossDirName, zipFile, BinaryUtil.toBase64String(HexUtils.decodeHex(DigestUtils.md5Hex(new FileInputStream(zipFile)))), fileStoreUtil.getUploadEnumByPath(ossDirName).getFssType());
                     JSONObject jsonObject = new JSONObject();
-                    jsonObject.put(SystemConstant.PATH, ossDirName);
-                    jsonObject.put(SystemConstant.TYPE, SystemConstant.OSS);
+                    if (oss) {//上传至oss
+                        fileStoreUtil.ossUpload(ossDirName, zipFile, BinaryUtil.toBase64String(HexUtils.decodeHex(DigestUtils.md5Hex(new FileInputStream(zipFile)))), fileStoreUtil.getUploadEnumByPath(ossDirName).getFssType());
+                        jsonObject.put(SystemConstant.PATH, ossDirName);
+                        jsonObject.put(SystemConstant.TYPE, SystemConstant.OSS);
+                    } else {
+                        jsonObject.put(SystemConstant.TYPE, SystemConstant.LOCAL);
+                        jsonObject.put(SystemConstant.PATH, stringJoiner + ossDirName);
+                    }
                     jsonObject.put(SystemConstant.UPLOAD_TYPE, UploadFileEnum.FILE);
                     tbTask.setResultFilePath(jsonObject.toJSONString());
                     if (Objects.nonNull(dictionaryConfig.sysDomain()) && dictionaryConfig.sysDomain().isOss()) {
@@ -1092,11 +1102,15 @@ public class TaskLogicServiceImpl implements TaskLogicService {
             count++;
         }
         ZipUtil.zip(zipLocalRootPath, zipFile.getPath(), false);
-//        ossUtil.ossUpload(dirNameTmp, zipFile, BinaryUtil.toBase64String(HexUtils.decodeHex(DigestUtils.md5Hex(new FileInputStream(zipFile)))));
-        fileStoreUtil.ossUpload(dirNameTmp, zipFile, BinaryUtil.toBase64String(HexUtils.decodeHex(DigestUtils.md5Hex(new FileInputStream(zipFile)))), fileStoreUtil.getUploadEnumByPath(dirNameTmp).getFssType());
         JSONObject jsonObject = new JSONObject();
-        jsonObject.put(SystemConstant.PATH, dirNameTmp);
-        jsonObject.put(SystemConstant.TYPE, SystemConstant.OSS);
+        if (oss) {//上传至oss
+            fileStoreUtil.ossUpload(dirNameTmp, zipFile, BinaryUtil.toBase64String(HexUtils.decodeHex(DigestUtils.md5Hex(new FileInputStream(zipFile)))), fileStoreUtil.getUploadEnumByPath(dirNameTmp).getFssType());
+            jsonObject.put(SystemConstant.PATH, dirNameTmp);
+            jsonObject.put(SystemConstant.TYPE, SystemConstant.OSS);
+        } else {
+            jsonObject.put(SystemConstant.TYPE, SystemConstant.LOCAL);
+            jsonObject.put(SystemConstant.PATH, zipJoiner + dirNameTmp);
+        }
         jsonObject.put(SystemConstant.UPLOAD_TYPE, UploadFileEnum.FILE);
         tbTask.setResultFilePath(jsonObject.toJSONString());
         ConvertUtil.delFolder(zipLocalRootPath);
@@ -1202,10 +1216,15 @@ public class TaskLogicServiceImpl implements TaskLogicService {
         }
 
         ZipUtil.zip(zipLocalRootPath, zipFile.getPath(), false);
-        fileStoreUtil.ossUpload(dirNameTmp, zipFile, BinaryUtil.toBase64String(HexUtils.decodeHex(DigestUtils.md5Hex(new FileInputStream(zipFile)))), fileStoreUtil.getUploadEnumByPath(dirNameTmp).getFssType());
         JSONObject jsonObject = new JSONObject();
-        jsonObject.put(SystemConstant.PATH, dirNameTmp);
-        jsonObject.put(SystemConstant.TYPE, SystemConstant.OSS);
+        if (oss) {//上传至oss
+            fileStoreUtil.ossUpload(dirNameTmp, zipFile, BinaryUtil.toBase64String(HexUtils.decodeHex(DigestUtils.md5Hex(new FileInputStream(zipFile)))), fileStoreUtil.getUploadEnumByPath(dirNameTmp).getFssType());
+            jsonObject.put(SystemConstant.PATH, dirNameTmp);
+            jsonObject.put(SystemConstant.TYPE, SystemConstant.OSS);
+        } else {
+            jsonObject.put(SystemConstant.TYPE, SystemConstant.LOCAL);
+            jsonObject.put(SystemConstant.PATH, zipJoiner + dirNameTmp);
+        }
         jsonObject.put(SystemConstant.UPLOAD_TYPE, UploadFileEnum.FILE);
         tbTask.setResultFilePath(jsonObject.toJSONString());
         ConvertUtil.delFolder(zipLocalRootPath);
@@ -1898,10 +1917,17 @@ public class TaskLogicServiceImpl implements TaskLogicService {
             count = count + courseCount;
         }
         ZipUtil.zip(zipLocalRootPath, zipFile.getPath(), false);
-        fileStoreUtil.ossUpload(dirNameTmp, zipFile, BinaryUtil.toBase64String(HexUtils.decodeHex(DigestUtils.md5Hex(new FileInputStream(zipFile)))), fileStoreUtil.getUploadEnumByPath(dirNameTmp).getFssType());
+
+        boolean oss = (boolean) map.get(SystemConstant.OSS);
         JSONObject jsonObject = new JSONObject();
-        jsonObject.put(SystemConstant.PATH, dirNameTmp);
-        jsonObject.put(SystemConstant.TYPE, SystemConstant.OSS);
+        if (oss) {//上传至oss
+            fileStoreUtil.ossUpload(dirNameTmp, zipFile, BinaryUtil.toBase64String(HexUtils.decodeHex(DigestUtils.md5Hex(new FileInputStream(zipFile)))), fileStoreUtil.getUploadEnumByPath(dirNameTmp).getFssType());
+            jsonObject.put(SystemConstant.PATH, dirNameTmp);
+            jsonObject.put(SystemConstant.TYPE, SystemConstant.OSS);
+        } else {
+            jsonObject.put(SystemConstant.TYPE, SystemConstant.LOCAL);
+            jsonObject.put(SystemConstant.PATH, zipJoiner.toString() + dirNameTmp.toString());
+        }
         jsonObject.put(SystemConstant.UPLOAD_TYPE, UploadFileEnum.FILE);
         tbTask.setResultFilePath(jsonObject.toJSONString());
         ConvertUtil.delFolder(zipLocalRootPath);