From f5a6ae9164905967efc2f69132f36c7453b84dc2 Mon Sep 17 00:00:00 2001 From: panqihua <1029559041@qq.com> Date: Tue, 21 Apr 2020 11:40:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E5=B8=96=E5=AD=90=E6=8F=90=E7=A4=BA=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pocket/api/android/ForumController.java | 19 ++++++++++++++--- .../pocket/api/web/ForumController.java | 11 +++++++++- .../pocket/entity/vo/ForumNewResponse.java | 2 ++ .../entity/vo/android/ForumMyResponse.java | 4 +++- .../pocket/DemoApplicationTests.java | 21 ++++++++----------- 5 files changed, 40 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/community/pocket/api/android/ForumController.java b/src/main/java/com/community/pocket/api/android/ForumController.java index 83cfa80..255b499 100644 --- a/src/main/java/com/community/pocket/api/android/ForumController.java +++ b/src/main/java/com/community/pocket/api/android/ForumController.java @@ -154,9 +154,22 @@ public class ForumController { @GetMapping("/forum/my") public ForumMyResponse loadForumMy(ForumQuery forumQuery) { Page forumList = forumDao.loadForum(forumQuery); - ForumMyResponse response = new ForumMyResponse(Result.OK, ForumMyResponse.Msg.ok); - response.setForumList(forumList); - return response; + if (forumList != null) { + ForumMyResponse response; + if (forumList.isEmpty()) { + response = new ForumMyResponse(Result.OK, ForumMyResponse.Msg.ok_empty); + } else { + if (forumList.getCurrentPage() > 1) { + response = new ForumMyResponse(Result.OK, ForumMyResponse.Msg.ok_more); + } else { + response = new ForumMyResponse(Result.OK, ForumMyResponse.Msg.ok); + } + } + response.setForumList(forumList); + return response; + } else { + return new ForumMyResponse(Result.FAIL, ForumMyResponse.Msg.fail); + } } diff --git a/src/main/java/com/community/pocket/api/web/ForumController.java b/src/main/java/com/community/pocket/api/web/ForumController.java index 638dde0..534d5d6 100644 --- a/src/main/java/com/community/pocket/api/web/ForumController.java +++ b/src/main/java/com/community/pocket/api/web/ForumController.java @@ -33,7 +33,16 @@ public class ForumController { public ForumNewResponse loadForumNew(ForumQuery forumQuery) { Page forumList = forumDao.loadForum(forumQuery); if (forumList != null) { - ForumNewResponse response = new ForumNewResponse(Result.OK, ForumNewResponse.Msg.ok); + ForumNewResponse response; + if (forumList.isEmpty()) { + response = new ForumNewResponse(Result.OK, ForumNewResponse.Msg.ok_empty); + } else { + if (forumList.getCurrentPage() > 1) { + response = new ForumNewResponse(Result.OK, ForumNewResponse.Msg.ok_more); + } else { + response = new ForumNewResponse(Result.OK, ForumNewResponse.Msg.ok); + } + } response.setForumList(forumList); return response; } else { diff --git a/src/main/java/com/community/pocket/entity/vo/ForumNewResponse.java b/src/main/java/com/community/pocket/entity/vo/ForumNewResponse.java index 8776255..d9220de 100644 --- a/src/main/java/com/community/pocket/entity/vo/ForumNewResponse.java +++ b/src/main/java/com/community/pocket/entity/vo/ForumNewResponse.java @@ -24,6 +24,8 @@ public class ForumNewResponse extends Response { public enum Msg implements CustomMessage { ok, + ok_empty, + ok_more, fail } } diff --git a/src/main/java/com/community/pocket/entity/vo/android/ForumMyResponse.java b/src/main/java/com/community/pocket/entity/vo/android/ForumMyResponse.java index 07c65fa..75b77de 100644 --- a/src/main/java/com/community/pocket/entity/vo/android/ForumMyResponse.java +++ b/src/main/java/com/community/pocket/entity/vo/android/ForumMyResponse.java @@ -22,8 +22,10 @@ public class ForumMyResponse extends Response { this.forumList = forumList; } - public enum Msg implements CustomMessage{ + public enum Msg implements CustomMessage { ok, + ok_empty, + ok_more, fail, token } diff --git a/src/test/java/com/community/pocket/DemoApplicationTests.java b/src/test/java/com/community/pocket/DemoApplicationTests.java index 0ce8a39..4778124 100644 --- a/src/test/java/com/community/pocket/DemoApplicationTests.java +++ b/src/test/java/com/community/pocket/DemoApplicationTests.java @@ -133,8 +133,6 @@ class DemoApplicationTests { .param("activeScore", "15") .param("title", "666") .param("content", "fuckfuckfuckfuckfuck") - .param("username", "panqihua") - .param("token", "b6a518fffa3ffa607e756324474e9484") ).andDo(MockMvcResultHandlers.print()).andReturn(); } @@ -145,20 +143,20 @@ class DemoApplicationTests { .param("complain", "panqihua") .param("title", "666") .param("content", "fuckfuckfuckfuckfuck") - .param("token", "b6a518fffa3ffa607e756324474e9484") - .param("username", "panqihua") ).andDo(MockMvcResultHandlers.print()).andReturn(); } //测试发送动态 @Test void testTopic() throws Exception { - mockMvc.perform(MockMvcRequestBuilders.post("/forum/sendTopic") - .param("title", "666") - .param("content", "fuckfuckfuckfuckfuck") - .param("token", "b6a518fffa3ffa607e756324474e9484") - .param("username", "panqihua") - ).andDo(MockMvcResultHandlers.print()).andReturn(); + for (int i = 0; i < 20; i++) { + MockHttpServletRequestBuilder builder = MockMvcRequestBuilders.post("/forum/sendTopic") + .param("title", "title" + i) + .param("content", "fuckfuckfuckfuckfuck") + .param("forumType", "topic"); + mockMvc.perform(addToken(builder) + ).andDo(MockMvcResultHandlers.print()).andReturn(); + } } //测试查询帖子 @@ -166,7 +164,6 @@ class DemoApplicationTests { void queryForum() throws Exception { mockMvc.perform(MockMvcRequestBuilders.get("/api/forum/posts") .param("status", Forum.ForumStatus.ok.name()) - .param("username", "panqihua") .param("currentPage", "1") ).andDo(MockMvcResultHandlers.print()).andReturn(); } @@ -201,7 +198,6 @@ class DemoApplicationTests { void queryVisitor() throws Exception { mockMvc.perform(MockMvcRequestBuilders.get("/visitor/reservation") .param("username", "panqihua") - .param("token", "e3c8ed5a74841556c57de6e17b166f68") .param("startDate", "2020/04/18") .param("endDate", "2020/04/19")) .andDo(MockMvcResultHandlers.print()).andReturn(); @@ -255,4 +251,5 @@ class DemoApplicationTests { visitorDao.save(visitorForm); } } + }