diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetVersionController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetVersionController.java
index b36ede47..9f6f5912 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetVersionController.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetVersionController.java
@@ -111,7 +111,7 @@ public class DatasetVersionController {
* @return 删除是否成功
*/
@DeleteMapping("/deleteVersion")
- @ApiOperation(value = "逻辑删除模型版本", notes = "根据模型ID和版本逻辑删除模型版本记录。")
+ @ApiOperation(value = "逻辑删除模型版本", notes = "根据数据集ID和版本逻辑删除模型版本记录。")
public AjaxResult deleteModelsVersion(@RequestParam("dataset_id") Integer datasetId,
@RequestParam("version") String version) {
return AjaxResult.success(this.datasetVersionService.deleteDatasetVersion(datasetId, version));
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/image/ImageController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/image/ImageController.java
index 7d61f453..54cd404e 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/image/ImageController.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/image/ImageController.java
@@ -4,6 +4,7 @@ import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.platform.domain.Image;
import com.ruoyi.platform.domain.Models;
import com.ruoyi.platform.service.ImageService;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
@@ -20,6 +21,7 @@ import javax.annotation.Resource;
*/
@RestController
@RequestMapping("image")
+@Api("镜像管理")
public class ImageController {
/**
* 服务对象
@@ -60,7 +62,8 @@ public class ImageController {
* @return 新增结果
*/
@PostMapping
- public AjaxResult add(Image image) {
+ @ApiOperation("新增镜像")
+ public AjaxResult add(@RequestBody Image image) {
return AjaxResult.success(this.imageService.insert(image));
}
@@ -71,7 +74,7 @@ public class ImageController {
* @return 编辑结果
*/
@PutMapping
- public AjaxResult edit(Image image) {
+ public AjaxResult edit(@RequestBody Image image) {
return AjaxResult.success(this.imageService.update(image));
}
@@ -81,8 +84,9 @@ public class ImageController {
* @param id 主键
* @return 删除是否成功
*/
- @DeleteMapping
- public AjaxResult deleteById(Integer id) {
+ @DeleteMapping("{id}")
+ public AjaxResult deleteById(@PathVariable("id") Integer id) {
+
return AjaxResult.success(this.imageService.removeById(id));
}
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 930038aa..abe20b36 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
@@ -1,5 +1,7 @@
package com.ruoyi.platform.domain;
+import io.swagger.annotations.ApiModelProperty;
+
import java.util.Date;
import java.io.Serializable;
@@ -18,34 +20,44 @@ public class Image implements Serializable {
/**
* 镜像名称
*/
+ @ApiModelProperty(name = "name")
private String name;
/**
* 镜像描述
*/
+ @ApiModelProperty(name = "description")
private String description;
/**
* 镜像类型
*/
+
+ @ApiModelProperty(name = "image_type")
private Integer imageType;
/**
* 创建者
*/
+
+ @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生效
*/
+ @ApiModelProperty(name = "state")
private Integer state;
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 a3984c1f..ff0a5bd3 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
@@ -1,5 +1,7 @@
package com.ruoyi.platform.domain;
+import io.swagger.annotations.ApiModelProperty;
+
import java.util.Date;
import java.io.Serializable;
@@ -11,53 +13,67 @@ import java.io.Serializable;
*/
public class ImageVersion implements Serializable {
private static final long serialVersionUID = 251017725389874890L;
-/**
+ /**
* 主键
+
*/
+ @ApiModelProperty(name = "id")
private Integer id;
-/**
+ /**
* 对应的镜像id
*/
+ @ApiModelProperty(name = "image_id")
private Integer imageId;
-/**
+ /**
* 镜像版本
*/
+ @ApiModelProperty(name = "version")
private String version;
-/**
+ /**
* 镜像推送地址
*/
+ @ApiModelProperty(name = "url")
private String url;
-/**
+ /**
* 镜像tag名称
*/
+ @ApiModelProperty(name = "tag_name")
private String tagName;
-/**
+
+ /**
* 镜像文件大小
*/
+ @ApiModelProperty(name = "file_size")
private String fileSize;
-/**
+ /**
* 镜像构建状态
*/
+ @ApiModelProperty(name = "status")
private String 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生效
*/
+ @ApiModelProperty(name = "state")
private Integer state;
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageServiceImpl.java
index 5b0da9e0..e1ee727a 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageServiceImpl.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ImageServiceImpl.java
@@ -116,7 +116,7 @@ public class ImageServiceImpl implements ImageService {
public String removeById(Integer id) {
Image image = this.imageDao.queryById(id);
if (image == null){
- return "模型不存在";
+ return "镜像不存在";
}
//判断权限,只有admin和创建者本身可以删除该数据集
diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ImageDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ImageDaoMapper.xml
index eed53095..64661a99 100644
--- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ImageDaoMapper.xml
+++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ImageDaoMapper.xml
@@ -25,81 +25,84 @@
+
-
insert into image(name,description,image_type,create_by,create_time,update_by,update_time,state)
- values (#{name}#{description}#{imageType}#{createBy}#{createTime}#{updateBy}#{updateTime}#{state})
+ values (#{image.name}, #{image.description}, #{image.imageType}, #{image.createBy}, #{image.createTime}, #{image.updateBy}, #{image.updateTime}, #{image.state})
+
insert into image(name,description,image_type,create_by,create_time,update_by,update_time,state)
values
@@ -122,32 +125,32 @@ name = values(name)description = values(description)image_type = values(image_ty
update image
-
- name = #{name},
+
+ name = #{image.name},
-
- description = #{description},
+
+ description = #{image.description},
-
- image_type = #{imageType},
+
+ image_type = #{image.imageType},
-
- create_by = #{createBy},
+
+ create_by = #{image.createBy},
-
- create_time = #{createTime},
+
+ create_time = #{image.createTime},
-
- update_by = #{updateBy},
+
+ update_by = #{image.updateBy},
-
- update_time = #{updateTime},
+
+ update_time = #{image.updateTime},
-
- state = #{state},
+
+ state = #{image.state},
- where id = #{id}
+ where id = #{image.id}
diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ImageVersionDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ImageVersionDaoMapper.xml
index b60b2d03..d7775b1f 100644
--- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ImageVersionDaoMapper.xml
+++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ImageVersionDaoMapper.xml
@@ -1,6 +1,6 @@
-
+
@@ -18,7 +18,7 @@
-