From 11d94ccd1a0a6e5cf00a6b7790ad3b0a01931ffc Mon Sep 17 00:00:00 2001 From: panqihua <1029559041@qq.com> Date: Tue, 14 Apr 2020 10:37:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=AE=BA=E5=9D=9B=E8=B4=B4?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/community/pocket/api/web/WebForumController.java | 1 + .../com/community/pocket/repository/android/ForumDao.java | 2 +- src/test/java/com/community/pocket/DemoApplicationTests.java | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/community/pocket/api/web/WebForumController.java b/src/main/java/com/community/pocket/api/web/WebForumController.java index 6dad22f..70610cf 100644 --- a/src/main/java/com/community/pocket/api/web/WebForumController.java +++ b/src/main/java/com/community/pocket/api/web/WebForumController.java @@ -64,6 +64,7 @@ public class WebForumController { } } + //帖子审核接口 @PostMapping("/api/forum/posts/check") public ForumCheckResponse check(@RequestBody ForumCheck forumCheck) { if (forumDao.check(forumCheck)) { diff --git a/src/main/java/com/community/pocket/repository/android/ForumDao.java b/src/main/java/com/community/pocket/repository/android/ForumDao.java index addcf00..536b4a4 100644 --- a/src/main/java/com/community/pocket/repository/android/ForumDao.java +++ b/src/main/java/com/community/pocket/repository/android/ForumDao.java @@ -105,7 +105,7 @@ public class ForumDao extends BaseDao { try { Criteria criteria = new Criteria(); if (!StringUtils.isEmpty(forumQuery.getStatus())) { - Criteria.where("status").is(forumQuery.getStatus()); + criteria = Criteria.where("status").is(forumQuery.getStatus()); } if (!StringUtils.isEmpty(forumQuery.getUsername())) { criteria = criteria.and("username").is(forumQuery.getUsername()); diff --git a/src/test/java/com/community/pocket/DemoApplicationTests.java b/src/test/java/com/community/pocket/DemoApplicationTests.java index 5bcc902..dba5c16 100644 --- a/src/test/java/com/community/pocket/DemoApplicationTests.java +++ b/src/test/java/com/community/pocket/DemoApplicationTests.java @@ -1,5 +1,6 @@ package com.community.pocket; +import com.community.pocket.entity.po.Forum; import com.community.pocket.entity.po.android.Garbage; import com.community.pocket.entity.po.android.GarbageWastePrice; import com.community.pocket.entity.vo.android.GarbageCateGory; @@ -143,14 +144,16 @@ class DemoApplicationTests { ).andDo(MockMvcResultHandlers.print()).andReturn(); } + //测试查询帖子 @Test void queryForum() throws Exception { mockMvc.perform(MockMvcRequestBuilders.get("/api/forum/posts") - + .param("status", Forum.ForumStatus.ok.name()) .param("currentPage", "1") ).andDo(MockMvcResultHandlers.print()).andReturn(); } + //测试登陆 @Test void login() throws Exception { mockMvc.perform(MockMvcRequestBuilders.post("/login")