提交 4a3192ed 编写于 作者: 街头小贩's avatar 街头小贩

TipMessage.Builder API重命名

上级 1926bf78
......@@ -290,7 +290,7 @@ public class BoardController {
//----------------------------------策略检查开始:只有管理员可以锁定
// 迁至StrategyInterceptorAdapter
//----------------------------------策略检查结束
return TipMessage.Builder.condition(()->boardService.lock(boardId, boardGroupId, aec)).success("版块成功锁定").error("操作失败");
return TipMessage.Builder.take(()->boardService.lock(boardId, boardGroupId, aec)).success("版块成功锁定").error("操作失败");
}
// 解锁
......@@ -314,7 +314,7 @@ public class BoardController {
//----------------------------------策略检查开始:只有管理员可以解锁
// 迁至StrategyInterceptorAdapter
//----------------------------------策略检查结束
return TipMessage.Builder.condition(()->boardService.releaseLock(boardId, boardGroupId, aec)).success("版块解锁成功").error("操作失败");
return TipMessage.Builder.take(()->boardService.releaseLock(boardId, boardGroupId, aec)).success("版块解锁成功").error("操作失败");
}
// 编辑版块的配置
......
......@@ -235,7 +235,7 @@ public class MainController {
if (!btc.isPresent()) {
return TipMessage.ofError("未知的存储目标");
}
return TipMessage.Builder.or(()->topicService.plug(new FeedbackPlugTopic(aec, title, content, btc.get())).isPresent()).success("感谢您反馈的意见或建议").error("操作失败");
return TipMessage.Builder.of(()->topicService.plug(new FeedbackPlugTopic(aec, title, content, btc.get())).isPresent()).success("感谢您反馈的意见或建议").error("操作失败");
}
@GetMapping(path = "/ip")
......
......@@ -224,7 +224,7 @@ public class MessageController {
HttpServletRequest request,
Model model){
List<Long> messageIdList = Commons.toLongList(idString);
return TipMessage.Builder.or(()->inboxService.readed(mbean.getMid(), messageIdList)>0).success("标记成功").error("标记为阅读操作失败");
return TipMessage.Builder.of(()->inboxService.readed(mbean.getMid(), messageIdList)>0).success("标记成功").error("标记为阅读操作失败");
}
//收件人将消息标为删除
......@@ -238,7 +238,7 @@ public class MessageController {
HttpServletRequest request,
Model model){
List<Long> messageIdList = Commons.toLongList(idString);
return TipMessage.Builder.or(()->inboxService.remove(mbean.getMid(), messageIdList)>0).success("删除成功").error("删除消息操作失败");
return TipMessage.Builder.of(()->inboxService.remove(mbean.getMid(), messageIdList)>0).success("删除成功").error("删除消息操作失败");
}
//收件箱中的查看
......@@ -318,7 +318,7 @@ public class MessageController {
HttpServletRequest request,
Model model){
final long othMember =(direction == 1)?memberId:-1;
return TipMessage.Builder.condition(()->inboxService.compositeReaded(mbean.getMid(), othMember, direction)).success("标记成功").error("标记为阅读操作失败");
return TipMessage.Builder.take(()->inboxService.compositeReaded(mbean.getMid(), othMember, direction)).success("标记成功").error("标记为阅读操作失败");
}
//今天的公告
......
......@@ -332,7 +332,7 @@ public class PostsController {
//----------------------------------策略检查开始,限制角色:管理员,版主,大版主都可以
// 迁至StrategyInterceptorAdapter
//----------------------------------策略检查结束
return TipMessage.Builder.condition(()->postsService.remove(postsId, aec)).success("话题回复成功删除").error("操作失败");
return TipMessage.Builder.take(()->postsService.remove(postsId, aec)).success("话题回复成功删除").error("操作失败");
}
......@@ -366,7 +366,7 @@ public class PostsController {
return TipMessage.ofError("未知的存储目标");
}
Optional<Topic> result = topicService.plug(new ReportPlugTopic(ForumActionEnum.POSTS_REPORT, aec, posts, reportTypeSymbol, reportContent, btc.get()));
return TipMessage.Builder.or(()->result.isPresent()).success("回复举报成功").error("操作失败");
return TipMessage.Builder.of(()->result.isPresent()).success("回复举报成功").error("操作失败");
}
// 返回引用的回复内容
......
......@@ -70,7 +70,7 @@ public class PostsMoodController {
// 迁至StrategyInterceptorAdapter
//----------------------------------
boolean liked = (moodStatus==1);
return TipMessage.Builder.or(()->postsMoodRecordsService.toggleMoodRecord(postsId, tpObj.getId(), liked, aec)>0).success("回复点赞成功").error("点赞失败");
return TipMessage.Builder.of(()->postsMoodRecordsService.toggleMoodRecord(postsId, tpObj.getId(), liked, aec)>0).success("回复点赞成功").error("点赞失败");
}
//查看点赞的计数
......
......@@ -183,7 +183,7 @@ public class TopicController {
//----------------------------------策略检查开始,限制角色:管理员,版主,大版主都可以
// 迁至StrategyInterceptorAdapter
//----------------------------------策略检查结束
return TipMessage.Builder.condition(()->topicService.editTop(topicId, aec)).success("话题置顶成功").error("操作失败");
return TipMessage.Builder.take(()->topicService.editTop(topicId, aec)).success("话题置顶成功").error("操作失败");
}
// 版主话题加精
......@@ -207,7 +207,7 @@ public class TopicController {
//----------------------------------策略检查开始,限制角色:管理员,版主,大版主都可以
// 迁至StrategyInterceptorAdapter
//----------------------------------策略检查结束
return TipMessage.Builder.condition(()->topicService.editGoods(topicId, aec)).success("话题加精成功").error("操作失败");
return TipMessage.Builder.take(()->topicService.editGoods(topicId, aec)).success("话题加精成功").error("操作失败");
}
// 版主锁定话题
......@@ -231,7 +231,7 @@ public class TopicController {
//----------------------------------策略检查开始,限制角色:管理员,版主,大版主都可以
// 迁至StrategyInterceptorAdapter
//----------------------------------策略检查结束
return TipMessage.Builder.condition(()->topicService.lock(topicId, aec)).success("话题成功锁定").error("操作失败");
return TipMessage.Builder.take(()->topicService.lock(topicId, aec)).success("话题成功锁定").error("操作失败");
}
// 版主解锁话题
......@@ -255,7 +255,7 @@ public class TopicController {
//----------------------------------策略检查开始,限制角色:管理员,版主,大版主都可以
// 迁至StrategyInterceptorAdapter
//----------------------------------策略检查结束
return TipMessage.Builder.condition(()->topicService.releaseLock(topicId, aec)).success("话题解锁成功").error("操作失败");
return TipMessage.Builder.take(()->topicService.releaseLock(topicId, aec)).success("话题解锁成功").error("操作失败");
}
// 版主删除话题
......@@ -279,7 +279,7 @@ public class TopicController {
//----------------------------------策略检查开始,限制角色:管理员,版主,大版主都可以
// 迁至StrategyInterceptorAdapter
//----------------------------------策略检查结束
return TipMessage.Builder.condition(()->topicService.remove(topicId, aec)).success("话题成功删除").error("操作失败");
return TipMessage.Builder.take(()->topicService.remove(topicId, aec)).success("话题成功删除").error("操作失败");
}
// 版主移动话题
......@@ -371,7 +371,7 @@ public class TopicController {
return TipMessage.ofError("未知的存储目标");
}
Optional<Topic> result = topicService.plug(new ReportPlugTopic(ForumActionEnum.TOPIC_REPORT, aec, oneFloor.get(), reportTypeSymbol, reportContent, btc.get()));
return TipMessage.Builder.or(()->result.isPresent()).success("话题举报成功").error("操作失败");
return TipMessage.Builder.of(()->result.isPresent()).success("话题举报成功").error("操作失败");
}
// 收藏话题
......@@ -590,7 +590,7 @@ public class TopicController {
long topicId = tpObj.getId();
//-------------------------------------------------
ActionEventCulpritor aec = ActionEventCulpritor.getInstance(mbean.getMid(), mbean.getNickname(), request, token);
return TipMessage.Builder.condition(()->topicService.browse(topicId, aec)).success("话题浏览成功").error("操作失败");
return TipMessage.Builder.take(()->topicService.browse(topicId, aec)).success("话题浏览成功").error("操作失败");
}
// 话题配置
......
......@@ -76,7 +76,7 @@ public class TopicTagController {
// 迁至StrategyInterceptorAdapter
//------------------------------
ActionEventCulpritor aec = ActionEventCulpritor.getInstance(mbean.getMid(), mbean.getNickname(), request, token);
return TipMessage.Builder.condition(()->topicTagService.deleteForTopic(tpObj.getId(), tagId, aec)).success("标签成功删除").error("操作失败");
return TipMessage.Builder.take(()->topicTagService.deleteForTopic(tpObj.getId(), tagId, aec)).success("标签成功删除").error("操作失败");
}
//添加(并统计词频)(版主和管理员)
......
......@@ -132,6 +132,6 @@ public class AdminAlbumController {
@RequestParam("cover")long coverPictureId,
HttpServletRequest request,
Model model){
return TipMessage.Builder.condition(()->albumService.editCover(topicAlbumId, coverPictureId)).success("封面图片设置成功").error("操作失败");
return TipMessage.Builder.take(()->albumService.editCover(topicAlbumId, coverPictureId)).success("封面图片设置成功").error("操作失败");
}
}
......@@ -131,7 +131,7 @@ public class AdminBoardCategoryController {
@RequestParam("category")int topicCategoryId,
HttpServletRequest request,
Model model){
return TipMessage.Builder.or(()->boardTopicCategoryIndexService.deleteForTopic(boardId, Arrays.asList(topicCategoryId)) == 1).success("版块与话题类型的关联删除成功").error("操作失败");
return TipMessage.Builder.of(()->boardTopicCategoryIndexService.deleteForTopic(boardId, Arrays.asList(topicCategoryId)) == 1).success("版块与话题类型的关联删除成功").error("操作失败");
}
//检查举报和反馈模块是否关联到了某版块
......
......@@ -277,7 +277,7 @@ public class AdminBoardController {
HttpServletRequest request,
Model model){
ActionEventCulpritor aec = ActionEventCulpritor.getInstance(mbean.getMid(), mbean.getNickname(), request, "");
return TipMessage.Builder.condition(()->boardService.lock(boardId, boardGroupId, aec)).success("成功锁定版块").error("操作失败");
return TipMessage.Builder.take(()->boardService.lock(boardId, boardGroupId, aec)).success("成功锁定版块").error("操作失败");
}
//解锁
@PostMapping(path="/lock/remove", produces = "application/json;charset=UTF-8")
......@@ -289,7 +289,7 @@ public class AdminBoardController {
HttpServletRequest request,
Model model){
ActionEventCulpritor aec = ActionEventCulpritor.getInstance(mbean.getMid(), mbean.getNickname(), request, "");
return TipMessage.Builder.condition(()->boardService.releaseLock(boardId, boardGroupId, aec)).success("成功解锁版块").error("操作失败");
return TipMessage.Builder.take(()->boardService.releaseLock(boardId, boardGroupId, aec)).success("成功解锁版块").error("操作失败");
}
//删除
@PostMapping(path="/remove", produces = "application/json;charset=UTF-8")
......@@ -301,7 +301,7 @@ public class AdminBoardController {
HttpServletRequest request,
Model model){
ActionEventCulpritor aec = ActionEventCulpritor.getInstance(mbean.getMid(), mbean.getNickname(), request, "");
return TipMessage.Builder.condition(()->boardService.remove(boardId, boardGroupId, aec)).success("版块删除成功").error("操作失败");
return TipMessage.Builder.take(()->boardService.remove(boardId, boardGroupId, aec)).success("版块删除成功").error("操作失败");
}
//查看指定的版块的名称
@GetMapping(path="/list.json", produces = "application/json;charset=UTF-8")
......
......@@ -232,6 +232,6 @@ public class AdminBoardModeratorController {
@RequestParam(name="volume", required=false, defaultValue="0")int volumesId,
HttpServletRequest request,
Model model) {
return TipMessage.Builder.condition(()->boardModeratorService.remove(volumesId, boardId, memberId)).success("版主卸任成功").error("操作失败");
return TipMessage.Builder.take(()->boardModeratorService.remove(volumesId, boardId, memberId)).success("版主卸任成功").error("操作失败");
}
}
......@@ -85,6 +85,6 @@ public class AdminForumIpAddressRuleController {
MemberSessionBean mbean,
HttpServletRequest request,
Model model){
return TipMessage.Builder.condition(()->forumIpAddressRuleService.editStatus(id, false)).success("Ip地址过滤规则删除成功").error("操作失败");
return TipMessage.Builder.take(()->forumIpAddressRuleService.editStatus(id, false)).success("Ip地址过滤规则删除成功").error("操作失败");
}
}
......@@ -164,7 +164,7 @@ public class AdminForumMessageController {
MemberSessionBean mbean,
HttpServletRequest request,
Model model){
return TipMessage.Builder.or(()->inboxService.remove(mbean.getMid(), Arrays.asList(id)) == 1).success("消息删除成功").error("操作失败");
return TipMessage.Builder.of(()->inboxService.remove(mbean.getMid(), Arrays.asList(id)) == 1).success("消息删除成功").error("操作失败");
}
//阅读消息(发件人不可以操作)
......@@ -175,7 +175,7 @@ public class AdminForumMessageController {
MemberSessionBean mbean,
HttpServletRequest request,
Model model){
return TipMessage.Builder.or(()->inboxService.readed(mbean.getMid(), Arrays.asList(id)) == 1).success("消息标记成功").error("操作失败");
return TipMessage.Builder.of(()->inboxService.readed(mbean.getMid(), Arrays.asList(id)) == 1).success("消息标记成功").error("操作失败");
}
@GetMapping(path="/label/json", produces = "application/json;charset=UTF-8")
......
......@@ -95,6 +95,6 @@ public class AdminMemberNamesProtectController {
MemberSessionBean mbean,
HttpServletRequest request,
Model model){
return TipMessage.Builder.condition(()->memberNamesProtectService.editStatus(id, false)).success("会员帐户保护删除成功").error("操作失败");
return TipMessage.Builder.take(()->memberNamesProtectService.editStatus(id, false)).success("会员帐户保护删除成功").error("操作失败");
}
}
......@@ -118,7 +118,7 @@ public class AdminMemberPenalizeRecordsController {
MemberSessionBean mbean,
HttpServletRequest request,
Model model){
return TipMessage.Builder.condition(()->memberPenalizeRecordsService.expired(id)).success("惩罚记录成功结束").error("操作失败");
return TipMessage.Builder.take(()->memberPenalizeRecordsService.expired(id)).success("惩罚记录成功结束").error("操作失败");
}
//会员的惩罚状态
......
......@@ -77,7 +77,7 @@ public class AdminPostsController {
HttpServletRequest request,
Model model){
ActionEventCulpritor aec = ActionEventCulpritor.getInstance(mbean.getMid(), mbean.getNickname(), request, "");
return TipMessage.Builder.condition(()->postsService.remove(postsId, aec)).success("回复删除成功").error("操作失败");
return TipMessage.Builder.take(()->postsService.remove(postsId, aec)).success("回复删除成功").error("操作失败");
}
//指定回复的喜好记录
......
......@@ -82,6 +82,6 @@ public class AdminRegisteInviteCodeController {
MemberSessionBean mbean,
HttpServletRequest request,
Model model){
return TipMessage.Builder.condition(()->registeInviteCodeService.remove(id)).success("邀请码删除成功").error("操作失败");
return TipMessage.Builder.take(()->registeInviteCodeService.remove(id)).success("邀请码删除成功").error("操作失败");
}
}
......@@ -428,6 +428,6 @@ public class AdminSectionArticleController {
HttpServletRequest request,
Model model){
ActionEventCulpritor aec = ActionEventCulpritor.getInstance(mbean.getMid(), mbean.getNickname(), request, "");
return TipMessage.Builder.condition(()->topicService.removeTermArticle(articleId, termId, aec)).success("文章删除成功").error("操作失败");
return TipMessage.Builder.take(()->topicService.removeTermArticle(articleId, termId, aec)).success("文章删除成功").error("操作失败");
}
}
......@@ -110,7 +110,7 @@ public class AdminTopicCarouselController {
MemberSessionBean mbean,
HttpServletRequest request,
Model model){
return TipMessage.Builder.condition(()->topicCarouselService.remove(topicCarouselId)).success("轮播图删除成功").error("操作失败");
return TipMessage.Builder.take(()->topicCarouselService.remove(topicCarouselId)).success("轮播图删除成功").error("操作失败");
}
//轮播图下所有幻灯片,忽略状态
@GetMapping(path="/slide")
......@@ -178,7 +178,7 @@ public class AdminTopicCarouselController {
MemberSessionBean mbean,
HttpServletRequest request,
Model model){
return TipMessage.Builder.condition(()->topicCarouselSlideService.remove(topicCarouselSlideId, topicCarouselId)).success("幻灯片删除成功").error("操作失败");
return TipMessage.Builder.take(()->topicCarouselSlideService.remove(topicCarouselSlideId, topicCarouselId)).success("幻灯片删除成功").error("操作失败");
}
//版块绑定轮播图
@GetMapping(path="/bind")
......@@ -224,7 +224,7 @@ public class AdminTopicCarouselController {
@RequestParam("volumes")int volumesId,
HttpServletRequest request,
Model model){
return TipMessage.Builder.condition(()->topicCarouselService.remove(topicCarouselId, volumesId, boardId)).success("版块轮播图关联删除成功").error("操作失败");
return TipMessage.Builder.take(()->topicCarouselService.remove(topicCarouselId, volumesId, boardId)).success("版块轮播图关联删除成功").error("操作失败");
}
//版块绑定轮播图记录
@GetMapping(path="/bind/result")
......
......@@ -106,7 +106,7 @@ public class AdminTopicCategoryController {
@RequestParam("id")int categoryId,
HttpServletRequest request,
Model model){
return TipMessage.Builder.condition(()->topicCategoryService.remove(categoryId)).success("话题类型删除成功").error("操作失败");
return TipMessage.Builder.take(()->topicCategoryService.remove(categoryId)).success("话题类型删除成功").error("操作失败");
}
//所有可用的
......
......@@ -326,7 +326,7 @@ public class AdminTopicController {
HttpServletRequest request,
Model model){
ActionEventCulpritor aec = ActionEventCulpritor.getInstance(mbean.getMid(), mbean.getNickname(), request, "");
return TipMessage.Builder.condition(()->topicService.lock(topicId, aec)).success("成功锁定话题").error("操作失败");
return TipMessage.Builder.take(()->topicService.lock(topicId, aec)).success("成功锁定话题").error("操作失败");
}
//锁定话题
@PostMapping(path="/lock/remove", produces = "application/json;charset=UTF-8")
......@@ -337,7 +337,7 @@ public class AdminTopicController {
HttpServletRequest request,
Model model){
ActionEventCulpritor aec = ActionEventCulpritor.getInstance(mbean.getMid(), mbean.getNickname(), request, "");
return TipMessage.Builder.condition(()->topicService.releaseLock(topicId, aec)).success("成功解锁话题").error("操作失败");
return TipMessage.Builder.take(()->topicService.releaseLock(topicId, aec)).success("成功解锁话题").error("操作失败");
}
//删除话题
@PostMapping(path="/remove", produces = "application/json;charset=UTF-8")
......@@ -348,7 +348,7 @@ public class AdminTopicController {
HttpServletRequest request,
Model model){
ActionEventCulpritor aec = ActionEventCulpritor.getInstance(mbean.getMid(), mbean.getNickname(), request, "");
return TipMessage.Builder.condition(()->topicService.remove(topicId, aec)).success("话题删除成功").error("操作失败");
return TipMessage.Builder.take(()->topicService.remove(topicId, aec)).success("话题删除成功").error("操作失败");
}
//置顶话题
@PostMapping(path="/top", produces = "application/json;charset=UTF-8")
......@@ -359,7 +359,7 @@ public class AdminTopicController {
HttpServletRequest request,
Model model){
ActionEventCulpritor aec = ActionEventCulpritor.getInstance(mbean.getMid(), mbean.getNickname(), request, "");
return TipMessage.Builder.condition(()->topicService.editTop(topicId, aec)).success("话题置顶成功").error("操作失败");
return TipMessage.Builder.take(()->topicService.editTop(topicId, aec)).success("话题置顶成功").error("操作失败");
}
@GetMapping(path="/{id}.xhtml")
......
......@@ -82,7 +82,7 @@ public class AdminTopicTagController {
HttpServletRequest request,
Model model){
ActionEventCulpritor aec = ActionEventCulpritor.getInstance(mbean.getMid(), mbean.getNickname(), request, token);
return TipMessage.Builder.condition(()->topicTagService.deleteForTopic(topicId, tagId, aec)).success("成功删除标签").error("操作失败");
return TipMessage.Builder.take(()->topicTagService.deleteForTopic(topicId, tagId, aec)).success("成功删除标签").error("操作失败");
}
@GetMapping(path="/collection")
......
......@@ -102,8 +102,7 @@ public final class TipMessage {
private final String message;
private Builder(boolean condition) {
this.condition = condition;
this.message = null;
this(condition, null);
}
private Builder(boolean condition, String message) {
......@@ -111,7 +110,7 @@ public final class TipMessage {
this.message = message;
}
public static Builder condition(Supplier<Optional<Boolean>> condition){
public static Builder take(Supplier<Optional<Boolean>> condition){
try{
return new Builder(condition.get().orElse(false));
}catch(Exception e){
......@@ -119,7 +118,7 @@ public final class TipMessage {
}
}
public static Builder or(Supplier<Boolean> condition){
public static Builder of(Supplier<Boolean> condition){
try{
return new Builder(condition.get());
}catch(Exception e){
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册