Merge remote-tracking branch 'origin/dev' into dev

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelDependency.java

@@ -1,5 +1,8 @@
 package com.ruoyi.platform.domain;
 
+import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+
 import java.util.Date;
 import java.io.Serializable;
 
@@ -9,6 +12,7 @@ import java.io.Serializable;
  * @author Xidaray
  * @since 2024-05-29 13:51:23
  */
+@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
 public class ModelDependency implements Serializable {
     private static final long serialVersionUID = -86753423714028539L;
 /**
@@ -39,7 +43,14 @@ public class ModelDependency implements Serializable {
      * 测试数据集
      */
     private String testDataset;
-/**
+    /**
+     * 依赖项目
+     */
+    private String projectDependency;
+
+
+
+    /**
      * 创建者
      */
     private String createBy;
@@ -117,6 +128,14 @@ public class ModelDependency implements Serializable {
         this.testDataset = testDataset;
     }
 
+    public String getProjectDependency() {
+        return projectDependency;
+    }
+
+    public void setProjectDependency(String projectDependency) {
+        this.projectDependency = projectDependency;
+    }
+
     public String getCreateBy() {
         return createBy;
     }

ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelDependencyDaoMapper.xml

@@ -10,6 +10,7 @@
         <result property="trainTask" column="train_task" jdbcType="VARCHAR"/>
         <result property="trainDataset" column="train_dataset" jdbcType="VARCHAR"/>
         <result property="testDataset" column="test_dataset" jdbcType="VARCHAR"/>
+        <result property="projectDependency" column="project_dependency" jdbcType="VARCHAR"/>
         <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
         <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
@@ -20,7 +21,7 @@
     <!--查询单个-->
     <select id="queryById" resultMap="ModelDependencyMap">
         select
-        id,current_model_id,parent_model_id,ref_item,train_task,train_dataset,test_dataset,create_by,create_time,update_by,update_time,state
+        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
         from model_dependency
         where id = #{id}
     </select>
@@ -28,7 +29,7 @@
     <!--查询指定行数据-->
     <select id="queryAllByLimit" resultMap="ModelDependencyMap">
         select
-        id,current_model_id,parent_model_id,ref_item,train_task,train_dataset,test_dataset,create_by,create_time,update_by,update_time,state
+        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
         from model_dependency
         <where>
             <if test="modelDependency.id != null">
@@ -52,6 +53,9 @@
             <if test="modelDependency.testDataset != null and modelDependency.testDataset != ''">
                 and test_dataset = #{modelDependency.testDataset}
             </if>
+            <if test="modelDependency.projectDependency != null and modelDependency.projectDependency != ''">
+                and project_dependency = #{modelDependency.projectDependency}
+            </if>
             <if test="modelDependency.createBy != null and modelDependency.createBy != ''">
                 and create_by = #{modelDependency.createBy}
             </if>
@@ -97,6 +101,9 @@
             <if test="modelDependency.testDataset != null and modelDependency.testDataset != ''">
                 and test_dataset = #{modelDependency.testDataset}
             </if>
+            <if test="modelDependency.projectDependency != null and modelDependency.projectDependency != ''">
+                and project_dependency = #{modelDependency.projectDependency}
+            </if>
             <if test="modelDependency.createBy != null and modelDependency.createBy != ''">
                 and create_by = #{modelDependency.createBy}
             </if>
@@ -124,6 +131,7 @@
             train_task,
             train_dataset,
             test_dataset,
+            project_dependency,
             create_by,
             create_time,
             update_by,
@@ -137,6 +145,7 @@
             #{trainTask},
             #{trainDataset},
             #{testDataset},
+            #{projectDependency},
             #{createBy},
             #{createTime},
             #{updateBy},
@@ -154,6 +163,7 @@
         train_task,
         train_dataset,
         test_dataset,
+        project_dependency,
         create_by,
         create_time,
         update_by,
@@ -169,6 +179,7 @@
             #{entity.trainTask},
             #{entity.trainDataset},
             #{entity.testDataset},
+            #{projectDependency},
             #{entity.createBy},
             #{entity.createTime},
             #{entity.updateBy},
@@ -211,6 +222,9 @@ current_model_id = values(current_model_id)parent_model_id = values(parent_model
             <if test="modelDependency.testDataset != null and modelDependency.testDataset != ''">
                 test_dataset = #{modelDependency.testDataset},
             </if>
+            <if test="modelDependency.projectDependency != null and modelDependency.projectDependency != ''">
+                project_dependency = #{modelDependency.projectDependency},
+            </if>
             <if test="modelDependency.createBy != null and modelDependency.createBy != ''">
                 create_by = #{modelDependency.createBy},
             </if>