From b123904898f0bb975aae3291683dcc6a1ef71a3d Mon Sep 17 00:00:00 2001 From: fans <1141904845@qq.com> Date: Wed, 17 Jan 2024 14:05:21 +0800 Subject: [PATCH] =?UTF-8?q?swgger=E6=96=87=E6=A1=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/platform/domain/Component.java | 16 ++++++++++++++++ .../platform/domain/ComputingResource.java | 17 +++++++++++++---- .../com/ruoyi/platform/domain/Dataset.java | 15 ++++++++++----- .../ruoyi/platform/domain/DatasetVersion.java | 18 +++++++++++++----- .../com/ruoyi/platform/domain/Experiment.java | 16 +++++++++------- .../ruoyi/platform/domain/ExperimentIns.java | 12 ++++++++++-- .../java/com/ruoyi/platform/domain/Models.java | 13 +++++++++---- .../ruoyi/platform/domain/ModelsVersion.java | 17 ++++++++++++----- .../com/ruoyi/platform/domain/Workflow.java | 11 +++++++---- 9 files changed, 99 insertions(+), 36 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Component.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Component.java index f20b6ae5..baae12fb 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Component.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Component.java @@ -3,6 +3,7 @@ package com.ruoyi.platform.domain; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.PropertyNamingStrategy; import com.fasterxml.jackson.databind.annotation.JsonNaming; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.util.Date; @@ -23,14 +24,17 @@ public class Component implements Serializable { /** * 类别ID，数据字典配置 */ + @ApiModelProperty(name = "category_id") private Integer categoryId; /** * 组件name */ + @ApiModelProperty(name = "category_name") private String componentName; /** * 组件面板名 */ + @ApiModelProperty(name = "component_label") private String componentLabel; /** * 镜像 @@ -40,6 +44,7 @@ public class Component implements Serializable { /** * 工作目录 */ + @ApiModelProperty(name = "working_directory") private String workingDirectory; /** * 启动命令 @@ -49,26 +54,32 @@ public class Component implements Serializable { * 环境变量 */ @JsonProperty("env_variables") + @ApiModelProperty(name = "env_variables") private String envVirables; /** * 资源规格 */ + @ApiModelProperty(name = "resources_standard") private String resourcesStandard; /** * 控制策略 */ + @ApiModelProperty(name = "control_strategy") private String controlStrategy; /** * 挂载路径 */ + @ApiModelProperty(name = "mount_path") private String mountPath; /** * 输入参数 */ + @ApiModelProperty(name = "in_parameters") private String inParameters; /** * 输出参数 */ + @ApiModelProperty(name = "out_parameters") private String outParameters; /** * 描述 @@ -78,25 +89,30 @@ public class Component implements Serializable { /** * 图标路径 */ + @ApiModelProperty(name = "icon_path") private String iconPath; /** * 创建者 */ //@JsonProperty("creater") + @ApiModelProperty(name = "create_by") private String createBy; /** * 创建时间 */ + @ApiModelProperty(name = "create_time") private Date createTime; /** * 更新者 */ //@JsonProperty("modify_by") + @ApiModelProperty(name = "update_by") private String updateBy; /** * 更新时间 */ + @ApiModelProperty(name = "update_time") private Date updateTime; /** * 0,失效 1生效 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 9d7cc441..1acbc4e6 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 @@ -2,6 +2,7 @@ package com.ruoyi.platform.domain; import com.fasterxml.jackson.databind.PropertyNamingStrategy; import com.fasterxml.jackson.databind.annotation.JsonNaming; +import io.swagger.annotations.ApiModelProperty; import java.util.Date; import java.io.Serializable; @@ -22,6 +23,7 @@ public class ComputingResource implements Serializable { /** * 计算资源 */ + @ApiModelProperty(name = "computing_resource") private String computingResource; /** * 规格 @@ -31,21 +33,28 @@ public class ComputingResource implements Serializable { * 描述 */ private String description; -/** + /** * 创建者 */ + + //@JsonProperty("creater") + @ApiModelProperty(name = "create_by") private String createBy; -/** + /** * 创建时间 */ + @ApiModelProperty(name = "create_time") private Date createTime; -/** + /** * 更新者 */ + //@JsonProperty("modify_by") + @ApiModelProperty(name = "update_by") private String updateBy; -/** + /** * 更新时间 */ + @ApiModelProperty(name = "update_time") private Date updateTime; /** * 0,失效 1， 生效 diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Dataset.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Dataset.java index 8af6a324..cc8eef6d 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Dataset.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Dataset.java @@ -2,6 +2,7 @@ package com.ruoyi.platform.domain; import com.fasterxml.jackson.databind.PropertyNamingStrategy; import com.fasterxml.jackson.databind.annotation.JsonNaming; +import io.swagger.annotations.ApiModelProperty; import java.util.Date; import java.io.Serializable; @@ -25,23 +26,27 @@ public class Dataset implements Serializable { private String description; // private String url; - + @ApiModelProperty(name = "data_type") private Integer dataType; -/** + /** * 创建者 */ + @ApiModelProperty(name = "create_by") private String createBy; -/** + /** * 创建时间 */ + @ApiModelProperty(name = "create_time") private Date createTime; -/** + /** * 更新者 */ + @ApiModelProperty(name = "update_by") private String updateBy; -/** + /** * 更新时间 */ + @ApiModelProperty(name = "update_time") private Date updateTime; /** * 0,失效 1生效 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 4a70baeb..81f069d5 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 @@ -2,6 +2,7 @@ package com.ruoyi.platform.domain; import com.fasterxml.jackson.databind.PropertyNamingStrategy; import com.fasterxml.jackson.databind.annotation.JsonNaming; +import io.swagger.annotations.ApiModelProperty; import java.util.Date; import java.io.Serializable; @@ -19,7 +20,7 @@ public class DatasetVersion implements Serializable { * 主键 */ private Integer id; - + @ApiModelProperty(name = "dataset_id") private Integer datasetId; /** * 版本 @@ -32,34 +33,41 @@ public class DatasetVersion implements Serializable { /** * 文件名 */ + @ApiModelProperty(name = "file_name") private String fileName; /** * 文件大小 */ + @ApiModelProperty(name = "file_size") private String fileSize; /** * 可用集群 */ + @ApiModelProperty(name = "available_cluster") private String availableCluster; /** * 状态 */ private Integer status; -/** + /** * 创建者 */ + @ApiModelProperty(name = "create_by") private String createBy; -/** + /** * 创建时间 */ + @ApiModelProperty(name = "create_time") private Date createTime; -/** + /** * 更新者 */ + @ApiModelProperty(name = "update_by") private String updateBy; -/** + /** * 更新时间 */ + @ApiModelProperty(name = "update_time") private Date updateTime; /** * 0失效，1生效 diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Experiment.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Experiment.java index 154d85fc..20c0179d 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Experiment.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Experiment.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableLogic; import com.fasterxml.jackson.databind.PropertyNamingStrategy; import com.fasterxml.jackson.databind.annotation.JsonNaming; import com.ruoyi.common.core.web.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.util.Date; @@ -24,35 +25,36 @@ public class Experiment extends BaseEntity implements Serializable { @TableId private Integer id; private String name; + @ApiModelProperty(name = "workflow_id") private Long workflowId; /** * 全局参数 */ + @ApiModelProperty(name = "global_param") private String globalParam; /** * 简介 */ private String description; /** - * 创建人 + * 创建者 */ - @TableField(fill = FieldFill.INSERT) + @ApiModelProperty(name = "create_by") private String createBy; /** * 创建时间 */ - @TableField(fill = FieldFill.INSERT) + @ApiModelProperty(name = "create_time") private Date createTime; /** - * 更新人 + * 更新者 */ - - @TableField(fill = FieldFill.INSERT_UPDATE) + @ApiModelProperty(name = "update_by") private String updateBy; /** * 更新时间 */ - @TableField(fill = FieldFill.INSERT_UPDATE) + @ApiModelProperty(name = "update_time") private Date updateTime; /** * 0,失效 1生效 diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ExperimentIns.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ExperimentIns.java index df586a76..6da30f60 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ExperimentIns.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ExperimentIns.java @@ -2,6 +2,7 @@ package com.ruoyi.platform.domain; import com.fasterxml.jackson.databind.PropertyNamingStrategy; import com.fasterxml.jackson.databind.annotation.JsonNaming; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.util.Date; @@ -20,38 +21,45 @@ public class ExperimentIns implements Serializable { /** * 实验ID */ + @ApiModelProperty(name = "experiment_id") private Integer experimentId; /** * argo返回name */ + @ApiModelProperty(name = "argo_ins_name") private String argoInsName; /** * argo返回命名空间 */ + @ApiModelProperty(name = "argo_ins_ns") private String argoInsNs; /** * 实例运行状态 */ private String status; - + @ApiModelProperty(name = "nodes_status") private String nodesStatus; - + @ApiModelProperty(name = "nodes_logs") private String nodesLogs; /** * 创建者 */ + @ApiModelProperty(name = "create_by") private String createBy; /** * 创建时间 */ + @ApiModelProperty(name = "create_time") private Date createTime; /** * 更新者 */ + @ApiModelProperty(name = "update_by") private String updateBy; /** * 更新时间 */ + @ApiModelProperty(name = "update_time") private Date updateTime; /** * 0,失效 1生效 diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Models.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Models.java index 480a998f..78765aaf 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Models.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Models.java @@ -2,6 +2,7 @@ package com.ruoyi.platform.domain; import com.fasterxml.jackson.databind.PropertyNamingStrategy; import com.fasterxml.jackson.databind.annotation.JsonNaming; +import io.swagger.annotations.ApiModelProperty; import java.util.Date; import java.io.Serializable; @@ -27,21 +28,25 @@ public class Models implements Serializable { // private String url; private Integer modelType; -/** + /** * 创建者 */ + @ApiModelProperty(name = "create_by") private String createBy; -/** + /** * 创建时间 */ + @ApiModelProperty(name = "create_time") private Date createTime; -/** + /** * 更新者 */ + @ApiModelProperty(name = "update_by") private String updateBy; -/** + /** * 更新时间 */ + @ApiModelProperty(name = "update_time") private Date updateTime; /** * 0,失效 1生效 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 376bd529..ca983e12 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 @@ -2,6 +2,7 @@ package com.ruoyi.platform.domain; import com.fasterxml.jackson.databind.PropertyNamingStrategy; import com.fasterxml.jackson.databind.annotation.JsonNaming; +import io.swagger.annotations.ApiModelProperty; import java.util.Date; import java.io.Serializable; @@ -19,7 +20,7 @@ public class ModelsVersion implements Serializable { * 主键 */ private Integer id; - + @ApiModelProperty(name = "models_id") private Integer modelsId; /** * 版本 @@ -32,30 +33,36 @@ public class ModelsVersion implements Serializable { /** * 文件名 */ + @ApiModelProperty(name = "file_name") private String fileName; /** * 文件大小 */ + @ApiModelProperty(name = "file_size") private String fileSize; /** * 状态 */ private Integer status; -/** + /** * 创建者 */ + @ApiModelProperty(name = "create_by") private String createBy; -/** + /** * 创建时间 */ + @ApiModelProperty(name = "create_time") private Date createTime; -/** + /** * 更新者 */ + @ApiModelProperty(name = "update_by") private String updateBy; -/** + /** * 更新时间 */ + @ApiModelProperty(name = "update_time") private Date updateTime; /** * 0失效，1生效 diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Workflow.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Workflow.java index 40098889..dfdab8dc 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Workflow.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Workflow.java @@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.PropertyNamingStrategy; import com.fasterxml.jackson.databind.annotation.JsonNaming; import com.ruoyi.platform.handler.BaseMetaObjectHandler; +import io.swagger.annotations.ApiModelProperty; import org.springframework.stereotype.Component; import javax.persistence.Table; @@ -40,22 +41,24 @@ public class Workflow extends BaseMetaObjectHandler implements Serializable { */ private String dag; /** - * 创建人 + * 创建者 */ + @ApiModelProperty(name = "create_by") private String createBy; /** * 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty(name = "create_time") private Date createTime; /** - * 更新人 + * 更新者 */ + @ApiModelProperty(name = "update_by") private String updateBy; /** * 更新时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty(name = "update_time") private Date updateTime; /** * 0,失效 1生效