diff --git a/src/main/java/com/ctgu/lost_found/controller/PostController.java b/src/main/java/com/ctgu/lost_found/controller/PostController.java index b8a8718ec3a9bdd68d76a139d3f0856dd5e9f55c..c8698bc1b10576d74fd8494e8d0e54706295d692 100644 --- a/src/main/java/com/ctgu/lost_found/controller/PostController.java +++ b/src/main/java/com/ctgu/lost_found/controller/PostController.java @@ -148,10 +148,13 @@ public class PostController { return postService.getPostList(type, itemTypeId); } - @ApiOperation("模糊查询所有帖子(不包括已完成的帖子)") - @GetMapping(value = {"/fuzzyGetPostList", "/fuzzyGetPostList/{fuzzyStr}"}) - public Result fuzzyGetPostList(@PathVariable(value = "fuzzyStr", required = false) String fuzzyStr) { - return postService.fuzzyGetPostList(fuzzyStr); + @ApiOperation("模糊查询帖子") + @GetMapping(value = {"/fuzzyGetPostListByState/{state}", "/fuzzyGetPostList/{fuzzyStr}/{state}"}) + public Result fuzzyGetPostList(@PathVariable(value = "fuzzyStr", required = false) String fuzzyStr, @PathVariable(value = "state") Integer state) { + if (state != 0 && state != 1) { + return Result.error("state只能为0或1"); + } + return postService.fuzzyGetPostList(fuzzyStr, state); } @ApiOperation("查询指定用户的所有帖子(包括已完成的帖子)") diff --git a/src/main/java/com/ctgu/lost_found/service/Impl/PostServiceImpl.java b/src/main/java/com/ctgu/lost_found/service/Impl/PostServiceImpl.java index 93fbae600e1bc021fe91871a5fd36b9e199df1a0..50203f2ceed9a7020d3d8c2624a6e38f47ac9dca 100644 --- a/src/main/java/com/ctgu/lost_found/service/Impl/PostServiceImpl.java +++ b/src/main/java/com/ctgu/lost_found/service/Impl/PostServiceImpl.java @@ -155,17 +155,18 @@ public class PostServiceImpl implements PostService { } /** - * 模糊查询所有帖子(不包括已完成的帖子) + * 模糊查询帖子 * * @param fuzzyStr: 模糊查询字符串 + * @param state: 帖子状态 * @return Result */ @Override - public Result fuzzyGetPostList(String fuzzyStr) { + public Result fuzzyGetPostList(String fuzzyStr, Integer state) { if ("".equals(fuzzyStr)) { fuzzyStr = null; } - List postList = postDao.getPostList(null, null, null, null, 0, fuzzyStr); + List postList = postDao.getPostList(null, null, null, null, state, fuzzyStr); if (postList.isEmpty()) { return Result.error("查询失败,帖子不存在"); } diff --git a/src/main/java/com/ctgu/lost_found/service/PostService.java b/src/main/java/com/ctgu/lost_found/service/PostService.java index 8bd5a9f1082637bde87714ea55ce13bc32d5d463..f007faeb79ad59e83d63581a33f4d6f5742ba5b0 100644 --- a/src/main/java/com/ctgu/lost_found/service/PostService.java +++ b/src/main/java/com/ctgu/lost_found/service/PostService.java @@ -51,12 +51,13 @@ public interface PostService { Result getPostList(Integer type, Integer itemTypeId); /** - * 模糊查询所有帖子(不包括已完成的帖子) + * 模糊查询帖子 * * @param fuzzyStr: 模糊查询字符串 + * @param state: 帖子状态 * @return Result */ - Result fuzzyGetPostList(String fuzzyStr); + Result fuzzyGetPostList(String fuzzyStr, Integer state); /** * 查询指定用户发布的所有帖子(包括已完成的帖子)