From 323d7685ef0fccac72813b766f32c66e46485db2 Mon Sep 17 00:00:00 2001 From: xiaofanku Date: Tue, 22 Sep 2020 12:59:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B3=A8=E9=87=8A=E6=8E=89?= =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AdminAlbumController.java | 6 ------ .../AdminBoardCategoryController.java | 6 ------ .../controller/AdminBoardController.java | 15 -------------- .../AdminBoardModeratorController.java | 5 ----- .../AdminForumMessageController.java | 10 ---------- .../AdminMemberNamesProtectController.java | 5 ----- .../AdminMemberPenalizeRecordsController.java | 9 --------- ...minMemberVipExchangeRecordsController.java | 10 ---------- .../controller/AdminPostsController.java | 6 ------ .../AdminRegisteInviteCodeController.java | 6 ------ .../AdminSectionArticleController.java | 5 ----- .../AdminTopicCarouselController.java | 15 -------------- .../AdminTopicCategoryController.java | 5 ----- .../controller/AdminTopicController.java | 20 ------------------- .../controller/AdminTopicTagController.java | 5 ----- 15 files changed, 128 deletions(-) diff --git a/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminAlbumController.java b/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminAlbumController.java index 4a582e12..a6b4cfd3 100644 --- a/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminAlbumController.java +++ b/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminAlbumController.java @@ -138,12 +138,6 @@ public class AdminAlbumController { @RequestParam("cover") long coverPictureId, HttpServletRequest request, Model model) { - /* - Optional data = albumService.editCover(topicAlbumId, coverPictureId); - if (data.isPresent()) { - return TipMessage.ofSuccess("封面图片设置成功"); - } - return TipMessage.ofError("操作失败");*/ return TipMessage.Builder.condition(()->albumService.editCover(topicAlbumId, coverPictureId)).success("封面图片设置成功").error("操作失败"); } } \ No newline at end of file diff --git a/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminBoardCategoryController.java b/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminBoardCategoryController.java index c371052f..42b20aa6 100644 --- a/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminBoardCategoryController.java +++ b/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminBoardCategoryController.java @@ -117,12 +117,6 @@ public class AdminBoardCategoryController { @RequestParam("category") int topicCategoryId, HttpServletRequest request, Model model) { - /* - int records = boardTopicCategoryIndexService.deleteForTopic(boardId, Arrays.asList(topicCategoryId)); - if (records == 1) { - return TipMessage.ofSuccess("版块与话题类型的关联删除成功"); - } - return TipMessage.ofError("操作失败");*/ return TipMessage.Builder.or(()->boardTopicCategoryIndexService.deleteForTopic(boardId, Arrays.asList(topicCategoryId)) == 1).success("版块与话题类型的关联删除成功").error("操作失败"); } diff --git a/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminBoardController.java b/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminBoardController.java index a3ed90a1..0f8153e0 100644 --- a/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminBoardController.java +++ b/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminBoardController.java @@ -261,11 +261,6 @@ public class AdminBoardController { HttpServletRequest request, Model model) { ActionEventCulpritor aec = AdminHomeController.getActionCulpritor(mbean.getMid(), mbean.getNickname(), request, ""); - /* - if (boardService.lock(boardId, boardGroupId, aec).orElse(false)) { - return TipMessage.ofSuccess("成功锁定版块"); - } - return TipMessage.ofError("操作失败");*/ return TipMessage.Builder.condition(()->boardService.lock(boardId, boardGroupId, aec)).success("成功锁定版块").error("操作失败"); } //解锁 @@ -278,11 +273,6 @@ public class AdminBoardController { HttpServletRequest request, Model model) { ActionEventCulpritor aec = AdminHomeController.getActionCulpritor(mbean.getMid(), mbean.getNickname(), request, ""); - /* - if (boardService.releaseLock(boardId, boardGroupId, aec).orElse(false)) { - return TipMessage.ofSuccess("成功解锁版块"); - } - return TipMessage.ofError("操作失败");*/ return TipMessage.Builder.condition(()->boardService.releaseLock(boardId, boardGroupId, aec)).success("成功解锁版块").error("操作失败"); } //删除 @@ -295,11 +285,6 @@ public class AdminBoardController { HttpServletRequest request, Model model) { ActionEventCulpritor aec = AdminHomeController.getActionCulpritor(mbean.getMid(), mbean.getNickname(), request, ""); - /* - if (boardService.remove(boardId, boardGroupId, aec).orElse(false)) { - return TipMessage.ofSuccess("版块删除成功"); - } - return TipMessage.ofError("操作失败");*/ return TipMessage.Builder.condition(()->boardService.remove(boardId, boardGroupId, aec)).success("版块删除成功").error("操作失败"); } //查看指定的版块的名称 diff --git a/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminBoardModeratorController.java b/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminBoardModeratorController.java index 5ad694e8..88dd400c 100644 --- a/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminBoardModeratorController.java +++ b/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminBoardModeratorController.java @@ -224,11 +224,6 @@ public class AdminBoardModeratorController { } else { symbol = boardModeratorService.remove(volumesId, boardId, memberId); } - /* - if (symbol.isPresent()) { - return TipMessage.ofSuccess("版主卸任成功"); - } - return TipMessage.ofError("操作失败");*/ return TipMessage.Builder.or(()->symbol.orElse(false)).success("版主卸任成功").error("操作失败"); } } \ No newline at end of file diff --git a/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminForumMessageController.java b/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminForumMessageController.java index 4deb131a..558609a0 100644 --- a/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminForumMessageController.java +++ b/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminForumMessageController.java @@ -161,11 +161,6 @@ public class AdminForumMessageController { MemberSessionBean mbean, HttpServletRequest request, Model model) { - /* - if (inboxService.remove(mbean.getMid(), Arrays.asList(id)) == 1) { - return TipMessage.ofSuccess("消息删除成功"); - } - return TipMessage.ofError("操作失败");*/ return TipMessage.Builder.or(()->inboxService.remove(mbean.getMid(), Arrays.asList(id)) == 1).success("消息删除成功").error("操作失败"); } @@ -177,11 +172,6 @@ public class AdminForumMessageController { MemberSessionBean mbean, HttpServletRequest request, Model model) { - /* - if (inboxService.readed(mbean.getMid(), Arrays.asList(id)) == 1) { - return TipMessage.ofSuccess("消息标记成功"); - } - return TipMessage.ofError("操作失败");*/ return TipMessage.Builder.or(()->inboxService.readed(mbean.getMid(), Arrays.asList(id)) == 1).success("消息标记成功").error("操作失败"); } diff --git a/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminMemberNamesProtectController.java b/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminMemberNamesProtectController.java index 5afdb61f..560d3540 100644 --- a/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminMemberNamesProtectController.java +++ b/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminMemberNamesProtectController.java @@ -102,11 +102,6 @@ public class AdminMemberNamesProtectController { MemberSessionBean mbean, HttpServletRequest request, Model model) { - /* - if (memberNamesProtectService.editStatus(id, false).orElse(false)) { - return TipMessage.ofSuccess("会员帐户保护删除成功"); - } - return TipMessage.ofError("操作失败");*/ return TipMessage.Builder.condition(()->memberNamesProtectService.editStatus(id, false)).success("会员帐户保护删除成功").error("操作失败"); } } \ No newline at end of file diff --git a/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminMemberPenalizeRecordsController.java b/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminMemberPenalizeRecordsController.java index abb9caa2..5f2e1744 100644 --- a/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminMemberPenalizeRecordsController.java +++ b/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminMemberPenalizeRecordsController.java @@ -120,15 +120,6 @@ public class AdminMemberPenalizeRecordsController { @RequestParam("id") long id, HttpServletRequest request, Model model) { - /* - try{ - if (memberPenalizeRecordsService.expired(id).orElse(false)) { - return TipMessage.ofSuccess("惩罚记录成功结束"); - } - }catch(IllegalArgumentException | IllegalStateException e){ - return TipMessage.ofError(e.getMessage()); - } - return TipMessage.ofError("操作失败");*/ return TipMessage.Builder.condition(()->memberPenalizeRecordsService.expired(id)).success("惩罚记录成功结束").error("操作失败"); } diff --git a/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminMemberVipExchangeRecordsController.java b/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminMemberVipExchangeRecordsController.java index f277a0da..ee3c29ef 100644 --- a/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminMemberVipExchangeRecordsController.java +++ b/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminMemberVipExchangeRecordsController.java @@ -144,18 +144,8 @@ public class AdminMemberVipExchangeRecordsController { @ResponseBody public TipMessage recycleExchangeAction( @RequestParam("id") long id, - MemberSessionBean mbean, HttpServletRequest request, Model model) { - /* - try{ - if (memberVipExchangeRecordsService.expired(id).orElse(false)) { - return TipMessage.ofSuccess("交易记录成功作废"); - } - }catch(IllegalArgumentException | IllegalStateException e){ - return TipMessage.ofError(e.getMessage()); - } - return TipMessage.ofError("操作失败");*/ return TipMessage.Builder.condition(()->memberVipExchangeRecordsService.expired(id)).success("交易记录成功作废").error("操作失败"); } } diff --git a/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminPostsController.java b/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminPostsController.java index f7afa6bf..b84ecef1 100644 --- a/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminPostsController.java +++ b/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminPostsController.java @@ -76,11 +76,6 @@ public class AdminPostsController { HttpServletRequest request, Model model) { ActionEventCulpritor aec = AdminHomeController.getActionCulpritor(mbean.getMid(), mbean.getNickname(), request, ""); - /* - if (postsService.remove(postsId, aec).orElse(false)) { - return TipMessage.ofSuccess("回复删除成功"); - } - return TipMessage.ofError("操作失败");*/ return TipMessage.Builder.condition(()->postsService.remove(postsId, aec)).success("回复删除成功").error("操作失败"); } @@ -89,7 +84,6 @@ public class AdminPostsController { public String getPostsMoodes( @RequestParam("posts") long postsId, @RequestParam(value = "p", required = false, defaultValue = "1") int page, - MemberSessionBean mbean, HttpServletRequest request, Model model) { Posts posts = postsService.get(postsId).orElseThrow(()->new ResourceNotFoundException("回复内容不存在或暂时无法访问")); diff --git a/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminRegisteInviteCodeController.java b/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminRegisteInviteCodeController.java index ca94333c..963bb6ba 100644 --- a/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminRegisteInviteCodeController.java +++ b/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminRegisteInviteCodeController.java @@ -84,14 +84,8 @@ public class AdminRegisteInviteCodeController { @ResponseBody public TipMessage removeInvitecodeAction( @RequestParam("id") long id, - MemberSessionBean mbean, HttpServletRequest request, Model model) { - /* - if (registeInviteCodeService.remove(id).orElse(false)) { - return TipMessage.ofSuccess("邀请码删除成功"); - } - return TipMessage.ofError("操作失败");*/ return TipMessage.Builder.condition(()->registeInviteCodeService.remove(id)).success("邀请码删除成功").error("操作失败"); } } \ No newline at end of file diff --git a/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminSectionArticleController.java b/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminSectionArticleController.java index 1779ee7b..5b8bd7ee 100644 --- a/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminSectionArticleController.java +++ b/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminSectionArticleController.java @@ -382,11 +382,6 @@ public class AdminSectionArticleController { HttpServletRequest request, Model model) { ActionEventCulpritor aec = AdminHomeController.getActionCulpritor(mbean.getMid(), mbean.getNickname(), request, ""); - /* - if (topicService.removeTermArticle(articleId, termId, aec).orElse(false)) { - return TipMessage.ofSuccess("文章删除成功"); - } - return TipMessage.ofError("操作失败");*/ return TipMessage.Builder.condition(()->topicService.removeTermArticle(articleId, termId, aec)).success("文章删除成功").error("操作失败"); } } \ No newline at end of file diff --git a/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminTopicCarouselController.java b/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminTopicCarouselController.java index 2cdea6e5..a26f7786 100644 --- a/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminTopicCarouselController.java +++ b/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminTopicCarouselController.java @@ -110,11 +110,6 @@ public class AdminTopicCarouselController { MemberSessionBean mbean, HttpServletRequest request, Model model) { - /* - if (topicCarouselService.remove(topicCarouselId).orElse(false)) { - return TipMessage.ofSuccess("轮播图删除成功"); - } - return TipMessage.ofError("操作失败");*/ return TipMessage.Builder.condition(()->topicCarouselService.remove(topicCarouselId)).success("轮播图删除成功").error("操作失败"); } //轮播图下所有幻灯片,忽略状态 @@ -183,11 +178,6 @@ public class AdminTopicCarouselController { MemberSessionBean mbean, HttpServletRequest request, Model model) { - /* - if (topicCarouselSlideService.remove(topicCarouselSlideId, topicCarouselId).orElse(false)) { - return TipMessage.ofSuccess("幻灯片删除成功"); - } - return TipMessage.ofError("操作失败");*/ return TipMessage.Builder.condition(()->topicCarouselSlideService.remove(topicCarouselSlideId, topicCarouselId)).success("幻灯片删除成功").error("操作失败"); } //版块绑定轮播图 @@ -230,11 +220,6 @@ public class AdminTopicCarouselController { @RequestParam("volumes") int volumesId, HttpServletRequest request, Model model) { - /* - if (topicCarouselService.remove(topicCarouselId, volumesId, boardId).orElse(false)) { - return TipMessage.ofSuccess("版块轮播图关联删除成功"); - } - return TipMessage.ofError("操作失败");*/ return TipMessage.Builder.condition(()->topicCarouselService.remove(topicCarouselId, volumesId, boardId)).success("版块轮播图关联删除成功").error("操作失败"); } diff --git a/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminTopicCategoryController.java b/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminTopicCategoryController.java index 12973e37..17cef12a 100644 --- a/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminTopicCategoryController.java +++ b/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminTopicCategoryController.java @@ -106,11 +106,6 @@ public class AdminTopicCategoryController { @RequestParam("id") int categoryId, HttpServletRequest request, Model model) { - /* - if (topicCategoryService.remove(categoryId).orElse(false)) { - return TipMessage.ofSuccess("话题类型删除成功"); - } - return TipMessage.ofError("操作失败");*/ return TipMessage.Builder.condition(()->topicCategoryService.remove(categoryId)).success("话题类型删除成功").error("操作失败"); } diff --git a/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminTopicController.java b/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminTopicController.java index 13630b37..e0903e74 100644 --- a/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminTopicController.java +++ b/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminTopicController.java @@ -293,11 +293,6 @@ public class AdminTopicController { HttpServletRequest request, Model model) { ActionEventCulpritor aec = AdminHomeController.getActionCulpritor(mbean.getMid(), mbean.getNickname(), request, ""); - /* - if (topicService.lock(topicId, aec).orElse(false)) { - return TipMessage.ofSuccess("成功锁定话题"); - } - return TipMessage.ofError("操作失败");*/ return TipMessage.Builder.condition(()->topicService.lock(topicId, aec)).success("成功锁定话题").error("操作失败"); } //锁定话题 @@ -309,11 +304,6 @@ public class AdminTopicController { HttpServletRequest request, Model model) { ActionEventCulpritor aec = AdminHomeController.getActionCulpritor(mbean.getMid(), mbean.getNickname(), request, ""); - /* - if (topicService.releaseLock(topicId, aec).orElse(false)) { - return TipMessage.ofSuccess("成功解锁话题"); - } - return TipMessage.ofError("操作失败");*/ return TipMessage.Builder.condition(()->topicService.releaseLock(topicId, aec)).success("成功解锁话题").error("操作失败"); } //删除话题 @@ -325,11 +315,6 @@ public class AdminTopicController { HttpServletRequest request, Model model) { ActionEventCulpritor aec = AdminHomeController.getActionCulpritor(mbean.getMid(), mbean.getNickname(), request, ""); - /* - if (topicService.remove(topicId, aec).orElse(false)) { - return TipMessage.ofSuccess("话题删除成功"); - } - return TipMessage.ofError("操作失败");*/ return TipMessage.Builder.condition(()->topicService.remove(topicId, aec)).success("话题删除成功").error("操作失败"); } //置顶话题 @@ -341,11 +326,6 @@ public class AdminTopicController { HttpServletRequest request, Model model) { ActionEventCulpritor aec = AdminHomeController.getActionCulpritor(mbean.getMid(), mbean.getNickname(), request, ""); - /* - if (topicService.editTop(topicId, aec).orElse(false)) { - return TipMessage.ofSuccess("话题置顶成功"); - } - return TipMessage.ofError("操作失败");*/ return TipMessage.Builder.condition(()->topicService.editTop(topicId, aec)).success("话题置顶成功").error("操作失败"); } diff --git a/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminTopicTagController.java b/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminTopicTagController.java index acdc1ed5..90c75aa4 100644 --- a/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminTopicTagController.java +++ b/thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminTopicTagController.java @@ -69,11 +69,6 @@ public class AdminTopicTagController { HttpServletRequest request, Model model) { ActionEventCulpritor aec = AdminHomeController.getActionCulpritor(mbean.getMid(), mbean.getNickname(), request, token); - /* - if (topicTagService.deleteForTopic(topicId, tagId, aec).orElse(false)) { - return TipMessage.ofSuccess("成功删除标签"); - } - return TipMessage.ofError("操作失败");*/ return TipMessage.Builder.condition(()->topicTagService.deleteForTopic(topicId, tagId, aec)).success("成功删除标签").error("操作失败"); } -- GitLab