|
|
|
@@ -3,10 +3,12 @@ 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.ModelDependency; |
|
|
|
import com.ruoyi.platform.domain.Models; |
|
|
|
import com.ruoyi.platform.domain.ModelsVersion; |
|
|
|
import com.ruoyi.platform.mapper.ModelsDao; |
|
|
|
import com.ruoyi.platform.mapper.ModelsVersionDao; |
|
|
|
import com.ruoyi.platform.service.ModelDependencyService; |
|
|
|
import com.ruoyi.platform.service.ModelsVersionService; |
|
|
|
import com.ruoyi.system.api.model.LoginUser; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
@@ -36,7 +38,8 @@ public class ModelsVersionServiceImpl implements ModelsVersionService { |
|
|
|
|
|
|
|
@Resource |
|
|
|
private ModelsDao modelsDao; |
|
|
|
|
|
|
|
@Resource |
|
|
|
private ModelDependencyService modelDependencyService; |
|
|
|
// 固定存储桶名 |
|
|
|
@Value("${minio.dataReleaseBucketName}") |
|
|
|
private String bucketName; |
|
|
|
@@ -81,6 +84,7 @@ public class ModelsVersionServiceImpl implements ModelsVersionService { |
|
|
|
modelsVersion.setCreateTime(new Date()); |
|
|
|
modelsVersion.setState(1); |
|
|
|
this.modelsVersionDao.insert(modelsVersion); |
|
|
|
insertModelsDependency(modelsVersion); |
|
|
|
return modelsVersion; |
|
|
|
} |
|
|
|
|
|
|
|
@@ -209,6 +213,7 @@ public class ModelsVersionServiceImpl implements ModelsVersionService { |
|
|
|
// 遍历传入的 modelsVersions 列表 |
|
|
|
for(ModelsVersion modelsVersion : modelsVersions) { |
|
|
|
insertPrepare(modelsVersion); |
|
|
|
insertModelsDependency(modelsVersion); |
|
|
|
} |
|
|
|
this.modelsVersionDao.insertBatch(modelsVersions); |
|
|
|
return "新增模型版本成功"; |
|
|
|
@@ -248,4 +253,23 @@ public class ModelsVersionServiceImpl implements ModelsVersionService { |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
//新增模型依赖关系 |
|
|
|
private void insertModelsDependency(ModelsVersion modelsVersion) throws Exception { |
|
|
|
ModelDependency modelDependency = new ModelDependency(); |
|
|
|
modelDependency.setCurrentModelId(modelsVersion.getModelsId()); |
|
|
|
modelDependency.setVersion(modelsVersion.getVersion()); |
|
|
|
modelDependency.setState(2); |
|
|
|
List<ModelDependency> modelDependencyList = modelDependencyService.queryByModelDependency(modelDependency); |
|
|
|
if (modelDependencyList == null|| modelDependencyList.size()==0){ |
|
|
|
modelDependency.setState(1); |
|
|
|
modelDependencyService.insert(modelDependency); |
|
|
|
}else { |
|
|
|
|
|
|
|
//查到2,说明是之前流水线推送的,你就直接该状态生效就完了 |
|
|
|
ModelDependency modelDependency1 = modelDependencyList.get(0); |
|
|
|
modelDependency1.setState(1); |
|
|
|
modelDependencyService.update(modelDependency1); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |