镜像接口修改分页查询bug

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/image/ImageController.java

@@ -40,8 +40,11 @@ public class ImageController extends BaseController {
      * @return 查询结果
      */
     @GetMapping
-    @ApiOperation("分页查询")
-    public GenericsAjaxResult<Page<Image>> queryByPage(Image image, int page, int size) {
+    @ApiOperation("分页查询，根据image_type查询公开镜像和自定义镜像; 1公开0私有")
+    public GenericsAjaxResult<Page<Image>> queryByPage(Image image, @RequestParam("page") int page,
+                                                       @RequestParam("size") int size,
+                                                       @RequestParam(value = "image_type") int imageType) {
+        image.setImageType(imageType);
         PageRequest pageRequest = PageRequest.of(page,size);
         return genericsSuccess(this.imageService.queryByPage(image, pageRequest));
     }
@@ -76,7 +79,7 @@ public class ImageController extends BaseController {
      * @return 新增结果
      */
     @PostMapping
-    @ApiOperation("新增镜像")
+    @ApiOperation("新增镜像,不包含镜像版本")
     public GenericsAjaxResult<Image> add(@RequestBody Image image) {
         return genericsSuccess(this.imageService.insert(image));
     }
@@ -101,6 +104,7 @@ public class ImageController extends BaseController {
      * @return 编辑结果
      */
     @PutMapping
+    @ApiOperation("编辑镜像")
     public GenericsAjaxResult<Image> edit(@RequestBody Image image) {
         return genericsSuccess(this.imageService.update(image));
     }
@@ -117,7 +121,7 @@ public class ImageController extends BaseController {
     }
 
     @PostMapping("/net")
-    @ApiOperation("从本地上传构建镜像")
+    @ApiOperation("从网络上传构建镜像")
     public GenericsAjaxResult<String> createImageFromNet(@RequestParam("name") String imageName,
                                                          @RequestParam("tag") String imageTag,
                                                          @RequestParam("path") String path) throws Exception {

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

@@ -29,7 +29,7 @@ public interface DatasetDao {
      * @param pageable         分页对象
      * @return 对象列表
      */
-    List<Dataset> queryAllByLimit(@Param("dataset")Dataset dataset, @Param("pageable") Pageable pageable);
+    List<Dataset> queryAllByLimit(@Param("dataset") Dataset dataset, @Param("pageable") Pageable pageable);
 
     /**
      * 统计总行数

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

@@ -113,7 +113,7 @@ public class ImageServiceImpl implements ImageService {
     public Image update(Image image) {
         int currentState = image.getState();
         if(currentState == 0){
-            throw new RuntimeException("模型已被删除，无法更新。");
+            throw new RuntimeException("镜像已被删除，无法更新。");
         }
         LoginUser loginUser = SecurityUtils.getLoginUser();
         image.setUpdateBy(loginUser.getUsername());

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

@@ -34,7 +34,7 @@
                 and img.id = #{image.id}
             </if>
             <if test="image.name != null and image.name != ''">
-                and img.name = #{image.name}
+                and img.name like "%"#{image.name}"%"
             </if>
             <if test="image.description != null and image.description != ''">
                 and img.description = #{image.description}
@@ -86,7 +86,7 @@
                 and id = #{image.id}
             </if>
             <if test="image.name != null and image.name != ''">
-                and name = #{image.name}
+                and name like "%"#{image.name}"%"
             </if>
             <if test="image.description != null and image.description != ''">
                 and description = #{image.description}