Эх сурвалжийг харах

排序,文件本地上传

Gaokun Wang 7 сар өмнө
parent
commit
b3f44fb57b

+ 1 - 0
als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/DataImportServiceImpl.java

@@ -80,6 +80,7 @@ public class DataImportServiceImpl extends BaseServiceImpl<DataImportMapper, Dat
             (dataImportBo.getFlightDate()));
         queryWrapper.and(DATA_IMPORT.STATUS.eq
             (dataImportBo.getStatus()));
+        queryWrapper.orderBy(DATA_IMPORT.CREATE_TIME.desc());
 
         return queryWrapper;
     }

+ 1 - 1
als-modules/agile-assurance/src/main/java/org/eco/als/utils/CsvUtils.java

@@ -115,7 +115,7 @@ public class CsvUtils {
      * @param path path
      */
     public static JSONArray fileCsvToJson(String path) {
-        String csvFilePath = EcoConfig.getUploadPath() + path;
+        String csvFilePath = EcoConfig.getProfile() + path;
         List<CsvRow> rows = getCsvRowList(csvFilePath);
         // 获取CSV表头,即第一行数据
         assert rows != null;

+ 19 - 3
als-modules/system/src/main/java/org/eco/system/service/impl/SysOssServiceImpl.java

@@ -193,8 +193,25 @@ public class SysOssServiceImpl extends BaseServiceImpl<SysOssMapper, SysOss> imp
         String suffix = StringUtils.substring(name, name.lastIndexOf("."), name.length());
         OssClient storage = OssFactory.instance();
         UploadResult uploadResult;
-        // TODO local情况处理 异步
-        uploadResult = storage.uploadSuffix(file, suffix);
+        File tempFile = null;
+        try {
+            tempFile = File.createTempFile(name, suffix);
+            if (StrUtil.equals(storage.getConfigKey(), "local")) {
+                Map<String, String> map = commonService.uploadFile(FileUtils.fileToMultipartFile(tempFile));
+                uploadResult = UploadResult.builder().url(map.get("url")).filename(map.get("fileName")).build();
+            } else {
+                uploadResult = storage.uploadSuffix(file, suffix);
+            }
+        } catch (IOException e) {
+            throw new BusinessException(e.getMessage());
+        } finally {
+            // 删除临时文件(可选)
+            if (tempFile != null) {
+                FileUtil.del(tempFile);
+            }
+        }
+
+
         SysOssVo ossVo = buildResultEntity(name, suffix, storage.getConfigKey(), uploadResult);
         return UploadRes.builder().name(name).url(uploadResult.getUrl()).ossId(ossVo.getOssId()).build();
     }
@@ -208,7 +225,6 @@ public class SysOssServiceImpl extends BaseServiceImpl<SysOssMapper, SysOss> imp
         UploadResult uploadResult;
         try {
             if (StrUtil.equals(storage.getConfigKey(), "local")) {
-
                 Map<String, String> map = commonService.uploadFile(FileUtils.fileToMultipartFile(file));
                 uploadResult = UploadResult.builder().url(map.get("url")).filename(map.get("fileName")).build();
             } else {