diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ComputingResource.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ComputingResource.java index 84a80d83..47d7892d 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ComputingResource.java +++ b/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; } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/DatasetVersion.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/DatasetVersion.java index 37b79eb4..b7c6f4f4 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/DatasetVersion.java +++ b/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; } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelsVersion.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelsVersion.java index 09e05914..f1ddbf81 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelsVersion.java +++ b/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; } diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetVersionDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetVersionDaoMapper.xml index 1e53f3c4..1fe81865 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetVersionDaoMapper.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetVersionDaoMapper.xml @@ -11,6 +11,7 @@ + @@ -20,14 +21,14 @@ 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 state = 1 @@ -51,7 +52,7 @@ 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 state = 1 @@ -97,6 +98,9 @@ and status = #{datasetVersion.status} + + and description = #{datasetVersion.description} + and create_by = #{datasetVersion.createBy} @@ -146,6 +150,9 @@ and status = #{datasetVersion.status} + + and description = #{datasetVersion.description} + and create_by = #{datasetVersion.createBy} @@ -167,23 +174,23 @@ - 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 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 - (#{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}) - 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 - (#{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}) 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 status = #{datasetVersion.status}, + + description = #{datasetVersion.description}, + create_by = #{datasetVersion.createBy}, diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelsVersionDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelsVersionDaoMapper.xml index c46a3276..1cd43358 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelsVersionDaoMapper.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelsVersionDaoMapper.xml @@ -10,6 +10,7 @@ + @@ -18,7 +19,7 @@ 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 - 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 state = 1 @@ -69,7 +70,7 @@