diff --git a/ccdi-project/src/main/java/com/ruoyi/ccdi/project/mapper/CcdiFileUploadRecordMapper.java b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/mapper/CcdiFileUploadRecordMapper.java index 00a554f..abd4a24 100644 --- a/ccdi-project/src/main/java/com/ruoyi/ccdi/project/mapper/CcdiFileUploadRecordMapper.java +++ b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/mapper/CcdiFileUploadRecordMapper.java @@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * 文件上传记录 Mapper 接口 @@ -30,5 +31,5 @@ public interface CcdiFileUploadRecordMapper extends BaseMapper> countByStatus(@Param("projectId") Long projectId); + List> countByStatus(@Param("projectId") Long projectId); } diff --git a/ccdi-project/src/main/java/com/ruoyi/ccdi/project/service/impl/CcdiFileUploadServiceImpl.java b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/service/impl/CcdiFileUploadServiceImpl.java index fdb7f1d..c911c83 100644 --- a/ccdi-project/src/main/java/com/ruoyi/ccdi/project/service/impl/CcdiFileUploadServiceImpl.java +++ b/ccdi-project/src/main/java/com/ruoyi/ccdi/project/service/impl/CcdiFileUploadServiceImpl.java @@ -27,14 +27,10 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.StandardCopyOption; -import java.util.List; -import java.util.Map; -import java.util.concurrent.Executor; +import java.util.*; import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Executor; import java.util.concurrent.RejectedExecutionException; -import java.util.ArrayList; -import java.util.Date; -import java.util.UUID; /** * 文件上传服务实现 @@ -262,8 +258,7 @@ public class CcdiFileUploadServiceImpl implements ICcdiFileUploadService { try { // 尝试提交异步任务 CompletableFuture.runAsync( - () -> processFileAsync(projectId, lsfxProjectId, tempFilePath, - record.getId(), batchId, record), + () -> processFileAsync(projectId, lsfxProjectId, tempFilePath, record.getId(), batchId, record), fileUploadExecutor ); submitted = true; diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 2fade26..855ba8d 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -1,4 +1,9 @@ # 开发环境配置 +ruoyi: + # 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath) + profile: D:/ruoyi/uploadPath + + server: # 服务器的HTTP端口,默认为8080 port: 8080 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index ed021cb..104207f 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -6,8 +6,6 @@ ruoyi: version: 3.9.1 # 版权年份 copyrightYear: 2026 - # 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath) - profile: D:/ruoyi/uploadPath # 获取ip地址开关 addressEnabled: false # 验证码类型 math 数字计算 char 字符验证