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 {