From 7e7f1c2b3c2dc0431c43cef1953892d54f352faa Mon Sep 17 00:00:00 2001 From: lxyer <237809796@qq.com> Date: Sun, 3 Jun 2018 00:22:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=B8=96=E5=AD=90=E5=8F=AF?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE"=E7=A7=81=E5=AF=86"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- root/index.html | 8 ++++++++ root/jie/add.html | 14 ++++++++++++-- root/jie/detail.html | 12 +++++++++++- root/jie/index.html | 4 ++++ root/res/mods/jie.js | 2 +- src/com/lxyer/bbs/content/Content.java | 1 + src/com/lxyer/bbs/content/ContentBean.java | 12 ++---------- src/com/lxyer/bbs/content/ContentService.java | 12 +++++++++--- src/com/lxyer/bbs/servlet/IndexServlet.java | 14 +++++++------- 9 files changed, 55 insertions(+), 24 deletions(-) diff --git a/root/index.html b/root/index.html index 47e5a63..5a324b9 100644 --- a/root/index.html +++ b/root/index.html @@ -18,7 +18,11 @@ #(x.nickname)

+ #if(x.status == 3) + 私密 + #else #(x.typeName) + #end #if(x.top == 3) #(x.title) @@ -79,7 +83,11 @@ #(x.nickname)

+ #if(x.status == 3) + 私密 + #else #(x.typeName) + #end #(x.title)

diff --git a/root/jie/add.html b/root/jie/add.html index 5567e16..c9d61b6 100644 --- a/root/jie/add.html +++ b/root/jie/add.html @@ -24,14 +24,14 @@ - #if(mine.userId?? == 100001) + #if(mine.roleId?? == 1) #end
-
+
@@ -39,6 +39,16 @@
+
+ +
+ +
+
diff --git a/root/jie/detail.html b/root/jie/detail.html index c2d6a6d..d7b5efe 100644 --- a/root/jie/detail.html +++ b/root/jie/detail.html @@ -13,7 +13,11 @@

#(bean.title)

- #(bean.typeName) + #if(bean.status == 3) + 私密 + #else + #(bean.typeName) + #end 未结 @@ -37,6 +41,12 @@ #else 加精 #end + + #if(bean.status != 3) + 设为私密 + #else + 设为公开 + #end
#end diff --git a/root/jie/index.html b/root/jie/index.html index f84da49..55bff43 100644 --- a/root/jie/index.html +++ b/root/jie/index.html @@ -37,7 +37,11 @@ #(x.nickname)

+ #if(x.status == 3) + 私密 + #else #(x.typeName) + #end #(x.title)

diff --git a/root/res/mods/jie.js b/root/res/mods/jie.js index 4475adc..ea95c40 100644 --- a/root/res/mods/jie.js +++ b/root/res/mods/jie.js @@ -237,7 +237,7 @@ layui.define(['fly','laypage'], function(exports){ form.on('submit(jie-add)', function(data){ var bean = {}; - ["contentId","title", "content", "type"].forEach(function (value) { + ["contentId","title", "content", "type", "status"].forEach(function (value) { bean[value] = data.field[value]; }); bean["content"] = editor.txt.html(); diff --git a/src/com/lxyer/bbs/content/Content.java b/src/com/lxyer/bbs/content/Content.java index 3805471..4a8c130 100644 --- a/src/com/lxyer/bbs/content/Content.java +++ b/src/com/lxyer/bbs/content/Content.java @@ -190,6 +190,7 @@ public class Content implements java.io.Serializable { info.setWonderful(wonderful); info.setTop(top); info.setSolved(solved); + info.setStatus(status); info.setTypeName(types.getOrDefault(type, "其他").toString()); info.setCreateTime(LxyKit.dateFmt(createTime)); diff --git a/src/com/lxyer/bbs/content/ContentBean.java b/src/com/lxyer/bbs/content/ContentBean.java index f320207..8b93dbf 100644 --- a/src/com/lxyer/bbs/content/ContentBean.java +++ b/src/com/lxyer/bbs/content/ContentBean.java @@ -54,10 +54,10 @@ public class ContentBean implements FilterBean,java.io.Serializable { private int top; @Column(comment = "[结帖]大于0结帖") - private int solved;*/ + private int solved; @Column(comment = "[状态]") - private int status = 1; + private int status = 1;*/ public void setContentId(int contentId) { this.contentId = contentId; @@ -139,14 +139,6 @@ public class ContentBean implements FilterBean,java.io.Serializable { this.viewNum = viewNum; } - public int getStatus() { - return status; - } - - public void setStatus(int status) { - this.status = status; - } - @Override public String toString() { return JsonConvert.root().convertTo(this); diff --git a/src/com/lxyer/bbs/content/ContentService.java b/src/com/lxyer/bbs/content/ContentService.java index f02e4cb..301efce 100644 --- a/src/com/lxyer/bbs/content/ContentService.java +++ b/src/com/lxyer/bbs/content/ContentService.java @@ -56,7 +56,7 @@ public class ContentService extends BaseService{ } @RestMapping(name = "query", auth = false, comment = "内容列表") - public Sheet contentQuery(Flipper flipper, String actived){ + public Sheet contentQuery(Flipper flipper, String actived, int currentId){ FilterNode filterNode = FilterNode.create("status", FilterExpress.NOTEQUAL, -1); switch (actived){ case "top": filterNode.and("top", 1);break; @@ -65,6 +65,12 @@ public class ContentService extends BaseService{ case "solved": filterNode.and("solved", 1);break; case "wonderful": filterNode.and("wonderful", 1);break; } + if (currentId > 0){ + filterNode.and(FilterNode.create("status", FilterExpress.NOTEQUAL, 3).or(FilterNode.create("status", 3).and("userId", currentId))); + }else { + filterNode.and("status", FilterExpress.NOTEQUAL, 3); + } + return contentQuery(flipper, filterNode); } @@ -102,7 +108,7 @@ public class ContentService extends BaseService{ source.insert(content); }else { - source.updateColumn(content, SelectColumn.createIncludes("title", "digest", "content","type")); + source.updateColumn(content, SelectColumn.createIncludes("title", "digest", "content","type", "status")); } return RetResult.success(); @@ -206,7 +212,7 @@ public class ContentService extends BaseService{ //热议 Flipper flipper3 = new Flipper().limit(8).sort("replyNum DESC"); - Sheet hotReply = contentService.contentQuery(flipper3, ""); + Sheet hotReply = contentService.contentQuery(flipper3, "", 0); //最新加入 Sheet lastReg = userService.lastReg(); diff --git a/src/com/lxyer/bbs/servlet/IndexServlet.java b/src/com/lxyer/bbs/servlet/IndexServlet.java index c48aa47..965d2f7 100644 --- a/src/com/lxyer/bbs/servlet/IndexServlet.java +++ b/src/com/lxyer/bbs/servlet/IndexServlet.java @@ -47,11 +47,11 @@ public class IndexServlet extends BaseServlet { Flipper flipper = new Flipper().limit(30).sort("top DESC,createTime DESC"); //置顶贴 FilterNode topNode = FilterNode.create("status", FilterExpress.NOTEQUAL, -1).and("top", FilterExpress.GREATERTHAN, 0); - Sheet top = contentService.contentQuery(flipper, topNode); + Sheet top = contentService.contentQuery(flipper, setPrivate(topNode)); //非置顶贴 FilterNode untopNode = FilterNode.create("status", FilterExpress.NOTEQUAL, -1).and("top", 0); - Sheet contents = contentService.contentQuery(flipper, untopNode); + Sheet contents = contentService.contentQuery(flipper, setPrivate(untopNode)); //热帖 /*Flipper flipper2 = new Flipper().limit(8).sort("viewNum DESC"); @@ -59,7 +59,7 @@ public class IndexServlet extends BaseServlet { //热议 Flipper flipper3 = new Flipper().limit(8).sort("replyNum DESC"); - Sheet hotReply = contentService.contentQuery(flipper3, ""); + Sheet hotReply = contentService.contentQuery(flipper3, "", currentId()); //最新加入 Sheet lastReg = userService.lastReg(); @@ -86,11 +86,11 @@ public class IndexServlet extends BaseServlet { if (solved > -1) filterNode.and("solved", solved); if (wonderful > -1) filterNode.and("wonderful", wonderful); - Sheet contents = contentService.contentQuery(flipper, filterNode); + Sheet contents = contentService.contentQuery(flipper, setPrivate(filterNode)); //热议 Flipper flipper3 = new Flipper().limit(8).sort("replyNum DESC"); - Sheet hotReply = contentService.contentQuery(flipper3, ""); + Sheet hotReply = contentService.contentQuery(flipper3, "", currentId()); Kv kv = Kv.by("contents", contents).set("hotReply", hotReply) @@ -194,7 +194,7 @@ public class IndexServlet extends BaseServlet { //分页帖子列表 Flipper flipper = new Flipper().offset((curr-1)*15).limit(15).sort("top DESC,createTime DESC"); - Sheet contents = contentService.contentQuery(flipper, actived); + Sheet contents = contentService.contentQuery(flipper, actived, currentId()); Kv kv = Kv.by("contents", contents).set("url", request.getRequestURI()) .set("actived", actived).set("curr", curr); @@ -227,7 +227,7 @@ public class IndexServlet extends BaseServlet { //热议 Flipper flipper3 = new Flipper().limit(8).sort("replyNum DESC"); - Sheet hotReply = contentService.contentQuery(flipper3, ""); + Sheet hotReply = contentService.contentQuery(flipper3, "", currentId()); //更新 CompletableFuture.supplyAsync(new Supplier() {