From 1f46b43bdfdd80fdbbc8dcca9db4ffe492602103 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A5=BF=E5=A4=A7=E9=94=90?= <1070211640@qq.com> Date: Tue, 19 Mar 2024 16:14:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E4=B8=8A=E4=BC=A0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/platform/controller/dataset/DatasetController.java | 2 +- .../ruoyi/platform/controller/model/ModelsController.java | 5 +++-- .../main/java/com/ruoyi/platform/service/DatasetService.java | 2 +- .../com/ruoyi/platform/service/impl/ModelsServiceImpl.java | 2 -- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetController.java index 4b1ecf3b..001a5688 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetController.java @@ -161,7 +161,7 @@ public class DatasetController { @GetMapping("/download/{dataset_version_id}") @ApiOperation(value = "下载数据集", notes = "根据数据集版本表id下载数据集文件") - public ResponseEntity downloadDataset(@PathVariable("dataset_version_id") Integer dataset_version_id) { + public ResponseEntity downloadDataset(@PathVariable("dataset_version_id") Integer dataset_version_id) throws Exception { return datasetService.downloadDataset(dataset_version_id); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java index aba4c8ad..8b9f51e0 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java @@ -161,13 +161,14 @@ public class ModelsController { * * * @param files 文件 - * @param modelsId 模型表主键 +// * @param modelsId 模型表主键 * @return 上传结果 */ + @CrossOrigin(origins = "*", allowedHeaders = "*") @PostMapping("/upload") @ApiOperation(value = "上传模型", notes = "根据模型id上传模型文件，并将信息存入数据库。") - public AjaxResult uploadModels(@RequestParam("file") MultipartFile[] files, @RequestParam("models_id") Integer modelsId) throws Exception { + public AjaxResult uploadModels(@RequestParam("file") MultipartFile[] files) throws Exception { return AjaxResult.success(this.modelsService.uploadModels(files)); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/DatasetService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/DatasetService.java index 8a25fd7f..f6585847 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/DatasetService.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/DatasetService.java @@ -70,7 +70,7 @@ DatasetService { String removeById(Integer id); - ResponseEntity downloadDataset(Integer id); + ResponseEntity downloadDataset(Integer id) throws Exception; List> uploadDataset(MultipartFile[] files) throws Exception; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java index bb8a7126..d3be95e9 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java @@ -215,8 +215,6 @@ public class ModelsServiceImpl implements ModelsService { List> results = new ArrayList<>(); - - for (MultipartFile file:files){ if (file.isEmpty()) { throw new Exception("文件为空，无法上传");