From 12331888969dfaa1e728b9504d7d209ea10a798a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A5=BF=E5=A4=A7=E9=94=90?= <1070211640@qq.com> Date: Thu, 9 May 2024 16:40:56 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/service/impl/DatasetServiceImpl.java | 2 ++ .../service/impl/DatasetVersionServiceImpl.java | 10 ++++++++++ .../service/impl/ModelsVersionServiceImpl.java | 9 ++++++++- .../mapper/managementPlatform/ModelsDaoMapper.xml | 1 + .../ruoyi/file/service/LocalSysFileServiceImpl.java | 2 +- .../ruoyi/file/service/MinioSysFileServiceImpl.java | 4 ++++ 6 files changed, 26 insertions(+), 2 deletions(-) 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 25d2e7c0..0a57ae2d 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 @@ -105,6 +105,8 @@ public class DatasetServiceImpl implements DatasetService { } } return dataset; + + } /** 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 68d85837..80e80a82 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 @@ -99,6 +99,11 @@ public class DatasetVersionServiceImpl implements DatasetVersionService { datasetVersion.setUpdateBy(loginUser.getUsername()); datasetVersion.setUpdateTime(new Date()); this.datasetVersionDao.update(datasetVersion); + //插入时需要更新对应的数据集更新时间 + Integer datasetId = datasetVersion.getDatasetId(); + Dataset dataset = this.datasetDao.queryById(datasetId); + dataset.setUpdateTime(new Date()); + this.datasetDao.update(dataset); return this.queryById(datasetVersion.getId()); } @@ -240,5 +245,10 @@ public class DatasetVersionServiceImpl implements DatasetVersionService { datasetVersion.setUpdateTime(new Date()); datasetVersion.setCreateTime(new Date()); datasetVersion.setState(1); + //插入时需要更新对应的数据集更新时间 + Integer datasetId = datasetVersion.getDatasetId(); + Dataset dataset = this.datasetDao.queryById(datasetId); + dataset.setUpdateTime(new Date()); + this.datasetDao.update(dataset); } } 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 5f289458..1c9a3b35 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 @@ -2,6 +2,8 @@ package com.ruoyi.platform.service.impl; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.platform.annotations.CheckDuplicate; +import com.ruoyi.platform.domain.Dataset; +import com.ruoyi.platform.domain.Models; import com.ruoyi.platform.domain.ModelsVersion; import com.ruoyi.platform.mapper.ModelsDao; import com.ruoyi.platform.mapper.ModelsVersionDao; @@ -157,7 +159,7 @@ public class ModelsVersionServiceImpl implements ModelsVersionService { /** - * 复制模型版本 + * 根据版本id和version查询 * * @param modelsId 模型的id * @param version 模型版本号 @@ -233,6 +235,11 @@ public class ModelsVersionServiceImpl implements ModelsVersionService { modelsVersion.setUpdateTime(new Date()); modelsVersion.setCreateTime(new Date()); modelsVersion.setState(1); + //插入时需要更新对应的模型更新时间 + Integer modelsId = modelsVersion.getModelsId(); + Models models = this.modelsDao.queryById(modelsId); + models.setUpdateTime(new Date()); + this.modelsDao.update(models); } diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelsDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelsDaoMapper.xml index 9e1fd6ff..07a92767 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelsDaoMapper.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelsDaoMapper.xml @@ -30,6 +30,7 @@ id, name, description,available_range, model_type,model_tag, create_by, create_time, update_by, update_time, state from models where name = #{name} and state = 1 limit 1 + diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java index 3247e9bc..b8b38d6e 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java @@ -11,7 +11,7 @@ import com.ruoyi.file.utils.FileUploadUtils; * * @author ruoyi */ -@Primary + @Service public class LocalSysFileServiceImpl implements ISysFileService { diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java index f53d86f9..bff39c43 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java @@ -2,6 +2,7 @@ package com.ruoyi.file.service; import java.io.InputStream; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; import com.alibaba.nacos.common.utils.IoUtils; @@ -15,6 +16,7 @@ import io.minio.PutObjectArgs; * * @author ruoyi */ +@Primary @Service public class MinioSysFileServiceImpl implements ISysFileService { @@ -31,6 +33,8 @@ public class MinioSysFileServiceImpl implements ISysFileService * @return 访问地址 * @throws Exception */ + + @Override public String uploadFile(MultipartFile file) throws Exception { From 1cbbbd2685d6a3f0a205ffb42af21577b590ad93 Mon Sep 17 00:00:00 2001 From: fanshuai <1141904845@qq.com> Date: Thu, 9 May 2024 16:54:43 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BB=A3=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/service/impl/DatasetVersionServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 80e80a82..1e0738cc 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 @@ -45,6 +45,9 @@ public class DatasetVersionServiceImpl implements DatasetVersionService { private String bucketName; @Resource private MinioService minioService; + // 固定存储桶名 + @Value("${labelStudio.loaclUrl}") + private String labelloaclUrl; /** * 通过ID查询单条数据 * @@ -218,7 +221,7 @@ public class DatasetVersionServiceImpl implements DatasetVersionService { // 获取label-studio数据流 Map headers = new HashMap(); headers.put("Authorization","Token "+labelDatasetVersionVo.getToken()); - InputStream inputStream = HttpUtils.getIntputStream("http://127.0.0.1:8080/api/projects/"+labelDatasetVersionVo.getProject_id()+"/export?exportType="+labelDatasetVersionVo.getExportType(), headers); + InputStream inputStream = HttpUtils.getIntputStream(labelloaclUrl+"/api/projects/"+labelDatasetVersionVo.getProject_id()+"/export?exportType="+labelDatasetVersionVo.getExportType(), headers); // 构建objectName String username = SecurityUtils.getLoginUser().getUsername(); String url = username + "/" + DateUtils.dateTimeNow() + "/" + dataset.getName()+"_"+labelDatasetVersionVo.getVersion()+"."+labelDatasetVersionVo.getExportType(); From 1ff908506257b813818edafaf8d823e2a6b7be6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A5=BF=E5=A4=A7=E9=94=90?= <1070211640@qq.com> Date: Sat, 11 May 2024 15:08:00 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=20=E6=A8=A1=E5=9E=8Bbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/controller/model/ModelsController.java | 3 +++ .../main/java/com/ruoyi/platform/domain/Models.java | 2 +- .../java/com/ruoyi/platform/domain/ModelsVersion.java | 4 ++-- .../platform/service/impl/DatasetServiceImpl.java | 2 +- .../service/impl/DatasetVersionServiceImpl.java | 7 ++++++- .../service/impl/ModelsVersionServiceImpl.java | 11 ++++++++--- 6 files changed, 21 insertions(+), 8 deletions(-) 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 210aefc4..ed50963c 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 @@ -139,6 +139,9 @@ public class ModelsController extends BaseController { public GenericsAjaxResult addModelAndVersion(@RequestBody ModelsVo modelsVo) throws Exception { return genericsSuccess(this.modelsService.insertModelAndVersion(modelsVo)); + + + } /** diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Models.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Models.java index f00f189d..449ae7f0 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Models.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Models.java @@ -32,7 +32,7 @@ public class Models implements Serializable { @ApiModelProperty(value = "模型可见范围，1表示公开，0表示私有") private int availableRange; - @ApiModelProperty(value = "模型类型") + @ApiModelProperty(value = "模型类型(模型框架)") private String modelType; @ApiModelProperty(value = "模型标签") diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelsVersion.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelsVersion.java index 8c54673a..b75dfbb7 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelsVersion.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelsVersion.java @@ -22,8 +22,8 @@ public class ModelsVersion implements Serializable { /** * 主键 */ -@ApiModelProperty(value = "ID") -private Integer id; + @ApiModelProperty(value = "ID") + private Integer id; @ApiModelProperty(value = "模型ID") private Integer modelsId; 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 0a57ae2d..3e4f277b 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 @@ -328,7 +328,7 @@ public class DatasetServiceImpl implements DatasetService { throw new Exception("新增数据集失败"); } - for (VersionVo datasetVersionVo :datasetVersionVos){ + for (VersionVo datasetVersionVo : datasetVersionVos){ DatasetVersion datasetVersion = new DatasetVersion(); datasetVersion.setDatasetId(datasetInsert.getId()); datasetVersion.setVersion(datasetVo.getVersion()); 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 80e80a82..6a794238 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 @@ -78,7 +78,12 @@ public class DatasetVersionServiceImpl implements DatasetVersionService { @Override public DatasetVersion insert(DatasetVersion datasetVersion) throws Exception { //插入预备 - insertPrepare(datasetVersion); + LoginUser loginUser = SecurityUtils.getLoginUser(); + datasetVersion.setCreateBy(loginUser.getUsername()); + datasetVersion.setUpdateBy(loginUser.getUsername()); + datasetVersion.setUpdateTime(new Date()); + datasetVersion.setCreateTime(new Date()); + datasetVersion.setState(1); this.datasetVersionDao.insert(datasetVersion); return datasetVersion; } 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 1c9a3b35..be20b969 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 @@ -73,8 +73,13 @@ public class ModelsVersionServiceImpl implements ModelsVersionService { */ @Override public ModelsVersion insert(ModelsVersion modelsVersion) throws Exception { - //插入预备 - insertPrepare(modelsVersion); + //插入预备，此时不需要判断版本重复 + LoginUser loginUser = SecurityUtils.getLoginUser(); + modelsVersion.setCreateBy(loginUser.getUsername()); + modelsVersion.setUpdateBy(loginUser.getUsername()); + modelsVersion.setUpdateTime(new Date()); + modelsVersion.setCreateTime(new Date()); + modelsVersion.setState(1); this.modelsVersionDao.insert(modelsVersion); return modelsVersion; } @@ -201,7 +206,7 @@ public class ModelsVersionServiceImpl implements ModelsVersionService { @Override public String addModelVersions(List modelsVersions) throws Exception { try { - // 遍历传入的 datasetVersions 列表 + // 遍历传入的 modelsVersions 列表 for(ModelsVersion modelsVersion : modelsVersions) { insertPrepare(modelsVersion); }