Merge branch 'dev' of code.gitlink.org.cn:ci4s/ci4sManagement-cloud into dev

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetController.java

@@ -91,7 +91,7 @@ public class DatasetController {
      * @return 单条数据
      */
     @GetMapping("{id}")
-    @ApiOperation("根据id查询数据集")
+    @ApiOperation("根据数据集id查询数据集")
     public AjaxResult queryById(@PathVariable("id") Integer id) {
         return AjaxResult.success(this.datasetService.queryById(id));
     }
@@ -148,7 +148,7 @@ public class DatasetController {
      * @return 删除是否成功
      */
     @DeleteMapping({"{id}"})
-    @ApiOperation("删除数据集")
+    @ApiOperation("根据id删除数据集")
     public AjaxResult deleteById(@PathVariable("id") Integer id) {
         return AjaxResult.success(this.datasetService.removeById(id));
     }

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentInsController.java

@@ -175,7 +175,7 @@ public class ExperimentInsController extends BaseController {
      */
     @GetMapping("/nodeResult")
     @ApiOperation("查询实例节点结果")
-    public GenericsAjaxResult<List> getNodeResult(@RequestParam("id") Integer id, @RequestParam("node_id") String nodeId) throws Exception {
+    public GenericsAjaxResult<List> getNodeResult(@PathVariable("id") Integer id, @PathVariable("node_id") String nodeId) throws Exception {
         return genericsSuccess(this.experimentInsService.getNodeResult(id,nodeId));
     }
 

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/labelStudio/labelStudioController.java

@@ -0,0 +1,31 @@
+package com.ruoyi.platform.controller.labelStudio;
+
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.domain.GenericsAjaxResult;
+import com.ruoyi.platform.service.JupyterService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+@RestController
+@RequestMapping("/labelStudio")
+@Api("labelStudio service")
+public class labelStudioController extends BaseController {
+    @Value("${labelStudio.url}")
+    private String url;
+    @GetMapping(value = "/getURL")
+    @ApiOperation("得到访问地址")
+    public GenericsAjaxResult<String> getURL() throws IOException {
+        return genericsSuccess(url);
+    }
+}

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/AssetIcon.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;
@@ -18,40 +19,34 @@ public class AssetIcon implements Serializable {
 /**
      * 主键
      */
-    private Integer id;
-/**
-     * 资产图标名称
-     */
+@ApiModelProperty(value = "资产ID")
+private Integer id;
+
+    @ApiModelProperty(value = "资产图标名称")
     private String name;
-/**
-     * 分类id
-     */
+
+    @ApiModelProperty(value = "分类ID")
     private Integer categoryId;
-/**
-     * 路径
-     */
+
+    @ApiModelProperty(value = "路径")
     private String path;
-/**
-     * 描述
-     */
+
+    @ApiModelProperty(value = "描述")
     private String description;
-/**
-     * 创建者
-     */
+
+    @ApiModelProperty(value = "创建者")
     private String createBy;
 
+    @ApiModelProperty(value = "创建时间")
     private Date createTime;
-/**
-     * 更新者
-     */
+
+    @ApiModelProperty(value = "更新者")
     private String updateBy;
-/**
-     * 更新时间
-     */
+
+    @ApiModelProperty(value = "更新时间")
     private Date updateTime;
-/**
-     * 0失效，1生效
-     */
+
+    @ApiModelProperty(value = "状态，0失效，1生效")
     private Integer state;
 
 

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

@@ -20,108 +20,108 @@ public class Component implements Serializable {
     /**
      * 主键
      */
-    @ApiModelProperty(name = "id")
+    @ApiModelProperty(name = "id", value = "主键")
     private Integer id;
     /**
      * 类别ID，数据字典配置
      */
-    @ApiModelProperty(name = "category_id")
+    @ApiModelProperty(name = "category_id" ,value = "类别id")
     private Integer categoryId;
     /**
      * 组件name
      */
-    @ApiModelProperty(name = "category_name")
+    @ApiModelProperty(name = "category_name", value = "组件名称")
     private String componentName;
     /**
      * 组件面板名
      */
-    @ApiModelProperty(name = "component_label")
+    @ApiModelProperty(name = "component_label" , value = "组件面板名" )
     private String componentLabel;
     /**
      * 镜像
      */
     @JsonProperty("image")
-    @ApiModelProperty(name = "image")
+    @ApiModelProperty(name = "image" ,value = "镜像")
     private String images;
     /**
      * 工作目录
      */
-    @ApiModelProperty(name = "working_directory")
+    @ApiModelProperty(name = "working_directory" , value = "工作目录")
     private String workingDirectory;
     /**
      * 启动命令
      */
-    @ApiModelProperty(name = "command")
+    @ApiModelProperty(name = "command" , value = "启动命令")
     private String command;
     /**
      * 环境变量
      */
     @JsonProperty("env_variables")
-    @ApiModelProperty(name = "env_variables")
+    @ApiModelProperty(name = "env_variables", value = "环境变量")
     private String envVirables;
     /**
      * 资源规格
      */
-    @ApiModelProperty(name = "resources_standard")
+    @ApiModelProperty(name = "resources_standard" , value = "资源规格")
     private String resourcesStandard;
     /**
      * 控制策略
      */
-    @ApiModelProperty(name = "control_strategy")
+    @ApiModelProperty(name = "control_strategy" ,value = "控制策略")
     private String controlStrategy;
     /**
      * 挂载路径
      */
-    @ApiModelProperty(name = "mount_path")
+    @ApiModelProperty(name = "mount_path" , value = "挂载路径")
     private String mountPath;
     /**
      * 输入参数
      */
-    @ApiModelProperty(name = "in_parameters")
+    @ApiModelProperty(name = "in_parameters" ,value = "输入参数")
     private String inParameters;
     /**
      * 输出参数
      */
-    @ApiModelProperty(name = "out_parameters")
+    @ApiModelProperty(name = "out_parameters" ,value = "输出参数")
     private String outParameters;
     /**
      * 描述
      */
-    @ApiModelProperty(name = "description")
+    @ApiModelProperty(name = "description" , value = "描述")
     private String description;
 
     /**
      * 图标路径
      */
-    @ApiModelProperty(name = "icon_path")
+    @ApiModelProperty(name = "icon_path" ,value = "图标路径")
     private String iconPath;
     /**
      * 创建者
      */
 
     //@JsonProperty("creater")
-    @ApiModelProperty(name = "create_by")
+    @ApiModelProperty(name = "create_by" ,value = "创建者")
     private String createBy;
     /**
      * 创建时间
      */
-    @ApiModelProperty(name = "create_time")
+    @ApiModelProperty(name = "create_time" , value = "创建时间")
     private Date createTime;
     /**
      * 更新者
      */
     //@JsonProperty("modify_by")
-    @ApiModelProperty(name = "update_by")
+    @ApiModelProperty(name = "update_by" , value = "更新者")
     private String updateBy;
     /**
      * 更新时间
      */
-    @ApiModelProperty(name = "update_time")
+    @ApiModelProperty(name = "update_time" , value = "更新时间")
     private Date updateTime;
     /**
      * 0,失效 1生效
      */
-    @ApiModelProperty(name = "state")
+    @ApiModelProperty(name = "state" , value = "状态")
     private Integer state;
 
     public Integer getId() {

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/Dataset.java

@@ -22,53 +22,58 @@ public class Dataset implements Serializable {
     private Integer id;
 
     @CheckDuplicate
-    @ApiModelProperty(name = "name")
+    @ApiModelProperty(value = "名称")
     private String name;
 
-    @ApiModelProperty(name = "description")
+    @ApiModelProperty(value = "描述")
     private String description;
 
     /**
      * 是否公开: 1公开，0私有
      */
-    @ApiModelProperty(name = "available_range")
+    @ApiModelProperty(value = "是否公开：1公开，0私有")
     private int availableRange;
 
     /**
      * 数据集类型
      */
-    @ApiModelProperty(name = "data_type")
+    @ApiModelProperty(value = "数据集类型")
     private String dataType;
 
     /**
-     * 数据集tag
+     * 数据集标签
      */
-    @ApiModelProperty(name = "data_tag")
+    @ApiModelProperty(value = "数据集标签")
     private String dataTag;
+
     /**
      * 创建者
      */
-    @ApiModelProperty(name = "create_by")
+    @ApiModelProperty(value = "创建者")
     private String createBy;
+
     /**
      * 创建时间
      */
-    @ApiModelProperty(name = "create_time")
+    @ApiModelProperty(value = "创建时间")
     private Date createTime;
+
     /**
      * 更新者
      */
-    @ApiModelProperty(name = "update_by")
+    @ApiModelProperty(value = "更新者")
     private String updateBy;
+
     /**
      * 更新时间
      */
-    @ApiModelProperty(name = "update_time")
+    @ApiModelProperty(value = "更新时间")
     private Date updateTime;
-/**
-     * 0,失效 1生效
+
+    /**
+     * 状态，0失效，1生效
      */
-    @ApiModelProperty(name = "state")
+    @ApiModelProperty(value = "状态：0失效，1生效")
     private Integer state;
 
 

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

@@ -22,66 +22,49 @@ public class DatasetVersion implements Serializable {
      */
     @ApiModelProperty(name = "id")
     private Integer id;
-    @ApiModelProperty(name = "dataset_id")
+
+    @ApiModelProperty(value = "数据集ID")
     private Integer datasetId;
-    /**
-     * 版本
-     */
-    @ApiModelProperty(name = "version")
+
+    @ApiModelProperty(value = "版本")
     private String version;
-    /**
-     * 数据集存储地址
-     */
-    @ApiModelProperty(name = "url")
+
+    @ApiModelProperty(value = "数据集存储地址")
     @CheckDuplicate
     private String url;
-    /**
-     * 文件名
-     */
-    @ApiModelProperty(name = "file_name")
+
+    @ApiModelProperty(value = "文件名")
     private String fileName;
-    /**
-     * 文件大小
-     */
-    @ApiModelProperty(name = "file_size")
+
+    @ApiModelProperty(value = "文件大小")
     private String fileSize;
-   /**
-     * 可用集群
-     */
-    @ApiModelProperty(name = "available_cluster")
+
+    @ApiModelProperty(value = "可用集群")
     private String availableCluster;
-    /**
-     * 状态
-     */
-    @ApiModelProperty(name = "status")
+
+    @ApiModelProperty(value = "状态")
     private Integer status;
-    /**
-     * 创建者
-     */
-    @ApiModelProperty(name = "create_by")
+
+    @ApiModelProperty(value = "描述")
+    private String description;
+
+    @ApiModelProperty(value = "创建者")
     private String createBy;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(name = "create_time")
+
+    @ApiModelProperty(value = "创建时间")
     private Date createTime;
-    /**
-     * 更新者
-     */
-    @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 = "状态：0失效，1生效")
     private Integer state;
 
 
+
     public Integer getId() {
         return id;
     }
@@ -146,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/Experiment.java

@@ -25,46 +25,43 @@ import java.util.List;
 @ApiModel("实验对象")
 public class Experiment implements Serializable {
     private static final long serialVersionUID = 409135817108439880L;
-//    @ApiModelProperty(name = "id")
+    @ApiModelProperty(value = "主键")
     private Integer id;
-//    @ApiModelProperty(name = "name")
+    @ApiModelProperty(value = "名称")
     private String name;
-//    @ApiModelProperty(name = "workflow_id")
+
+    @ApiModelProperty(value = "工作流ID")
     private Long workflowId;
-    /**
-     * 全局参数
-     */
-    @ApiModelProperty(name = "global_param")
+
+    @ApiModelProperty(value = "全局参数，以JSON字符串格式存储")
     @JsonRawValue
     private String globalParam;
 
+    @ApiModelProperty(value = "状态列表")
     private String statusList;
-    /**
-     * 简介
-     */
-    @ApiModelProperty(name = "description")
+
+    @ApiModelProperty(value = "简介")
     private String description;
-    /**
-     * 创建者
-     */
+
+    @ApiModelProperty(value = "创建者")
     private String createBy;
-    /**
-     * 创建时间
-     */
+
+    @ApiModelProperty(value = "创建时间")
     private Date createTime;
-    /**
-     * 更新者
-     */
+
+    @ApiModelProperty(value = "更新者")
     private String updateBy;
-    /**
-     * 更新时间
-     */
+
+    @ApiModelProperty(value = "更新时间")
     private Date updateTime;
-    /**
-     * 0,失效 1生效
-     */
+
+    @ApiModelProperty(value = "状态：0失效，1生效")
     private Integer state;
+
+    @ApiModelProperty(value = "对应的实例列表")
     private List<ExperimentIns> experimentInsList;
+
+    @ApiModelProperty(value = "对应的流水线名称")
     private String workflowName;
     public String getName() {
         return name;

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

@@ -24,79 +24,53 @@ public class ExperimentIns implements Serializable {
     /**
      * 实验ID
      */
-    @ApiModelProperty(name = "experiment_id")
+    @ApiModelProperty(value = "实验ID")
     private Integer experimentId;
-    /**
-     * argo返回name
-     */
-    @ApiModelProperty(name = "argo_ins_name")
+
+    @ApiModelProperty(value = "Argo实例名称")
     private String argoInsName;
-    /**
-     * argo返回命名空间
-     */
-    @ApiModelProperty(name = "argo_ins_ns")
+
+    @ApiModelProperty(value = "Argo命名空间")
     private String argoInsNs;
-    /**
-     * 实例运行状态
-     */
-    @ApiModelProperty(name = "status")
+
+    @ApiModelProperty(value = "实例运行状态")
     private String status;
-    @ApiModelProperty(name = "nodes_status")
-    private String nodesStatus;
-    @ApiModelProperty(name = "nodes_result")
-    private String nodesResult;
-    @ApiModelProperty(name = "nodes_logs")
-    private String nodesLogs;
 
+    @ApiModelProperty(value = "节点状态")
+    private String nodesStatus;
 
+    @ApiModelProperty(value = "节点结果")
+    private String nodesResult;
 
-    /**
-     * 实验实例全局参数
-     */
-//    @ApiModelProperty(name = "global_param")
+    @ApiModelProperty(value = "节点日志")
+    private String nodesLogs;
 
+    @ApiModelProperty(value = "实验实例全局参数", notes = "以JSON字符串格式存储")
     @JsonRawValue
     private String globalParam;
 
-    /**
-     * 开始时间
-     */
-    @ApiModelProperty(name = "start_time")
+    @ApiModelProperty(value = "开始时间")
     private Date startTime;
 
-    /**
-     * 结束时间
-     */
-    @ApiModelProperty(name = "finish_time")
+    @ApiModelProperty(value = "结束时间")
     private Date finishTime;
 
-
-    /**
-     * 创建者
-     */
-    @ApiModelProperty(name = "create_by")
+    @ApiModelProperty(value = "创建者")
     private String createBy;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(name = "create_time")
+
+    @ApiModelProperty(value = "创建时间")
     private Date createTime;
-    /**
-     * 更新者
-     */
-    @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 = "状态：0失效，1生效")
     private Integer state;
 
+
     public ExperimentIns() {
     }
 

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

@@ -19,51 +19,37 @@ public class Image implements Serializable {
 /**
      * 主键
      */
+    @ApiModelProperty(value = "主键")
     private Integer id;
 /**
      * 镜像名称
      */
-    @ApiModelProperty(name = "name")
+    @ApiModelProperty(value = "名称")
     private String name;
-/**
-     * 镜像描述
-     */
-    @ApiModelProperty(name = "description")
+
+    @ApiModelProperty(value = "镜像描述")
     private String description;
-/**
-     * 镜像类型
-     */
 
-    @ApiModelProperty(name = "image_type")
+    @ApiModelProperty(value = "镜像类型")
     private Integer imageType;
-/**
-     * 创建者
-     */
 
-    @ApiModelProperty(name = "create_by")
+    @ApiModelProperty(value = "创建者")
     private String createBy;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(name = "create_time")
+
+    @ApiModelProperty(value = "创建时间")
     private Date createTime;
-    /**
-     * 更新者
-     */
-    @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 = "状态，0失效，1生效")
     private Integer state;
 
-    private Integer versionCount; // 版本数量统计
+    @ApiModelProperty(value = "版本数量统计")
+    private Integer versionCount;
 
 
 

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

@@ -20,63 +20,40 @@ public class ImageVersion implements Serializable {
      * 主键
 
      */
-    @ApiModelProperty(name = "id")
+    @ApiModelProperty(value = "ID")
     private Integer id;
-    /**
-     * 对应的镜像id
-     */
-    @ApiModelProperty(name = "image_id")
+
+    @ApiModelProperty(value = "对应的镜像ID")
     private Integer imageId;
-    /**
-     * 镜像版本
-     */
-    @ApiModelProperty(name = "version")
+
+    @ApiModelProperty(value = "镜像版本")
     private String version;
-    /**
-     * 镜像推送地址
-     */
-    @ApiModelProperty(name = "url")
+
+    @ApiModelProperty(value = "镜像推送地址")
     private String url;
-    /**
-     * 镜像tag名称
-     */
-    @ApiModelProperty(name = "tag_name")
+
+    @ApiModelProperty(value = "镜像tag名称")
     private String tagName;
 
-    /**
-     * 镜像文件大小
-     */
-    @ApiModelProperty(name = "file_size")
+    @ApiModelProperty(value = "镜像文件大小")
     private String fileSize;
-    /**
-     * 镜像构建状态
-     */
-    @ApiModelProperty(name = "status")
+
+    @ApiModelProperty(value = "镜像构建状态")
     private String status;
-    /**
-     * 创建者
-     */
-    @ApiModelProperty(name = "create_by")
+
+    @ApiModelProperty(value = "创建者")
     private String createBy;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(name = "create_time")
+
+    @ApiModelProperty(value = "创建时间")
     private Date createTime;
-    /**
-     * 更新者
-     */
-    @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 = "状态，0失效，1生效")
     private Integer state;
 
 

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

@@ -18,51 +18,37 @@ import java.io.Serializable;
 @ApiModel("模型对象")
 public class Models implements Serializable {
     private static final long serialVersionUID = -59896385986032571L;
-    @ApiModelProperty(name = "id")
+    @ApiModelProperty(value = "ID")
     private Integer id;
-    @ApiModelProperty(name = "name")
+
+    @ApiModelProperty(value = "模型名称")
     private String name;
 
-//    private String version;
-    @ApiModelProperty(name = "description")
+    @ApiModelProperty(value = "模型描述")
     private String description;
 
-    /**
-     * 模型可见范围
-     */
-    @ApiModelProperty(name = "available_range")
+    @ApiModelProperty(value = "模型可见范围，1表示公开，0表示私有")
     private int availableRange;
 
-
-    @ApiModelProperty(name = "model_type")
+    @ApiModelProperty(value = "模型类型")
     private String modelType;
-    @ApiModelProperty(name = "model_tag")
+
+    @ApiModelProperty(value = "模型标签")
     private String modelTag;
-    /**
-     * 创建者
-     */
-    @ApiModelProperty(name = "create_by")
+
+    @ApiModelProperty(value = "创建者")
     private String createBy;
 
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(name = "create_time")
+    @ApiModelProperty(value = "创建时间")
     private Date createTime;
-    /**
-     * 更新者
-     */
-    @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 = "状态，0失效，1生效")
     private Integer state;
 
 

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

@@ -21,59 +21,43 @@ public class ModelsVersion implements Serializable {
 /**
      * 主键
      */
-    @ApiModelProperty(name = "id")
-    private Integer id;
-    @ApiModelProperty(name = "models_id")
+@ApiModelProperty(value = "ID")
+private Integer id;
+
+    @ApiModelProperty(value = "模型ID")
     private Integer modelsId;
-/**
-     * 版本
-     */
-    @ApiModelProperty(name = "version")
+
+    @ApiModelProperty(value = "版本")
     private String version;
-/**
-     * 模型存储地址
-     */
-    @ApiModelProperty(name = "url")
+
+    @ApiModelProperty(value = "模型存储地址")
     private String url;
-/**
-     * 文件名
-     */
-    @ApiModelProperty(name = "file_name")
+
+    @ApiModelProperty(value = "文件名")
     private String fileName;
-/**
-     * 文件大小
-     */
-    @ApiModelProperty(name = "file_size")
+
+    @ApiModelProperty(value = "文件大小")
     private String fileSize;
-/**
-     * 状态
-     */
-    @ApiModelProperty(name = "status")
+
+    @ApiModelProperty(value = "状态")
     private Integer status;
-    /**
-     * 创建者
-     */
-    @ApiModelProperty(name = "create_by")
+
+    @ApiModelProperty(value = "模型版本描述")
+    private String description;
+
+    @ApiModelProperty(value = "创建者")
     private String createBy;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(name = "create_time")
+
+    @ApiModelProperty(value = "创建时间")
     private Date createTime;
-    /**
-     * 更新者
-     */
-    @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 = "状态，0失效，1生效")
     private Integer state;
 
 
@@ -133,6 +117,14 @@ public class ModelsVersion 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/Workflow.java

@@ -29,53 +29,35 @@ public class Workflow extends BaseMetaObjectHandler implements Serializable {
     /**
      * id
      */
-    @TableId
-    @ApiModelProperty(name = "id")
+    @ApiModelProperty(value = "ID")
     private Long id;
-    /**
-     * 工作流名称
-     */
-    @ApiModelProperty(name = "name")
+
+    @ApiModelProperty(value = "工作流名称")
     private String name;
-    /**
-     * DAG工作流描述
-     */
-    @ApiModelProperty(name = "description")
+
+    @ApiModelProperty(value = "流水线描述")
     private String description;
-    /**
-     * DAG图
-     */
-    @ApiModelProperty(name = "dag")
+
+    @ApiModelProperty(value = "DAG图")
     private String dag;
 
-//    @ApiModelProperty(name = "global_param")
     @JsonRawValue
+    @ApiModelProperty(value = "全局参数")
     private String globalParam;
 
-    /**
-     * 创建者
-     */
-    @ApiModelProperty(name = "create_by")
+    @ApiModelProperty(value = "创建者")
     private String createBy;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(name = "create_time")
+
+    @ApiModelProperty(value = "创建时间")
     private Date createTime;
-    /**
-     * 更新者
-     */
-    @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 = "状态，0失效，1生效")
     private Integer state;
 
 

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ExperimentInsDao.java

@@ -90,5 +90,7 @@ public interface ExperimentInsDao {
     List<ExperimentIns> getByExperimentId(Integer experimentId);
 
     List<ExperimentIns> queryByExperiment(@Param("experimentIns") ExperimentIns experimentIns);
+
+    List<ExperimentIns> queryByExperimentId(Integer id);
 }
 

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java

@@ -60,18 +60,6 @@ public class DatasetServiceImpl implements DatasetService {
     @Resource
     private DatasetVersionService datasetVersionService;
 
-
-    private MinioClient minioClient;
-
-    @Value("${minio.endpoint}")
-    private String minioEndpoint;
-
-    @Value("${minio.accessKey}")
-    private String minioAccessKey;
-
-    @Value("${minio.secretKey}")
-    private String minioSecretKey;
-
     // 固定存储桶名
     private final String bucketName = "platform-data";
 

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java

@@ -95,7 +95,7 @@ public class ExperimentInsServiceImpl implements ExperimentInsService {
         //搞个标记，当状态改变才去改表
         boolean flag = false;
         List<ExperimentIns> result = new ArrayList<ExperimentIns>();
-        if (experimentInsList!=null&& experimentInsList.size()>0) {
+        if (experimentInsList!=null && experimentInsList.size()>0) {
             for (ExperimentIns experimentIns : experimentInsList) {
                 //当原本状态为null或非终止态时才调用argo接口
                 if (experimentIns != null && (StringUtils.isEmpty(experimentIns.getStatus())) || !isTerminatedState(experimentIns)) {
@@ -111,11 +111,9 @@ public class ExperimentInsServiceImpl implements ExperimentInsService {
                 }
 
                 //新增查询tensorBoard容器状态
-
                 result.add(experimentIns);
             }
         }
-
         if (flag) {
             List<String> statusList = new ArrayList<String>();
             // 更新实验状态列表
@@ -231,9 +229,7 @@ public class ExperimentInsServiceImpl implements ExperimentInsService {
 
     @Override
     public List<ExperimentIns> queryByExperimentId(Integer id) {
-        ExperimentIns experimentIns = new ExperimentIns();
-        experimentIns.setExperimentId(id);
-        return experimentInsDao.queryByExperiment(experimentIns);
+        return experimentInsDao.queryByExperimentId(id);
     }
 
     @Override

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java

@@ -226,9 +226,10 @@ public class ExperimentServiceImpl implements ExperimentService {
             // 组装运行接口json
             Map<String, Object> runReqMap = new HashMap<>();
             runReqMap.put("data", converMap.get("data"));
+            //这里全局参数是一个json数组，需要转换成一个list<Map>
             List<Map<String, Object>> params = JacksonUtil.parseJSONStr2MapList(StringUtils.isEmpty(experiment.getGlobalParam()) ? "[]" : experiment.getGlobalParam());
             runReqMap.put("params", params);
-            //runReqMap.put("params", JsonUtils.jsonToMap(StringUtils.isEmpty(experiment.getGlobalParam())?"{}":experiment.getGlobalParam()));
+
             runReqMap.put("experiment", new HashMap<String, Object>().put("name", "experiment-"+experiment.getId()));
 
             Map<String ,Object> output = (Map<String, Object>) converMap.get("output");
@@ -254,6 +255,8 @@ public class ExperimentServiceImpl implements ExperimentService {
             experimentIns.setArgoInsNs((String) metadata.get("namespace"));
             experimentIns.setArgoInsName((String) metadata.get("name"));
             //传入实验全局参数
+
+
             experimentIns.setGlobalParam(experiment.getGlobalParam());
 
             //替换argoInsName
@@ -265,10 +268,9 @@ public class ExperimentServiceImpl implements ExperimentService {
         }catch (Exception e){
             throw new RuntimeException(e);
         }
-        List<ExperimentIns> experimentIns = experimentInsService.queryByExperimentId(id);
-
+        List<ExperimentIns> updatedExperimentInsList = experimentInsService.getByExperimentId(id);
 
-        experiment.setExperimentInsList(experimentIns);
+        experiment.setExperimentInsList(updatedExperimentInsList);
 
         return experiment;
     }

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java

@@ -52,18 +52,9 @@ public class ModelsServiceImpl implements ModelsService {
     @Resource
     private ModelsVersionDao modelsVersionDao;
 
-    private MinioClient minioClient;
     @Resource
     private ModelsVersionService modelsVersionService;
 
-    @Value("${minio.endpoint}")
-    private String minioEndpoint;
-
-    @Value("${minio.accessKey}")
-    private String minioAccessKey;
-
-    @Value("${minio.secretKey}")
-    private String minioSecretKey;
 
     // 固定存储桶名
     private final String bucketName = "platform-data";

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/K8sClientUtil.java

@@ -14,9 +14,12 @@ import io.kubernetes.client.util.Watch;
 import io.kubernetes.client.util.credentials.AccessTokenAuthentication;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+import org.apache.poi.ss.formula.functions.T;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.PostConstruct;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.util.HashMap;
@@ -37,6 +40,7 @@ public class K8sClientUtil {
 
     @Value("${k8s.token}")
     private String token;
+
     /**
      * k8s-api客户端
      */
@@ -50,17 +54,23 @@ public class K8sClientUtil {
      * 3. service-account namespace
      * 4. master endpoints(ip, port) from pre-set environment variables
      */
-    public K8sClientUtil() {
-        try {
+//    @Autowired
+//    public K8sClientUtil() {
+//        try {
+//            this.apiClient = new ClientBuilder().
+//                    setBasePath(http).setVerifyingSsl(false).
+//                    setAuthentication(new AccessTokenAuthentication(token)).build();
+//        } catch (Exception e) {
+//            log.error("构建K8s-Client异常", e);
+//            throw new RuntimeException("构建K8s-Client异常");
+//        }
+//    }
+    @PostConstruct
+    public void init() {
             this.apiClient = new ClientBuilder().
-                    setBasePath("https://172.20.32.181:6443").setVerifyingSsl(false).
-                    setAuthentication(new AccessTokenAuthentication("eyJhbGciOiJSUzI1NiIsImtpZCI6IjRWcFBPWl9YSFFxQ2tVanRuNHdRT1dnUlJNTnB2bG5TQlVSRjNKdExWNDQifQ.eyJpc3MiOiJrdWJlcm5ldGVzL3NlcnZpY2VhY2NvdW50Iiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9uYW1lc3BhY2UiOiJkZWZhdWx0Iiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9zZWNyZXQubmFtZSI6ImFkbWluLXNlcnZpY2UtYWNjb3VudC10b2tlbi14ZDk5eiIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VydmljZS1hY2NvdW50Lm5hbWUiOiJhZG1pbi1zZXJ2aWNlLWFjY291bnQiLCJrdWJlcm5ldGVzLmlvL3NlcnZpY2VhY2NvdW50L3NlcnZpY2UtYWNjb3VudC51aWQiOiJmMGEzNmYyMS01MjQyLTQ4MTAtYWVmZS0xOTEwOTZlZjc5YmUiLCJzdWIiOiJzeXN0ZW06c2VydmljZWFjY291bnQ6ZGVmYXVsdDphZG1pbi1zZXJ2aWNlLWFjY291bnQifQ.fo-Wf0-5-IRC5fhRh65yfqCJqKfE9MrNFIXL2fd1CqVAHD7JBpWO2IsFiSmz9Bm7VfLmFAp2NB7DjW4ZLjC7ODiGhpSseBP8x4ceFuHL6pRGUsEBvHQBBBuQcGhNOcsxIDHnDqUdUzoLprj223lMZNTQowITuqYFU4GVbethyEuS6G5Wh9KHI3KYHFtG4_AeWBgI5Ppz8pDrhHzSFWTFbzxQ3RPGEwF0V-9wEtdrSYnfETi3rdRWif9W4a0RW8HwD9Gf7UCYcyFOs7e5_3-IvmctS85g87PYIfHXMhu_kOw-_Il4bkwPEK5uiBFDw0M1-s9YP-F9r5sXXvOJlsAr1g")).build();
-        } catch (Exception e) {
-            log.error("构建K8s-Client异常", e);
-            throw new RuntimeException("构建K8s-Client异常");
-        }
-    }
-
+                    setBasePath(http).setVerifyingSsl(false).
+                    setAuthentication(new AccessTokenAuthentication(token)).build();
+     }
 
     /**
      * 构建集群外通过UA访问的客户端

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/MinioUtil.java

@@ -5,9 +5,9 @@ import io.minio.*;
 import io.minio.errors.MinioException;
 import io.minio.messages.Item;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.io.InputStreamResource;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.PostConstruct;
 import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
@@ -21,11 +21,21 @@ import java.util.zip.ZipOutputStream;
 
 @Component
 public class MinioUtil {
+
+    @Value("${minio.endpoint}")
+    private String minioEndpoint;
+
+    @Value("${minio.accessKey}")
+    private String minioAccessKey;
+
+    @Value("${minio.secretKey}")
+    private String minioSecretKey;
     private MinioClient minioClient;
-    public MinioUtil() {
+    @PostConstruct
+    public void init() {
         this.minioClient = MinioClient.builder()
-                .endpoint("http://172.20.32.181:30164")
-                .credentials("admin", "qazxc123456.")
+                .endpoint(minioEndpoint)
+                .credentials(minioAccessKey, minioSecretKey)
                 .build();
     }
     public void createBucket(String bucketName) throws Exception {

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

@@ -53,7 +53,7 @@
                 and id = #{assetIcon.id}
             </if>
             <if test="assetIcon.name != null and assetIcon.name != ''">
-                and name = #{assetIcon.name}
+                and name like "%"#{assetIcon.name}"%"
             </if>
             <if test="assetIcon.categoryId != null">
                 and category_id = #{assetIcon.categoryId}
@@ -94,7 +94,7 @@
                 and id = #{assetIcon.id}
             </if>
             <if test="assetIcon.name != null and assetIcon.name != ''">
-                and name = #{assetIcon.name}
+                and name like "%"#{assetIcon.name}"%"
             </if>
             <if test="assetIcon.categoryId != null">
                 and category_id = #{assetIcon.categoryId}

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/ExperimentInsDaoMapper.xml

@@ -11,6 +11,7 @@
         <result property="nodesStatus" column="nodes_status" jdbcType="VARCHAR"/>
         <result property="nodesResult" column="nodes_result" jdbcType="VARCHAR"/>
         <result property="nodesLogs" column="nodes_logs" jdbcType="VARCHAR"/>
+        <result property="globalParam" column="global_param" jdbcType="VARCHAR"/>
         <result property="startTime" column="start_time" jdbcType="TIMESTAMP"/>
         <result property="finishTime" column="finish_time" jdbcType="TIMESTAMP"/>
         <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
@@ -31,7 +32,7 @@
 
     <!--查询列表-->
     <select id="getByExperimentId" resultMap="ExperimentInsMap">
-        select id, experiment_id, argo_ins_name, argo_ins_ns, status, nodes_status,nodes_result, nodes_logs,global_param, start_time, finish_time, create_by, create_time, update_by, update_time, state
+        select id, experiment_id, argo_ins_name, argo_ins_ns, status, nodes_status,nodes_result, nodes_logs, global_param, start_time, finish_time, create_by, create_time, update_by, update_time, state
         from experiment_ins
         where experiment_id = #{experiment_id} and state = 1
         order by create_time DESC
@@ -195,6 +196,12 @@
         </where>
     </select>
 
+    <select id="queryByExperimentId" resultMap="ExperimentInsMap">
+        select id, experiment_id, argo_ins_name, argo_ins_ns, status, nodes_status,nodes_result, nodes_logs, global_param, start_time, finish_time, create_by, create_time, update_by, update_time, state
+        from experiment_ins
+        where experiment_id = #{id} and state = 1
+    </select>
+
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
         insert into experiment_ins(experiment_id,argo_ins_name,argo_ins_ns,status,nodes_status,nodes_result,nodes_logs,global_param,start_time,finish_time,create_by,create_time,update_by,update_time,state)

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>