From 4d9b28b341feced3a48624cb60136480da5c5eee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A5=BF=E5=A4=A7=E9=94=90?= <1070211640@qq.com>
Date: Mon, 1 Apr 2024 15:54:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=E5=8A=A0?=
=?UTF-8?q?=E4=B8=8A=E4=B8=AD=E6=96=87=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/ruoyi/platform/domain/Image.java | 46 +++++--------
.../ruoyi/platform/domain/ImageVersion.java | 67 ++++++-------------
.../com/ruoyi/platform/domain/Models.java | 48 +++++--------
.../ruoyi/platform/domain/ModelsVersion.java | 67 +++++++------------
.../com/ruoyi/platform/domain/Workflow.java | 52 +++++---------
5 files changed, 96 insertions(+), 184 deletions(-)
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Image.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Image.java
index f462a15b..08c5463c 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Image.java
+++ b/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;
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ImageVersion.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ImageVersion.java
index bac09494..ca20c4f2 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ImageVersion.java
+++ b/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;
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 26a4fd66..b79caea6 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
@@ -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;
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 c02eb970..09e05914 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
@@ -21,59 +21,40 @@ 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 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;
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 f4ddff72..487f7653 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
@@ -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;
From 11608a84adafc86d285eb3ac072971460c5639d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A5=BF=E5=A4=A7=E9=94=90?= <1070211640@qq.com>
Date: Tue, 2 Apr 2024 15:51:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B5=84=E4=BA=A7=E5=9B=BE=E6=A0=87?=
=?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mapper/managementPlatform/AssetIconDaoMapper.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/AssetIconDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/AssetIconDaoMapper.xml
index 89d9a82d..21422c29 100644
--- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/AssetIconDaoMapper.xml
+++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/AssetIconDaoMapper.xml
@@ -53,7 +53,7 @@
and id = #{assetIcon.id}
- and name = #{assetIcon.name}
+ and name like "%"#{assetIcon.name}"%"
and category_id = #{assetIcon.categoryId}
@@ -94,7 +94,7 @@
and id = #{assetIcon.id}
- and name = #{assetIcon.name}
+ and name like "%"#{assetIcon.name}"%"
and category_id = #{assetIcon.categoryId}