From d210287cc3db85c12896af2c21d1ce7e1418ae1f 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, 9 Apr 2024 10:24:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E7=89=88=E6=9C=AC=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=9F=A5=E8=AF=A2=E8=BF=94=E5=9B=9Epath,=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=8A=E4=BC=A0=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataset/DatasetVersionController.java | 2 +- .../model/ModelsVersionController.java | 2 +- .../service/DatasetVersionService.java | 2 +- .../service/ModelsVersionService.java | 2 +- .../service/impl/DatasetServiceImpl.java | 5 +++-- .../impl/DatasetVersionServiceImpl.java | 19 ++++++++++++++++-- .../service/impl/ModelsServiceImpl.java | 5 +++-- .../impl/ModelsVersionServiceImpl.java | 20 +++++++++++++++++-- 8 files changed, 45 insertions(+), 12 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetVersionController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetVersionController.java index 302859cc..b0c42144 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetVersionController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetVersionController.java @@ -66,7 +66,7 @@ public class DatasetVersionController extends BaseController { */ @GetMapping("/versions") @ApiOperation("通过数据集id和version查询版本文件列表") - public GenericsAjaxResult> queryByDatasetIdAndVersion(@RequestParam("dataset_id") Integer datasetId, + public GenericsAjaxResult> queryByDatasetIdAndVersion(@RequestParam("dataset_id") Integer datasetId, @RequestParam("version") String version) { return genericsSuccess(this.datasetVersionService.queryByDatasetIdAndVersion(datasetId, version)); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsVersionController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsVersionController.java index 0ce21801..c966e92c 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsVersionController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsVersionController.java @@ -64,7 +64,7 @@ public class ModelsVersionController extends BaseController { * @return 匹配的模型版本记录列表 */ @GetMapping("/versions") - public GenericsAjaxResult> queryByModelsIdAndVersion(@RequestParam("models_id") Integer modelsId, + public GenericsAjaxResult> queryByModelsIdAndVersion(@RequestParam("models_id") Integer modelsId, @RequestParam("version") String version) { return genericsSuccess(this.modelsVersionService.queryByModelsIdAndVersion(modelsId, version)); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/DatasetVersionService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/DatasetVersionService.java index e4747d90..5a184925 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/DatasetVersionService.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/DatasetVersionService.java @@ -66,7 +66,7 @@ public interface DatasetVersionService { DatasetVersion queryByDatasetVersion(DatasetVersion datasetVersion); - List queryByDatasetIdAndVersion(Integer datasetId, String version); + Map queryByDatasetIdAndVersion(Integer datasetId, String version); Map deleteDatasetVersion(Integer datasetId, String version); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ModelsVersionService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ModelsVersionService.java index 3051e460..6938da95 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ModelsVersionService.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ModelsVersionService.java @@ -66,7 +66,7 @@ public interface ModelsVersionService { ModelsVersion queryByModelsVersion(ModelsVersion modelsVersion); - List queryByModelsIdAndVersion(Integer modelsId, String version); + Map queryByModelsIdAndVersion(Integer modelsId, String version); Map deleteModelsVersion(Integer modelsId, String version); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java index ac86a3f4..9512d0e9 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java @@ -210,6 +210,9 @@ public class DatasetServiceImpl implements DatasetService { @Override public List> uploadDataset(MultipartFile[] files) throws Exception { List> results = new ArrayList<>(); + //时间戳统一定在外面，一次上传就定好 + Date createTime = new Date(); + String timestamp = new SimpleDateFormat("yyyyMMdd-HHmmss").format(createTime); for (MultipartFile file:files){ if (file.isEmpty()) { @@ -222,8 +225,6 @@ public class DatasetServiceImpl implements DatasetService { // 其余操作基于 modelsVersionToUse String username = SecurityUtils.getLoginUser().getUsername(); String fileName = file.getOriginalFilename(); - Date createTime = new Date(); - String timestamp = new SimpleDateFormat("yyyyMMdd-HHmmss").format(createTime); String objectName = "datasets/" + username + "/" + timestamp + "/" + fileName; // 上传文件到MinIO并将记录新增到数据库中 diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetVersionServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetVersionServiceImpl.java index da1e65ba..621262ad 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetVersionServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetVersionServiceImpl.java @@ -33,6 +33,9 @@ public class DatasetVersionServiceImpl implements DatasetVersionService { @Resource private DatasetVersionDao datasetVersionDao; + // 固定存储桶名 + private final String bucketName = "platform-data"; + /** * 通过ID查询单条数据 * @@ -131,9 +134,21 @@ public class DatasetVersionServiceImpl implements DatasetVersionService { } @Override + public Map queryByDatasetIdAndVersion(Integer datasetId, String version) { + Map response = new HashMap<>(); + + List datasetVersionList = this.datasetVersionDao.queryAllByDatasetVersion(datasetId, version); + datasetVersionList.stream(). + findFirst(). + ifPresent(datasetVersion -> { + String url = datasetVersion.getUrl(); + String path = bucketName + '/' + url.substring(0, url.lastIndexOf('/')); + response.put("path", path); + + }); - public List queryByDatasetIdAndVersion(Integer datasetId, String version) { - return this.datasetVersionDao.queryAllByDatasetVersion(datasetId, version); + response.put("content", datasetVersionList); + return response; } @Override 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 b84c43d4..58d3e1ee 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 @@ -205,6 +205,9 @@ public class ModelsServiceImpl implements ModelsService { public List> uploadModels(MultipartFile[] files) throws Exception { List> results = new ArrayList<>(); + //时间戳统一定在外面，一次上传就定好 + Date createTime = new Date(); + String timestamp = new SimpleDateFormat("yyyyMMdd-HHmmss").format(createTime); for (MultipartFile file:files){ if (file.isEmpty()) { @@ -217,8 +220,6 @@ public class ModelsServiceImpl implements ModelsService { // 其余操作基于 modelsVersionToUse String username = SecurityUtils.getLoginUser().getUsername(); String fileName = file.getOriginalFilename(); - Date createTime = new Date(); - String timestamp = new SimpleDateFormat("yyyyMMdd-HHmmss").format(createTime); String objectName = "models/" + username + "/" + timestamp + "/" + fileName; // 上传文件到MinIO并将记录新增到数据库中 diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsVersionServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsVersionServiceImpl.java index f1848a86..b060f467 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsVersionServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsVersionServiceImpl.java @@ -34,6 +34,9 @@ public class ModelsVersionServiceImpl implements ModelsVersionService { @Resource private ModelsDao modelsDao; + // 固定存储桶名 + private final String bucketName = "platform-data"; + /** * 通过ID查询单条数据 * @@ -159,8 +162,21 @@ public class ModelsVersionServiceImpl implements ModelsVersionService { * @return 新的模型版本记录列表 */ @Override - public List queryByModelsIdAndVersion(Integer modelsId, String version) { - return this.modelsVersionDao.queryAllByModelsVersion(modelsId, version) ; + public Map queryByModelsIdAndVersion(Integer modelsId, String version) { + Map response = new HashMap<>(); + + List modelsVersionList = this.modelsVersionDao.queryAllByModelsVersion(modelsId, version); + modelsVersionList.stream(). + findFirst(). + ifPresent(modelsVersion -> { + String url = modelsVersion.getUrl(); + String path = bucketName + '/' + url.substring(0, url.lastIndexOf('/')); + response.put("path", path); + + }); + + response.put("content", modelsVersionList); + return response; }