Browse Source

修改由于swagger2.0导致的报错

tags/v20240126
fans 2 years ago
parent
commit
4d6c43fa3d
9 changed files with 41 additions and 19 deletions
  1. +5
    -0
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Component.java
  2. +4
    -0
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ComputingResource.java
  3. +4
    -5
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Dataset.java
  4. +5
    -0
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/DatasetVersion.java
  5. +5
    -9
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Experiment.java
  6. +3
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ExperimentIns.java
  7. +5
    -4
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Models.java
  8. +5
    -0
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelsVersion.java
  9. +5
    -0
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Workflow.java

+ 5
- 0
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Component.java View File

@@ -20,6 +20,7 @@ public class Component implements Serializable {
/** /**
* 主键 * 主键
*/ */
@ApiModelProperty(name = "id")
private Integer id; private Integer id;
/** /**
* 类别ID,数据字典配置 * 类别ID,数据字典配置
@@ -40,6 +41,7 @@ public class Component implements Serializable {
* 镜像 * 镜像
*/ */
@JsonProperty("image") @JsonProperty("image")
@ApiModelProperty(name = "image")
private String images; private String images;
/** /**
* 工作目录 * 工作目录
@@ -49,6 +51,7 @@ public class Component implements Serializable {
/** /**
* 启动命令 * 启动命令
*/ */
@ApiModelProperty(name = "command")
private String command; private String command;
/** /**
* 环境变量 * 环境变量
@@ -84,6 +87,7 @@ public class Component implements Serializable {
/** /**
* 描述 * 描述
*/ */
@ApiModelProperty(name = "description")
private String description; private String description;


/** /**
@@ -117,6 +121,7 @@ public class Component implements Serializable {
/** /**
* 0,失效 1生效 * 0,失效 1生效
*/ */
@ApiModelProperty(name = "state")
private Integer state; private Integer state;


public Integer getId() { public Integer getId() {


+ 4
- 0
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ComputingResource.java View File

@@ -19,6 +19,7 @@ public class ComputingResource implements Serializable {
/** /**
* 主键 * 主键
*/ */
@ApiModelProperty(name = "id")
private Integer id; private Integer id;
/** /**
* 计算资源 * 计算资源
@@ -28,10 +29,12 @@ public class ComputingResource implements Serializable {
/** /**
* 规格 * 规格
*/ */
@ApiModelProperty(name = "standard")
private String standard; private String standard;
/** /**
* 描述 * 描述
*/ */
@ApiModelProperty(name = "description")
private String description; private String description;
/** /**
* 创建者 * 创建者
@@ -59,6 +62,7 @@ public class ComputingResource implements Serializable {
/** /**
* 0,失效 1, 生效 * 0,失效 1, 生效
*/ */
@ApiModelProperty(name = "state")
private Integer state; private Integer state;






+ 4
- 5
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Dataset.java View File

@@ -16,16 +16,14 @@ import java.io.Serializable;
@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class) @JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
public class Dataset implements Serializable { public class Dataset implements Serializable {
private static final long serialVersionUID = 918442714458737041L; private static final long serialVersionUID = 918442714458737041L;
@ApiModelProperty(name = "id")
private Integer id; private Integer id;
@ApiModelProperty(name = "name")
private String name; private String name;


// private String version;

@ApiModelProperty(name = "description")
private String description; private String description;


// private String url;
@ApiModelProperty(name = "data_type") @ApiModelProperty(name = "data_type")
private Integer dataType; private Integer dataType;
/** /**
@@ -51,6 +49,7 @@ public class Dataset implements Serializable {
/** /**
* 0,失效 1生效 * 0,失效 1生效
*/ */
@ApiModelProperty(name = "state")
private Integer state; private Integer state;






+ 5
- 0
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/DatasetVersion.java View File

@@ -19,16 +19,19 @@ public class DatasetVersion implements Serializable {
/** /**
* 主键 * 主键
*/ */
@ApiModelProperty(name = "id")
private Integer id; private Integer id;
@ApiModelProperty(name = "dataset_id") @ApiModelProperty(name = "dataset_id")
private Integer datasetId; private Integer datasetId;
/** /**
* 版本 * 版本
*/ */
@ApiModelProperty(name = "version")
private String version; private String version;
/** /**
* 数据集存储地址 * 数据集存储地址
*/ */
@ApiModelProperty(name = "url")
private String url; private String url;
/** /**
* 文件名 * 文件名
@@ -48,6 +51,7 @@ public class DatasetVersion implements Serializable {
/** /**
* 状态 * 状态
*/ */
@ApiModelProperty(name = "status")
private Integer status; private Integer status;
/** /**
* 创建者 * 创建者
@@ -72,6 +76,7 @@ public class DatasetVersion implements Serializable {
/** /**
* 0失效,1生效 * 0失效,1生效
*/ */
@ApiModelProperty(name = "state")
private Integer state; private Integer state;






+ 5
- 9
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Experiment.java View File

@@ -20,12 +20,13 @@ import java.util.List;
* @since 2023-11-07 15:08:22 * @since 2023-11-07 15:08:22
*/ */
@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class) @JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
public class Experiment extends BaseEntity implements Serializable {
public class Experiment implements Serializable {
private static final long serialVersionUID = 409135817108439880L; private static final long serialVersionUID = 409135817108439880L;
@TableId
// @ApiModelProperty(name = "id")
private Integer id; private Integer id;
// @ApiModelProperty(name = "name")
private String name; private String name;
@ApiModelProperty(name = "workflow_id")
// @ApiModelProperty(name = "workflow_id")
private Long workflowId; private Long workflowId;
/** /**
* 全局参数 * 全局参数
@@ -35,33 +36,28 @@ public class Experiment extends BaseEntity implements Serializable {
/** /**
* 简介 * 简介
*/ */
@ApiModelProperty(name = "description")
private String description; private String description;
/** /**
* 创建者 * 创建者
*/ */
@ApiModelProperty(name = "create_by")
private String createBy; private String createBy;
/** /**
* 创建时间 * 创建时间
*/ */
@ApiModelProperty(name = "create_time")
private Date createTime; private Date createTime;
/** /**
* 更新者 * 更新者
*/ */
@ApiModelProperty(name = "update_by")
private String updateBy; private String updateBy;
/** /**
* 更新时间 * 更新时间
*/ */
@ApiModelProperty(name = "update_time")
private Date updateTime; private Date updateTime;
/** /**
* 0,失效 1生效 * 0,失效 1生效
*/ */
@TableLogic
private Integer state; private Integer state;

private List<ExperimentIns> experimentInsList; private List<ExperimentIns> experimentInsList;


public String getName() { public String getName() {


+ 3
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ExperimentIns.java View File

@@ -16,7 +16,7 @@ import java.util.Date;
@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class) @JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
public class ExperimentIns implements Serializable { public class ExperimentIns implements Serializable {
private static final long serialVersionUID = 623464560240790680L; private static final long serialVersionUID = 623464560240790680L;
@ApiModelProperty(name = "id")
private Integer id; private Integer id;
/** /**
* 实验ID * 实验ID
@@ -36,6 +36,7 @@ public class ExperimentIns implements Serializable {
/** /**
* 实例运行状态 * 实例运行状态
*/ */
@ApiModelProperty(name = "status")
private String status; private String status;
@ApiModelProperty(name = "nodes_status") @ApiModelProperty(name = "nodes_status")
private String nodesStatus; private String nodesStatus;
@@ -64,6 +65,7 @@ public class ExperimentIns implements Serializable {
/** /**
* 0,失效 1生效 * 0,失效 1生效
*/ */
@ApiModelProperty(name = "state")
private Integer state; private Integer state;


public ExperimentIns() { public ExperimentIns() {


+ 5
- 4
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Models.java View File

@@ -16,17 +16,17 @@ import java.io.Serializable;
@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class) @JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
public class Models implements Serializable { public class Models implements Serializable {
private static final long serialVersionUID = -59896385986032571L; private static final long serialVersionUID = -59896385986032571L;
@ApiModelProperty(name = "id")
private Integer id; private Integer id;
@ApiModelProperty(name = "name")
private String name; private String name;


// private String version; // private String version;
@ApiModelProperty(name = "description")
private String description; private String description;


// private String url; // private String url;
@ApiModelProperty(name = "model_type")
private Integer modelType; private Integer modelType;
/** /**
* 创建者 * 创建者
@@ -51,6 +51,7 @@ public class Models implements Serializable {
/** /**
* 0,失效 1生效 * 0,失效 1生效
*/ */
@ApiModelProperty(name = "state")
private Integer state; private Integer state;






+ 5
- 0
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelsVersion.java View File

@@ -19,16 +19,19 @@ public class ModelsVersion implements Serializable {
/** /**
* 主键 * 主键
*/ */
@ApiModelProperty(name = "id")
private Integer id; private Integer id;
@ApiModelProperty(name = "models_id") @ApiModelProperty(name = "models_id")
private Integer modelsId; private Integer modelsId;
/** /**
* 版本 * 版本
*/ */
@ApiModelProperty(name = "version")
private String version; private String version;
/** /**
* 模型存储地址 * 模型存储地址
*/ */
@ApiModelProperty(name = "url")
private String url; private String url;
/** /**
* 文件名 * 文件名
@@ -43,6 +46,7 @@ public class ModelsVersion implements Serializable {
/** /**
* 状态 * 状态
*/ */
@ApiModelProperty(name = "status")
private Integer status; private Integer status;
/** /**
* 创建者 * 创建者
@@ -67,6 +71,7 @@ public class ModelsVersion implements Serializable {
/** /**
* 0失效,1生效 * 0失效,1生效
*/ */
@ApiModelProperty(name = "state")
private Integer state; private Integer state;






+ 5
- 0
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Workflow.java View File

@@ -27,18 +27,22 @@ public class Workflow extends BaseMetaObjectHandler implements Serializable {
* id * id
*/ */
@TableId @TableId
@ApiModelProperty(name = "id")
private Long id; private Long id;
/** /**
* 工作流名称 * 工作流名称
*/ */
@ApiModelProperty(name = "name")
private String name; private String name;
/** /**
* DAG工作流描述 * DAG工作流描述
*/ */
@ApiModelProperty(name = "description")
private String description; private String description;
/** /**
* DAG图 * DAG图
*/ */
@ApiModelProperty(name = "dag")
private String dag; private String dag;
/** /**
* 创建者 * 创建者
@@ -63,6 +67,7 @@ public class Workflow extends BaseMetaObjectHandler implements Serializable {
/** /**
* 0,失效 1生效 * 0,失效 1生效
*/ */
@ApiModelProperty(name = "state")
private Integer state; private Integer state;






Loading…
Cancel
Save