数据集模型版本增加描述

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

@@ -19,53 +19,35 @@ public class ComputingResource implements Serializable {
 /**
      * 主键
      */
-    @ApiModelProperty(name = "id")
-    private Integer id;
-/**
-     * 计算资源
-     */
-    @ApiModelProperty(name = "computing_resource")
+@ApiModelProperty(value = "编号", notes = "唯一标识符")
+private Integer id;
+
+    @ApiModelProperty("计算资源的描述")
     private String computingResource;
-/**
-     * 规格
-     */
-    @ApiModelProperty(name = "standard")
+
+    @ApiModelProperty("计算资源的规格说明")
     private String standard;
-/**
-     * 描述
-     */
-    @ApiModelProperty(name = "description")
+
+    @ApiModelProperty("资源的详细描述")
     private String description;
-    /**
-     * 创建者
-     */
 
-    //@JsonProperty("creater")
-    @ApiModelProperty(name = "create_by")
+    @ApiModelProperty(value = "创建者的用户名", example = "admin")
     private String createBy;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(name = "create_time")
+
+    @ApiModelProperty(value = "资源的创建时间")
     private Date createTime;
-    /**
-     * 更新者
-     */
-    //@JsonProperty("modify_by")
-    @ApiModelProperty(name = "update_by")
+
+    @ApiModelProperty(value = "更新者")
     private String updateBy;
-    /**
-     * 更新时间
-     */
-    @ApiModelProperty(name = "update_time")
+
+    @ApiModelProperty(value = "更新时间")
     private Date updateTime;
-/**
-     * 0,失效 1， 生效
-     */
-    @ApiModelProperty(name = "state")
+
+    @ApiModelProperty(value = "状态标识", notes = "0表示失效，1表示生效")
     private Integer state;
 
 
+
     public Integer getId() {
         return id;
     }

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

@@ -45,6 +45,9 @@ public class DatasetVersion implements Serializable {
     @ApiModelProperty(value = "状态")
     private Integer status;
 
+    @ApiModelProperty(value = "描述")
+    private String description;
+
     @ApiModelProperty(value = "创建者")
     private String createBy;
 
@@ -126,6 +129,14 @@ public class DatasetVersion implements Serializable {
         this.status = status;
     }
 
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
     public String getCreateBy() {
         return createBy;
     }

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

@@ -42,6 +42,9 @@ private Integer id;
     @ApiModelProperty(value = "状态")
     private Integer status;
 
+    @ApiModelProperty(value = "模型版本描述")
+    private String description;
+
     @ApiModelProperty(value = "创建者")
     private String createBy;
 
@@ -114,6 +117,14 @@ private Integer id;
         this.status = status;
     }
 
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
     public String getCreateBy() {
         return createBy;
     }

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

@@ -11,6 +11,7 @@
         <result property="fileSize" column="file_size" jdbcType="VARCHAR"/>
         <result property="availableCluster" column="available_cluster" jdbcType="VARCHAR"/>
         <result property="status" column="status" jdbcType="INTEGER"/>
+        <result property="description" column="description" 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,14 +21,14 @@
 
     <select id="queryById" resultMap="DatasetVersionMap">
         select
-        id,dataset_id,version,url,file_name,file_size,available_cluster,status,create_by,create_time,update_by,update_time,state
+        id,dataset_id,version,url,file_name,file_size,available_cluster,status, description,create_by,create_time,update_by,update_time,state
         from dataset_version
         where id = #{id} and state = 1
     </select>
     <!--查询单个-->
     <select id="queryByDatasetId" resultMap="DatasetVersionMap">
         select
-        id,dataset_id,version,url,file_name,file_size,available_cluster,status,create_by,create_time,update_by,update_time,state
+        id,dataset_id,version,url,file_name,file_size,available_cluster,status, description,create_by,create_time,update_by,update_time,state
         from dataset_version
         where dataset_id = #{datasetId} and state = 1
         order by create_time desc
@@ -35,7 +36,7 @@
 
     <select id="queryByDatasetVersion" resultMap="DatasetVersionMap">
         select
-        id,dataset_id,version,url,file_name,file_size,available_cluster,status,create_by,create_time,update_by,update_time,state
+        id,dataset_id,version,url,file_name,file_size,available_cluster,status, description,create_by,create_time,update_by,update_time,state
         from dataset_version
         <where>
             state = 1
@@ -51,7 +52,7 @@
 
     <select id="queryAllByDatasetVersion" resultMap="DatasetVersionMap">
         select
-        id,dataset_id,version,url,file_name,file_size,available_cluster,status,create_by,create_time,update_by,update_time,state
+        id,dataset_id,version,url,file_name,file_size,available_cluster,status, description,create_by,create_time,update_by,update_time,state
         from dataset_version
         <where>
             state = 1
@@ -69,7 +70,7 @@
     <!--查询指定行数据-->
     <select id="queryAllByLimit" resultMap="DatasetVersionMap">
         select
-        id,dataset_id,version,url,file_name,file_size,available_cluster,status,create_by,create_time,update_by,update_time,state
+        id,dataset_id,version,url,file_name,file_size,available_cluster,status, description,create_by,create_time,update_by,update_time,state
         from dataset_version
         <where>
             state = 1
@@ -97,6 +98,9 @@
             <if test="datasetVersion.status != null">
                 and status = #{datasetVersion.status}
             </if>
+            <if test="datasetVersion.description != null and datasetVersion.description != ''">
+                and description = #{datasetVersion.description}
+            </if>
             <if test="datasetVersion.createBy != null and datasetVersion.createBy != ''">
                 and create_by = #{datasetVersion.createBy}
             </if>
@@ -146,6 +150,9 @@
             <if test="datasetVersion.status != null">
                 and status = #{datasetVersion.status}
             </if>
+            <if test="datasetVersion.description != null and datasetVersion.description != ''">
+                and description = #{datasetVersion.description}
+            </if>
             <if test="datasetVersion.createBy != null and datasetVersion.createBy != ''">
                 and create_by = #{datasetVersion.createBy}
             </if>
@@ -167,23 +174,23 @@
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into dataset_version(dataset_id,version,url,file_name,file_size,available_cluster,status,create_by,create_time,update_by,update_time,state)
-        values (#{datasetVersion.datasetId},#{datasetVersion.version},#{datasetVersion.url},#{datasetVersion.fileName},#{datasetVersion.fileSize},#{datasetVersion.availableCluster},#{datasetVersion.status},#{datasetVersion.createBy},#{datasetVersion.createTime},#{datasetVersion.updateBy},#{datasetVersion.updateTime},#{datasetVersion.state})
+        insert into dataset_version(dataset_id,version,url,file_name,file_size,available_cluster,status, description,create_by,create_time,update_by,update_time,state)
+        values (#{datasetVersion.datasetId},#{datasetVersion.version},#{datasetVersion.url},#{datasetVersion.fileName},#{datasetVersion.fileSize},#{datasetVersion.availableCluster},#{datasetVersion.status},#{datasetVersion.description},#{datasetVersion.createBy},#{datasetVersion.createTime},#{datasetVersion.updateBy},#{datasetVersion.updateTime},#{datasetVersion.state})
     </insert>
 
     <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into dataset_version(dataset_id,version,url,file_name,file_size,available_cluster,status,create_by,create_time,update_by,update_time,state)
+        insert into dataset_version(dataset_id,version,url,file_name,file_size,available_cluster,status, description,create_by,create_time,update_by,update_time,state)
         values
         <foreach collection="entities" item="entity" separator=",">
-        (#{entity.datasetId},#{entity.version},#{entity.url},#{entity.fileName},#{entity.fileSize},#{entity.availableCluster},#{entity.status},#{entity.createBy},#{entity.createTime},#{entity.updateBy},#{entity.updateTime},#{entity.state})
+        (#{entity.datasetId},#{entity.version},#{entity.url},#{entity.fileName},#{entity.fileSize},#{entity.availableCluster},#{entity.status},#{entity.description},#{entity.createBy},#{entity.createTime},#{entity.updateBy},#{entity.updateTime},#{entity.state})
         </foreach>
     </insert>
 
     <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into dataset_version(dataset_id,version,url,file_name,file_size,available_cluster,status,create_by,create_time,update_by,update_time,state)
+        insert into dataset_version(dataset_id,version,url,file_name,file_size,available_cluster,status, description,create_by,create_time,update_by,update_time,state)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.datasetId},#{entity.version},#{entity.url},#{entity.fileName},#{entity.fileSize},#{entity.availableCluster},#{entity.status},#{entity.createBy},#{entity.createTime},#{entity.updateBy},#{entity.updateTime},#{entity.state})
+            (#{entity.datasetId},#{entity.version},#{entity.url},#{entity.fileName},#{entity.fileSize},#{entity.availableCluster},#{entity.status},#{entity.description},#{entity.createBy},#{entity.createTime},#{entity.updateBy},#{entity.updateTime},#{entity.state})
         </foreach>
         on duplicate key update
 dataset_id = values(dataset_id)version = values(version)url = values(url)file_name = values(file_name)file_size = values(file_size)available_cluster = values(available_cluster)status = values(status)create_by = values(create_by)create_time = values(create_time)update_by = values(update_by)update_time = values(update_time)state = values(state)
@@ -217,6 +224,9 @@ dataset_id = values(dataset_id)version = values(version)url = values(url)file_na
             <if test="datasetVersion.status != null">
                  status = #{datasetVersion.status},
             </if>
+            <if test="datasetVersion.description != null and datasetVersion.description != ''">
+                 description = #{datasetVersion.description},
+            </if>
             <if test="datasetVersion.createBy != null and datasetVersion.createBy != ''">
                  create_by = #{datasetVersion.createBy},
             </if>

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

@@ -10,6 +10,7 @@
         <result property="fileName" column="file_name" jdbcType="VARCHAR"/>
         <result property="fileSize" column="file_size" jdbcType="VARCHAR"/>
         <result property="status" column="status" jdbcType="INTEGER"/>
+        <result property="description" column="description" 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"/>
@@ -18,7 +19,7 @@
     </resultMap>
     <select id="queryByModelsId" resultMap="ModelsVersionMap">
         select
-        id,models_id,version,url,file_name,file_size,status,create_by,create_time,update_by,update_time,state
+        id,models_id,version,url,file_name,file_size,status, description,create_by,create_time,update_by,update_time,state
         from models_version
         where models_id = #{modelsId} and state = 1
         order by create_time desc
@@ -27,14 +28,14 @@
     <!--查询单个-->
     <select id="queryById" resultMap="ModelsVersionMap">
         select
-        id,models_id,version,url,file_name,file_size,status,create_by,create_time,update_by,update_time,state
+        id,models_id,version,url,file_name,file_size,status, description,create_by,create_time,update_by,update_time,state
         from models_version
         where id = #{id} and state = 1
     </select>
 
     <select id="queryByModelsVersion" resultMap="ModelsVersionMap">
         select
-        id,models_id,version,url,file_name,file_size,status,create_by,create_time,update_by,update_time,state
+        id,models_id,version,url,file_name,file_size,status, description,create_by,create_time,update_by,update_time,state
         from models_version
         <where>
             state = 1
@@ -51,7 +52,7 @@
     <!-- 查询模型同一个版本下的所有文件 -->
     <select id="queryAllByModelsVersion" resultMap="ModelsVersionMap">
         select
-        id,models_id,version,url,file_name,file_size,status,create_by,create_time,update_by,update_time,state
+        id,models_id,version,url,file_name,file_size,status, description,create_by,create_time,update_by,update_time,state
         from models_version
         <where>
             state = 1
@@ -69,7 +70,7 @@
     <!--查询指定行数据-->
     <select id="queryAllByLimit" resultMap="ModelsVersionMap">
         select
-        id,models_id,version,url,file_name,file_size,status,create_by,create_time,update_by,update_time,state
+        id,models_id,version,url,file_name,file_size,status, description,create_by,create_time,update_by,update_time,state
         from models_version
         <where>
             state = 1
@@ -94,6 +95,9 @@
             <if test="modelsVersion.status != null">
                 and status = #{modelsVersion.status}
             </if>
+            <if test="modelsVersion.description != null and modelsVersion.description != ''">
+                and description = #{modelsVersion.description}
+            </if>
             <if test="modelsVersion.createBy != null and modelsVersion.createBy != ''">
                 and create_by = #{modelsVersion.createBy}
             </if>
@@ -140,6 +144,10 @@
             <if test="modelsVersion.status != null">
                 and status = #{modelsVersion.status}
             </if>
+            <if test="modelsVersion.description != null and modelsVersion.description != ''">
+                and description = #{modelsVersion.description}
+            </if>
+
             <if test="modelsVersion.createBy != null and modelsVersion.createBy != ''">
                 and create_by = #{modelsVersion.createBy}
             </if>
@@ -160,14 +168,14 @@
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into models_version(models_id, version, url, file_name, file_size, status, create_by, create_time, update_by, update_time, state)
+        insert into models_version(models_id, version, url, file_name, file_size, status, description, create_by, create_time, update_by, update_time, state)
         values (#{modelsVersion.modelsId}, #{modelsVersion.version}, #{modelsVersion.url}, #{modelsVersion.fileName}, #{modelsVersion.fileSize}, #{modelsVersion.status}, #{modelsVersion.createBy}, #{modelsVersion.createTime}, #{modelsVersion.updateBy}, #{modelsVersion.updateTime}, #{modelsVersion.state})
     </insert>
 
 
     <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
         insert into models_version
-        (models_id, version, url, file_name, file_size, status, create_by, create_time, update_by, update_time, state)
+        (models_id, version, url, file_name, file_size, status, description, create_by, create_time, update_by, update_time, state)
         values
         <foreach collection="entities" item="entity" separator=",">
             (#{entity.modelsId}, #{entity.version}, #{entity.url}, #{entity.fileName}, #{entity.fileSize}, #{entity.status}, #{entity.createBy}, #{entity.createTime}, #{entity.updateBy}, #{entity.updateTime}, #{entity.state})
@@ -177,7 +185,7 @@
 
     <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
         insert into models_version
-        (models_id, version, url, file_name, file_size, status, create_by, create_time, update_by, update_time, state)
+        (models_id, version, url, file_name, file_size, status, description, create_by, create_time, update_by, update_time, state)
         values
         <foreach collection="entities" item="entity" separator=",">
             (#{entity.modelsId}, #{entity.version}, #{entity.url}, #{entity.fileName}, #{entity.fileSize}, #{entity.status}, #{entity.createBy}, #{entity.createTime}, #{entity.updateBy}, #{entity.updateTime}, #{entity.state})
@@ -222,6 +230,9 @@
             <if test="modelsVersion.status != null">
                 status = #{modelsVersion.status},
             </if>
+            <if test="modelsVersion.description != null and modelsVersion.description != ''">
+                description = #{modelsVersion.description},
+            </if>
             <if test="modelsVersion.createBy != null and modelsVersion.createBy != ''">
                 create_by = #{modelsVersion.createBy},
             </if>