From f65f8849a4c18362f56d5353e8952000188d03a8 Mon Sep 17 00:00:00 2001 From: fanshuai <1141904845@qq.com> Date: Tue, 4 Jun 2024 08:50:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Ename?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ModelDependencyServiceImpl.java | 11 +++++++++++ .../service/impl/ModelsVersionServiceImpl.java | 2 ++ .../com/ruoyi/platform/vo/ModelDependcyTreeVo.java | 2 ++ 3 files changed, 15 insertions(+) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelDependencyServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelDependencyServiceImpl.java index 1ba0995..bb48607 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelDependencyServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelDependencyServiceImpl.java @@ -2,9 +2,11 @@ package com.ruoyi.platform.service.impl; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.platform.domain.ModelDependency; +import com.ruoyi.platform.domain.Models; import com.ruoyi.platform.domain.ModelsVersion; import com.ruoyi.platform.mapper.ModelDependencyDao; import com.ruoyi.platform.service.ModelDependencyService; +import com.ruoyi.platform.service.ModelsService; import com.ruoyi.platform.utils.JacksonUtil; import com.ruoyi.platform.vo.ModelDependcyTreeVo; import com.ruoyi.system.api.model.LoginUser; @@ -19,6 +21,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * (ModelDependency)表服务实现类 @@ -31,6 +34,8 @@ public class ModelDependencyServiceImpl implements ModelDependencyService { @Resource private ModelDependencyDao modelDependencyDao; + @Resource + private ModelsService modelsService; /** * 通过ID查询单条数据 @@ -98,10 +103,12 @@ public class ModelDependencyServiceImpl implements ModelDependencyService { ModelDependency modelDependencyQuery = new ModelDependency(); modelDependencyQuery.setVersion(version); modelDependencyQuery.setCurrentModelId(model_id); + List modelDependencyList = modelDependencyDao.queryByModelDependency(modelDependencyQuery); if (modelDependencyList!=null&&modelDependencyList.size()>=0){ for (ModelDependency modelDependency:modelDependencyList){ ModelDependcyTreeVo modelDependcyTreeVoIn = ModelDependencyConvertToTree(modelDependency); + modelDependcyTreeVoIn.setCurrentModelName((String) parent.get("model_name")); processParentModel(modelDependcyTreeVoIn); ps.add(modelDependcyTreeVoIn); } @@ -140,6 +147,10 @@ public class ModelDependencyServiceImpl implements ModelDependencyService { modelDependcyTreeVo.setTestDataset(JacksonUtil.parseJSONStr2MapList(modelDependency.getTestDataset())); modelDependcyTreeVo.setProjectDependency(JacksonUtil.parseJSONStr2Map(modelDependency.getProjectDependency())); modelDependcyTreeVo.setParentModelsMap(JacksonUtil.parseJSONStr2MapList(modelDependency.getParentModels())); + Models models = modelsService.queryById(modelDependency.getCurrentModelId()); + if (models!=null) { + modelDependcyTreeVo.setCurrentModelName(models.getName()); + } return modelDependcyTreeVo; } 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 07ce624..cfa793c 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 @@ -13,6 +13,7 @@ import com.ruoyi.platform.service.ModelsVersionService; import com.ruoyi.system.api.model.LoginUser; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Lazy; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageRequest; @@ -39,6 +40,7 @@ public class ModelsVersionServiceImpl implements ModelsVersionService { @Resource private ModelsDao modelsDao; @Resource + @Lazy private ModelDependencyService modelDependencyService; // 固定存储桶名 @Value("${minio.dataReleaseBucketName}") diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/ModelDependcyTreeVo.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/ModelDependcyTreeVo.java index 65a3cc2..5814ffc 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/ModelDependcyTreeVo.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/ModelDependcyTreeVo.java @@ -56,4 +56,6 @@ public class ModelDependcyTreeVo { * 子模型 */ private List childrenModels; + + private String currentModelName; }