From ae0b5b05bf676198b93c9a3f9a5de12cd31577a0 Mon Sep 17 00:00:00 2001
From: fanshuai <1141904845@qq.com>
Date: Mon, 3 Jun 2024 11:25:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BE=9D=E8=B5=96=E5=85=B3?=
 =?UTF-8?q?=E7=B3=BB=E5=9B=BE=E8=B0=B1~?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ModelDependencyServiceImpl.java      |  1 +
 .../impl/ModelsVersionServiceImpl.java        | 26 ++++++++++++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

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 d3f62d35..1ba0995e 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
@@ -70,6 +70,7 @@ public class ModelDependencyServiceImpl implements ModelDependencyService {
     @Override
     public ModelDependcyTreeVo getModelDependencyTree(ModelDependency modelDependencyQuery) throws Exception {
         //查询当前模型
+        modelDependencyQuery.setState(1);
         List<ModelDependency> modelDependencyList = modelDependencyDao.queryByModelDependency(modelDependencyQuery);
         if (modelDependencyList==null||modelDependencyList.size()==0){
             throw new Exception("当前模型依赖关系不存在");
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 be20b969..ba0b3433 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
@@ -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);
+        }
+    }
+
 }