新增name
This commit is contained in:
parent
ae13606635
commit
f65f8849a4
|
@ -2,9 +2,11 @@ package com.ruoyi.platform.service.impl;
|
||||||
|
|
||||||
import com.ruoyi.common.security.utils.SecurityUtils;
|
import com.ruoyi.common.security.utils.SecurityUtils;
|
||||||
import com.ruoyi.platform.domain.ModelDependency;
|
import com.ruoyi.platform.domain.ModelDependency;
|
||||||
|
import com.ruoyi.platform.domain.Models;
|
||||||
import com.ruoyi.platform.domain.ModelsVersion;
|
import com.ruoyi.platform.domain.ModelsVersion;
|
||||||
import com.ruoyi.platform.mapper.ModelDependencyDao;
|
import com.ruoyi.platform.mapper.ModelDependencyDao;
|
||||||
import com.ruoyi.platform.service.ModelDependencyService;
|
import com.ruoyi.platform.service.ModelDependencyService;
|
||||||
|
import com.ruoyi.platform.service.ModelsService;
|
||||||
import com.ruoyi.platform.utils.JacksonUtil;
|
import com.ruoyi.platform.utils.JacksonUtil;
|
||||||
import com.ruoyi.platform.vo.ModelDependcyTreeVo;
|
import com.ruoyi.platform.vo.ModelDependcyTreeVo;
|
||||||
import com.ruoyi.system.api.model.LoginUser;
|
import com.ruoyi.system.api.model.LoginUser;
|
||||||
|
@ -19,6 +21,7 @@ import java.util.ArrayList;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* (ModelDependency)表服务实现类
|
* (ModelDependency)表服务实现类
|
||||||
|
@ -31,6 +34,8 @@ public class ModelDependencyServiceImpl implements ModelDependencyService {
|
||||||
@Resource
|
@Resource
|
||||||
private ModelDependencyDao modelDependencyDao;
|
private ModelDependencyDao modelDependencyDao;
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private ModelsService modelsService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 通过ID查询单条数据
|
* 通过ID查询单条数据
|
||||||
|
@ -98,10 +103,12 @@ public class ModelDependencyServiceImpl implements ModelDependencyService {
|
||||||
ModelDependency modelDependencyQuery = new ModelDependency();
|
ModelDependency modelDependencyQuery = new ModelDependency();
|
||||||
modelDependencyQuery.setVersion(version);
|
modelDependencyQuery.setVersion(version);
|
||||||
modelDependencyQuery.setCurrentModelId(model_id);
|
modelDependencyQuery.setCurrentModelId(model_id);
|
||||||
|
|
||||||
List<ModelDependency> modelDependencyList = modelDependencyDao.queryByModelDependency(modelDependencyQuery);
|
List<ModelDependency> modelDependencyList = modelDependencyDao.queryByModelDependency(modelDependencyQuery);
|
||||||
if (modelDependencyList!=null&&modelDependencyList.size()>=0){
|
if (modelDependencyList!=null&&modelDependencyList.size()>=0){
|
||||||
for (ModelDependency modelDependency:modelDependencyList){
|
for (ModelDependency modelDependency:modelDependencyList){
|
||||||
ModelDependcyTreeVo modelDependcyTreeVoIn = ModelDependencyConvertToTree(modelDependency);
|
ModelDependcyTreeVo modelDependcyTreeVoIn = ModelDependencyConvertToTree(modelDependency);
|
||||||
|
modelDependcyTreeVoIn.setCurrentModelName((String) parent.get("model_name"));
|
||||||
processParentModel(modelDependcyTreeVoIn);
|
processParentModel(modelDependcyTreeVoIn);
|
||||||
ps.add(modelDependcyTreeVoIn);
|
ps.add(modelDependcyTreeVoIn);
|
||||||
}
|
}
|
||||||
|
@ -140,6 +147,10 @@ public class ModelDependencyServiceImpl implements ModelDependencyService {
|
||||||
modelDependcyTreeVo.setTestDataset(JacksonUtil.parseJSONStr2MapList(modelDependency.getTestDataset()));
|
modelDependcyTreeVo.setTestDataset(JacksonUtil.parseJSONStr2MapList(modelDependency.getTestDataset()));
|
||||||
modelDependcyTreeVo.setProjectDependency(JacksonUtil.parseJSONStr2Map(modelDependency.getProjectDependency()));
|
modelDependcyTreeVo.setProjectDependency(JacksonUtil.parseJSONStr2Map(modelDependency.getProjectDependency()));
|
||||||
modelDependcyTreeVo.setParentModelsMap(JacksonUtil.parseJSONStr2MapList(modelDependency.getParentModels()));
|
modelDependcyTreeVo.setParentModelsMap(JacksonUtil.parseJSONStr2MapList(modelDependency.getParentModels()));
|
||||||
|
Models models = modelsService.queryById(modelDependency.getCurrentModelId());
|
||||||
|
if (models!=null) {
|
||||||
|
modelDependcyTreeVo.setCurrentModelName(models.getName());
|
||||||
|
}
|
||||||
return modelDependcyTreeVo;
|
return modelDependcyTreeVo;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -13,6 +13,7 @@ import com.ruoyi.platform.service.ModelsVersionService;
|
||||||
import com.ruoyi.system.api.model.LoginUser;
|
import com.ruoyi.system.api.model.LoginUser;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
|
import org.springframework.context.annotation.Lazy;
|
||||||
import org.springframework.data.domain.Page;
|
import org.springframework.data.domain.Page;
|
||||||
import org.springframework.data.domain.PageImpl;
|
import org.springframework.data.domain.PageImpl;
|
||||||
import org.springframework.data.domain.PageRequest;
|
import org.springframework.data.domain.PageRequest;
|
||||||
|
@ -39,6 +40,7 @@ public class ModelsVersionServiceImpl implements ModelsVersionService {
|
||||||
@Resource
|
@Resource
|
||||||
private ModelsDao modelsDao;
|
private ModelsDao modelsDao;
|
||||||
@Resource
|
@Resource
|
||||||
|
@Lazy
|
||||||
private ModelDependencyService modelDependencyService;
|
private ModelDependencyService modelDependencyService;
|
||||||
// 固定存储桶名
|
// 固定存储桶名
|
||||||
@Value("${minio.dataReleaseBucketName}")
|
@Value("${minio.dataReleaseBucketName}")
|
||||||
|
|
|
@ -56,4 +56,6 @@ public class ModelDependcyTreeVo {
|
||||||
* 子模型
|
* 子模型
|
||||||
*/
|
*/
|
||||||
private List<ModelDependcyTreeVo> childrenModels;
|
private List<ModelDependcyTreeVo> childrenModels;
|
||||||
|
|
||||||
|
private String currentModelName;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue