From caf4e973645ed9d59e41bd2f08a9a26d4788d75f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A5=BF=E5=A4=A7=E9=94=90?= <1070211640@qq.com> Date: Wed, 17 Apr 2024 08:44:07 +0800 Subject: [PATCH] =?UTF-8?q?=E9=95=9C=E5=83=8F=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/controller/image/ImageController.java | 12 ++++++++---- .../java/com/ruoyi/platform/mapper/DatasetDao.java | 2 +- .../platform/service/impl/ImageServiceImpl.java | 2 +- .../mapper/managementPlatform/ImageDaoMapper.xml | 4 ++-- 4 files changed, 12 insertions(+), 8 deletions(-) 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 d26a4b24..ab839406 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 @@ -40,8 +40,11 @@ public class ImageController extends BaseController { * @return 查询结果 */ @GetMapping - @ApiOperation("分页查询") - public GenericsAjaxResult> queryByPage(Image image, int page, int size) { + @ApiOperation("分页查询，根据image_type查询公开镜像和自定义镜像; 1公开0私有") + public GenericsAjaxResult> 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 add(@RequestBody Image image) { return genericsSuccess(this.imageService.insert(image)); } @@ -101,6 +104,7 @@ public class ImageController extends BaseController { * @return 编辑结果 */ @PutMapping + @ApiOperation("编辑镜像") public GenericsAjaxResult 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 createImageFromNet(@RequestParam("name") String imageName, @RequestParam("tag") String imageTag, @RequestParam("path") String path) throws Exception { diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/DatasetDao.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/DatasetDao.java index 9deb0e0c..673f778a 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/DatasetDao.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/DatasetDao.java @@ -29,7 +29,7 @@ public interface DatasetDao { * @param pageable 分页对象 * @return 对象列表 */ - List queryAllByLimit(@Param("dataset")Dataset dataset, @Param("pageable") Pageable pageable); + List queryAllByLimit(@Param("dataset") Dataset dataset, @Param("pageable") Pageable pageable); /** * 统计总行数 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 90536e17..ef447ea9 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 @@ -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()); 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 9570b8a1..d24545dc 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 @@ -34,7 +34,7 @@ and img.id = #{image.id} - and img.name = #{image.name} + and img.name like "%"#{image.name}"%" and img.description = #{image.description} @@ -86,7 +86,7 @@ and id = #{image.id} - and name = #{image.name} + and name like "%"#{image.name}"%" and description = #{image.description}