From bb64605dc426210dcd5d08511a6e362c515456cd Mon Sep 17 00:00:00 2001 From: yang <2119157836@qq.com> Date: Wed, 5 Feb 2025 13:28:58 +0800 Subject: [PATCH] =?UTF-8?q?refactor(mcwl):=20=E9=87=8D=E6=9E=84=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=8E=A5=E5=8F=A3=E5=B9=B6=E6=B7=BB=E5=8A=A0=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resource/MallProductController.java | 9 ++++--- .../resource/ModelImageController.java | 27 ++++++++++--------- .../java/com/mcwl/common/domain/IdsParam.java | 4 +++ 3 files changed, 25 insertions(+), 15 deletions(-) diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/MallProductController.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/MallProductController.java index 1a3ecb5..4562d0b 100644 --- a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/MallProductController.java +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/MallProductController.java @@ -5,6 +5,7 @@ import com.mcwl.common.core.controller.BaseController; import com.mcwl.common.core.domain.AjaxResult; import com.mcwl.common.core.page.PageDomain; import com.mcwl.common.core.page.TableDataInfo; +import com.mcwl.common.domain.IdsParam; import com.mcwl.common.utils.SecurityUtils; import com.mcwl.resource.domain.ModelProduct; import com.mcwl.resource.domain.dto.ModelImagePageRes; @@ -19,6 +20,8 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import javax.validation.Valid; +import javax.validation.constraints.NotNull; import java.util.List; @@ -145,9 +148,9 @@ public class MallProductController extends BaseController { @ApiOperation(value = "删除模型") - @PostMapping("delete") - public AjaxResult delete(@RequestBody ModelProduct modelVersion) { - modelService.removeById(modelVersion.getId()); + @GetMapping("delete") + public AjaxResult delete(@Valid @NotNull(message = "模型id不能为空") Long id) { + modelService.removeById(id); return AjaxResult.success(); } diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/ModelImageController.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/ModelImageController.java index ce75038..7be5c8d 100644 --- a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/ModelImageController.java +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/ModelImageController.java @@ -18,6 +18,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import javax.validation.Valid; import javax.validation.constraints.NotNull; import java.util.List; @@ -42,7 +43,9 @@ public class ModelImageController { */ @ApiOperation(value = "图片列表") @PostMapping("/list") - public TableDataInfo list(@RequestBody PageDomain pageDomain) { + public TableDataInfo list(@RequestBody + @Valid + PageDomain pageDomain) { ModelImagePageRes imagePageRes = new ModelImagePageRes(); BeanUtil.copyProperties(pageDomain, imagePageRes); return modelImageService.listByPage(imagePageRes); @@ -52,9 +55,9 @@ public class ModelImageController { * 图片详情 */ @ApiOperation(value = "图片详情") - @GetMapping("/detail/{imageId}") - public AjaxResult detail(@PathVariable @NotNull(message = "图片id不能为空") Long imageId) { - ModelImageVo modelImageVo = modelImageService.getDetail(imageId); + @GetMapping("/detail") + public AjaxResult detail(@Valid @NotNull(message = "图片id不能为空") Long id) { + ModelImageVo modelImageVo = modelImageService.getDetail(id); return AjaxResult.success(modelImageVo); } @@ -62,9 +65,9 @@ public class ModelImageController { * 图片删除 */ @ApiOperation(value = "图片删除") - @GetMapping("/delete/{imageId}") - public AjaxResult delete(@PathVariable @NotNull(message = "图片id不能为空") Long imageId) { - modelImageService.removeById(imageId); + @GetMapping("/delete") + public AjaxResult delete(@Valid @NotNull(message = "图片id不能为空") Long id) { + modelImageService.removeById(id); return AjaxResult.success(); } @@ -73,7 +76,7 @@ public class ModelImageController { */ @ApiOperation(value = "图片修改") @PostMapping("/update") - public AjaxResult update(@RequestBody ModelImageRes modelImageRes) { + public AjaxResult update(@Valid @RequestBody ModelImageRes modelImageRes) { modelImageService.updateById(modelImageRes); return AjaxResult.success(); } @@ -84,7 +87,7 @@ public class ModelImageController { */ @ApiOperation(value = "图片发布") @PostMapping("/publish") - public AjaxResult publish(@RequestBody ModelImageRes modelImageRes) { + public AjaxResult publish(@Valid @RequestBody ModelImageRes modelImageRes) { modelImageService.publish(modelImageRes); return AjaxResult.success(); } @@ -94,9 +97,9 @@ public class ModelImageController { */ @ApiOperation(value = "图片点赞/取消") @RepeatSubmit - @GetMapping("/imageLike/{imageId}") - public AjaxResult like(@PathVariable @NotNull(message = "图片id不能为空") Long imageId) { - modelImageLikeService.like(imageId); + @GetMapping("/imageLike") + public AjaxResult like(@Valid @NotNull(message = "图片id不能为空") Long id) { + modelImageLikeService.like(id); return AjaxResult.success(); } diff --git a/mcwl-common/src/main/java/com/mcwl/common/domain/IdsParam.java b/mcwl-common/src/main/java/com/mcwl/common/domain/IdsParam.java index 66041d1..b6379ce 100644 --- a/mcwl-common/src/main/java/com/mcwl/common/domain/IdsParam.java +++ b/mcwl-common/src/main/java/com/mcwl/common/domain/IdsParam.java @@ -1,10 +1,14 @@ package com.mcwl.common.domain; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; @Data +@ApiModel(description = "id集合") public class IdsParam { + @ApiModelProperty(value = "id集合") private List ids; }