refactor(mcwl): 重构删除接口并添加参数校验

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")
+    @GetMapping("delete")
-    public AjaxResult delete(@RequestBody ModelProduct modelVersion) {
+    public AjaxResult delete(@Valid @NotNull(message = "模型id不能为空") Long id) {
-        modelService.removeById(modelVersion.getId());
+        modelService.removeById(id);
         return AjaxResult.success();
     }
 

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}")
+    @GetMapping("/detail")
-    public AjaxResult detail(@PathVariable @NotNull(message = "图片id不能为空") Long imageId) {
+    public AjaxResult detail(@Valid @NotNull(message = "图片id不能为空") Long id) {
-        ModelImageVo modelImageVo = modelImageService.getDetail(imageId);
+        ModelImageVo modelImageVo = modelImageService.getDetail(id);
         return AjaxResult.success(modelImageVo);
     }
 
@@ -62,9 +65,9 @@ public class ModelImageController {
      * 图片删除
      */
     @ApiOperation(value = "图片删除")
-    @GetMapping("/delete/{imageId}")
+    @GetMapping("/delete")
-    public AjaxResult delete(@PathVariable @NotNull(message = "图片id不能为空") Long imageId) {
+    public AjaxResult delete(@Valid @NotNull(message = "图片id不能为空") Long id) {
-        modelImageService.removeById(imageId);
+        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}")
+    @GetMapping("/imageLike")
-    public AjaxResult like(@PathVariable @NotNull(message = "图片id不能为空") Long imageId) {
+    public AjaxResult like(@Valid @NotNull(message = "图片id不能为空") Long id) {
-        modelImageLikeService.like(imageId);
+        modelImageLikeService.like(id);
         return AjaxResult.success();
     }
 

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<Long> ids;
 }