diff --git a/src/main/java/run/halo/app/controller/admin/api/PostCommentController.java b/src/main/java/run/halo/app/controller/admin/api/PostCommentController.java index 5f924668c..39a39559a 100644 --- a/src/main/java/run/halo/app/controller/admin/api/PostCommentController.java +++ b/src/main/java/run/halo/app/controller/admin/api/PostCommentController.java @@ -8,7 +8,6 @@ import org.springframework.data.domain.Sort; import org.springframework.data.web.PageableDefault; import org.springframework.data.web.SortDefault; import org.springframework.web.bind.annotation.*; -import run.halo.app.model.BaseCommentUpdateStatusParam; import run.halo.app.model.dto.BaseCommentDTO; import run.halo.app.model.entity.PostComment; import run.halo.app.model.enums.CommentStatus; @@ -97,10 +96,11 @@ public class PostCommentController { return postCommentService.convertTo(updatedPostComment); } - @PutMapping("status") + @PutMapping("status/{status}") @ApiOperation("Updates post comment status in batch") - public List updateStatusInBatch(@RequestBody BaseCommentUpdateStatusParam param) { - List comments = postCommentService.updateStatusByIds(param.getIds(), param.getStatus()); + public List updateStatusInBatch(@PathVariable(name = "status") CommentStatus status, + @RequestBody List ids) { + List comments = postCommentService.updateStatusByIds(ids, status); return postCommentService.convertTo(comments); } diff --git a/src/main/java/run/halo/app/controller/admin/api/SheetCommentController.java b/src/main/java/run/halo/app/controller/admin/api/SheetCommentController.java index a5305d521..4cd608235 100644 --- a/src/main/java/run/halo/app/controller/admin/api/SheetCommentController.java +++ b/src/main/java/run/halo/app/controller/admin/api/SheetCommentController.java @@ -8,7 +8,6 @@ import org.springframework.data.domain.Sort; import org.springframework.data.web.PageableDefault; import org.springframework.data.web.SortDefault; import org.springframework.web.bind.annotation.*; -import run.halo.app.model.BaseCommentUpdateStatusParam; import run.halo.app.model.dto.BaseCommentDTO; import run.halo.app.model.entity.SheetComment; import run.halo.app.model.enums.CommentStatus; @@ -92,10 +91,11 @@ public class SheetCommentController { return sheetCommentService.convertTo(updatedSheetComment); } - @PutMapping("status") + @PutMapping("status/{status}") @ApiOperation("Updates sheet comment status in batch") - public List updateStatusInBatch(@RequestBody BaseCommentUpdateStatusParam param) { - List comments = sheetCommentService.updateStatusByIds(param.getIds(), param.getStatus()); + public List updateStatusInBatch(@PathVariable(name = "status") CommentStatus status, + @RequestBody List ids) { + List comments = sheetCommentService.updateStatusByIds(ids, status); return sheetCommentService.convertTo(comments); } diff --git a/src/main/java/run/halo/app/model/BaseCommentUpdateStatusParam.java b/src/main/java/run/halo/app/model/BaseCommentUpdateStatusParam.java deleted file mode 100644 index b0c6ebca0..000000000 --- a/src/main/java/run/halo/app/model/BaseCommentUpdateStatusParam.java +++ /dev/null @@ -1,20 +0,0 @@ -package run.halo.app.model; - -import lombok.Data; -import run.halo.app.model.enums.CommentStatus; - -import java.util.List; - -/** - * Base comment update status param. - * - * @author ryanwang - * @date 2019-12-12 - */ -@Data -public class BaseCommentUpdateStatusParam { - - private List ids; - - private CommentStatus status; -}