From 7ac6a37a36c5e4aa3b59793c8f9b3a76365cc5a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A5=BF=E5=A4=A7=E9=94=90?= <1070211640@qq.com>
Date: Thu, 30 May 2024 11:24:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E4=BE=9D=E8=B5=96=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/domain/ModelDependency.java      | 12 +++----
 .../ModelDependencyDaoMapper.xml              | 32 +++++++++----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelDependency.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelDependency.java
index 45c28ca5..94798fcb 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelDependency.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelDependency.java
@@ -24,9 +24,9 @@ public class ModelDependency implements Serializable {
      */
     private Integer currentModelId;
 /**
-     * 父模型id
+     * 父模型
      */
-    private Integer parentModelId;
+    private String parentModels;
 /**
      * 引用项目
      */
@@ -88,12 +88,12 @@ public class ModelDependency implements Serializable {
         this.currentModelId = currentModelId;
     }
 
-    public Integer getParentModelId() {
-        return parentModelId;
+    public String getParentModels() {
+        return parentModels;
     }
 
-    public void setParentModelId(Integer parentModelId) {
-        this.parentModelId = parentModelId;
+    public void setParentModels(String parentModels) {
+        this.parentModels = parentModels;
     }
 
     public String getRefItem() {
diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelDependencyDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelDependencyDaoMapper.xml
index b3b3b53b..250a0f42 100644
--- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelDependencyDaoMapper.xml
+++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelDependencyDaoMapper.xml
@@ -5,7 +5,7 @@
     <resultMap type="com.ruoyi.platform.domain.ModelDependency" id="ModelDependencyMap">
         <result property="id" column="id" jdbcType="INTEGER"/>
         <result property="currentModelId" column="current_model_id" jdbcType="INTEGER"/>
-        <result property="parentModelId" column="parent_model_id" jdbcType="INTEGER"/>
+        <result property="parentModels" column="parent_models" jdbcType="VARCHAR"/>
         <result property="refItem" column="ref_item" jdbcType="VARCHAR"/>
         <result property="trainTask" column="train_task" jdbcType="VARCHAR"/>
         <result property="trainDataset" column="train_dataset" jdbcType="VARCHAR"/>
@@ -21,7 +21,7 @@
     <!--查询单个-->
     <select id="queryById" resultMap="ModelDependencyMap">
         select
-        id,current_model_id,parent_model_id,ref_item,train_task,train_dataset,test_dataset,project_dependency,create_by,create_time,update_by,update_time,state
+        id,current_model_id,parent_models,ref_item,train_task,train_dataset,test_dataset,project_dependency,create_by,create_time,update_by,update_time,state
         from model_dependency
         where id = #{id}
     </select>
@@ -29,7 +29,7 @@
     <!--查询指定行数据-->
     <select id="queryAllByLimit" resultMap="ModelDependencyMap">
         select
-        id,current_model_id,parent_model_id,ref_item,train_task,train_dataset,test_dataset,project_dependency,create_by,create_time,update_by,update_time,state
+        id,current_model_id,parent_models,ref_item,train_task,train_dataset,test_dataset,project_dependency,create_by,create_time,update_by,update_time,state
         from model_dependency
         <where>
             <if test="modelDependency.id != null">
@@ -38,8 +38,8 @@
             <if test="modelDependency.currentModelId != null">
                 and current_model_id = #{modelDependency.currentModelId}
             </if>
-            <if test="modelDependency.parentModelId != null">
-                and parent_model_id = #{modelDependency.parentModelId}
+            <if test="modelDependency.parentModels != null">
+                and parent_models = #{modelDependency.parentModels}
             </if>
             <if test="modelDependency.refItem != null and modelDependency.refItem != ''">
                 and ref_item = #{modelDependency.refItem}
@@ -86,8 +86,8 @@
             <if test="modelDependency.currentModelId != null">
                 and current_model_id = #{modelDependency.currentModelId}
             </if>
-            <if test="modelDependency.parentModelId != null">
-                and parent_model_id = #{modelDependency.parentModelId}
+            <if test="modelDependency.parentModels != null">
+                and parent_models = #{modelDependency.parentModels}
             </if>
             <if test="modelDependency.refItem != null and modelDependency.refItem != ''">
                 and ref_item = #{modelDependency.refItem}
@@ -126,7 +126,7 @@
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
         insert into model_dependency (
             current_model_id,
-            parent_model_id,
+            parent_models,
             ref_item,
             train_task,
             train_dataset,
@@ -140,7 +140,7 @@
         )
         values (
             #{currentModelId},
-            #{parentModelId},
+            #{parentModels},
             #{refItem},
             #{trainTask},
             #{trainDataset},
@@ -158,7 +158,7 @@
     <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
         insert into model_dependency (
         current_model_id,
-        parent_model_id,
+        parent_models,
         ref_item,
         train_task,
         train_dataset,
@@ -174,7 +174,7 @@
         <foreach collection="entities" item="entity" separator=",">
             (
             #{entity.currentModelId},
-            #{entity.parentModelId},
+            #{entity.parentModels},
             #{entity.refItem},
             #{entity.trainTask},
             #{entity.trainDataset},
@@ -191,13 +191,13 @@
 
 
     <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into model_dependency(current_model_idparent_model_idref_itemtrain_tasktrain_datasettest_datasetcreate_bycreate_timeupdate_byupdate_timestate)
+        insert into model_dependency(current_model_idparent_modelsref_itemtrain_tasktrain_datasettest_datasetcreate_bycreate_timeupdate_byupdate_timestate)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.currentModelId}#{entity.parentModelId}#{entity.refItem}#{entity.trainTask}#{entity.trainDataset}#{entity.testDataset}#{entity.createBy}#{entity.createTime}#{entity.updateBy}#{entity.updateTime}#{entity.state})
+            (#{entity.currentModelId}#{entity.parentModels}#{entity.refItem}#{entity.trainTask}#{entity.trainDataset}#{entity.testDataset}#{entity.createBy}#{entity.createTime}#{entity.updateBy}#{entity.updateTime}#{entity.state})
         </foreach>
         on duplicate key update
-current_model_id = values(current_model_id)parent_model_id = values(parent_model_id)ref_item = values(ref_item)train_task = values(train_task)train_dataset = values(train_dataset)test_dataset = values(test_dataset)create_by = values(create_by)create_time = values(create_time)update_by = values(update_by)update_time = values(update_time)state = values(state)
+current_model_id = values(current_model_id)parent_models = values(parent_models)ref_item = values(ref_item)train_task = values(train_task)train_dataset = values(train_dataset)test_dataset = values(test_dataset)create_by = values(create_by)create_time = values(create_time)update_by = values(update_by)update_time = values(update_time)state = values(state)
     </insert>
 
     <!--通过主键修改数据-->
@@ -207,8 +207,8 @@ current_model_id = values(current_model_id)parent_model_id = values(parent_model
             <if test="modelDependency.currentModelId != null">
                 current_model_id = #{modelDependency.currentModelId},
             </if>
-            <if test="modelDependency.parentModelId != null">
-                parent_model_id = #{modelDependency.parentModelId},
+            <if test="modelDependency.parentModels != null">
+                parent_models = #{modelDependency.parentModels},
             </if>
             <if test="modelDependency.refItem != null and modelDependency.refItem != ''">
                 ref_item = #{modelDependency.refItem},