Commit 9567247d authored by 邓军's avatar 邓军

标签置顶

parent 21a75806
...@@ -7,6 +7,7 @@ var mongoose = require('mongoose'); ...@@ -7,6 +7,7 @@ var mongoose = require('mongoose');
var ForumTag = mongoose.model('ForumTag'); var ForumTag = mongoose.model('ForumTag');
var forumTagService=require('../../service/forumTagService'); var forumTagService=require('../../service/forumTagService');
var forumThreadService=require('../../service/forumThreadService');
module.exports = function(app) { module.exports = function(app) {
app.use('/admin/forum', router); app.use('/admin/forum', router);
...@@ -27,6 +28,20 @@ router.post('/tag/create', function(req, res, next) { ...@@ -27,6 +28,20 @@ router.post('/tag/create', function(req, res, next) {
}); });
}); });
//标签置顶
router.get('/tag/:tid/top',function(req,res,next){
var tid = req.params.tid;
var tag_top = req.query.tag_top;
forumThreadService.updateTagTop(tid,tag_top,function(err,result){
if(err){
console.error(err);
res.json(returnCode.BUSY);
}else{
res.json(_.assign(result, returnCode.SUCCESS));
}
});
});
//删除论坛标签 //删除论坛标签
router.post('/tag/:tid/delete', function(req, res, next) { router.post('/tag/:tid/delete', function(req, res, next) {
var tid=req.params.tid; var tid=req.params.tid;
......
...@@ -289,8 +289,7 @@ router.post('/thread/comment/update/:cid/comments',function(req,res,next){ ...@@ -289,8 +289,7 @@ router.post('/thread/comment/update/:cid/comments',function(req,res,next){
callback(err,null); callback(err,null);
} else { } else {
var commentList = result.comments; var commentList = result.comments;
console.log('准备插入:' + replayComment_id);
console.log(result._id);
result.comments.push(replayComment_id); result.comments.push(replayComment_id);
......
...@@ -51,11 +51,14 @@ router.get('/tag/mobileList', function(req, res, next) { ...@@ -51,11 +51,14 @@ router.get('/tag/mobileList', function(req, res, next) {
}); });
}); });
//查询标签下的文章列表 //查询标签下的文章列表
router.get('/tag/:tid/threads', function(req, res, next) { router.get('/tag/:tid/threads', function(req, res, next) {
var pageNo = req.query.pageNo || 1; var pageNo = req.query.pageNo || 1;
var pageSize = req.query.pageSize || 10; var pageSize = req.query.pageSize || 10;
var tid=req.params.tid; var tid=req.params.tid;
var sort = req.query.sort || '';
var conditions={ var conditions={
ent_code:req.session.user.ent_code ent_code:req.session.user.ent_code
}; };
...@@ -84,7 +87,7 @@ router.get('/tag/:tid/threads', function(req, res, next) { ...@@ -84,7 +87,7 @@ router.get('/tag/:tid/threads', function(req, res, next) {
if(result){ if(result){
conditions._id={$nin:result.thread}; conditions._id={$nin:result.thread};
} }
forumThreadService.getAllThreadByFid(conditions,pageNo,pageSize,null,function(err,results){ forumThreadService.getAllThreadByFid(conditions,pageNo,pageSize,sort,function(err,results){
if(err){ if(err){
console.error(err); console.error(err);
res.json(returnCode.BUSY); res.json(returnCode.BUSY);
......
...@@ -60,6 +60,14 @@ var ForumThreadSchema = new Schema({ ...@@ -60,6 +60,14 @@ var ForumThreadSchema = new Schema({
}, },
topTime:{//置顶时间 topTime:{//置顶时间
type: Date type: Date
}
,tag_top: { //标签话题是否置顶0否,1是
type: Number,
require: true,
default: 0
},
tag_topTime:{//标签话题置顶时间
type: Date
}, },
tag: [{type: Schema.Types.ObjectId, ref: 'ForumTag'}],//话题归属标签, tag: [{type: Schema.Types.ObjectId, ref: 'ForumTag'}],//话题归属标签,
comments: [{type: Schema.Types.ObjectId, ref: 'ForumComment'}], //评论内容列表 comments: [{type: Schema.Types.ObjectId, ref: 'ForumComment'}], //评论内容列表
......
...@@ -9,7 +9,7 @@ var forumCommentService = require('./forumCommentService'); ...@@ -9,7 +9,7 @@ var forumCommentService = require('./forumCommentService');
var async = require('async'); var async = require('async');
var then = require('thenjs'); var then = require('thenjs');
//查询帖子 //根据发帖者分页查询话题列表
exports.findThreadByPage = function(pageNo, pageSize, q, callback) { exports.findThreadByPage = function(pageNo, pageSize, q, callback) {
then(function(cont) { then(function(cont) {
ForumThread.find(q).populate('from').count(cont); ForumThread.find(q).populate('from').count(cont);
...@@ -476,7 +476,7 @@ function getAllThreadByFidHelp(conditions, pageNo, pageSize, sort, callback) { ...@@ -476,7 +476,7 @@ function getAllThreadByFidHelp(conditions, pageNo, pageSize, sort, callback) {
} else { } else {
var skip = (pageNo - 1) * pageSize; var skip = (pageNo - 1) * pageSize;
var limit = count - skip > pageSize ? pageSize : (count - skip); var limit = count - skip > pageSize ? pageSize : (count - skip);
var sortBy = '-topTime -created'; var sortBy = '-topTime -tag_topTime -created';
if (sort) { if (sort) {
sortBy = sort; sortBy = sort;
} }
...@@ -585,6 +585,26 @@ exports.updateUnTopByThreadId = function(infoId, threadId, callback) { ...@@ -585,6 +585,26 @@ exports.updateUnTopByThreadId = function(infoId, threadId, callback) {
}); });
}; };
//根据板块ID更新标签置顶(置顶)
exports.updateTagTop = function(tid,tag_top,callback){
var time = '';
if(tag_top == 1){
time = new Date();
}
ForumThread.findOneAndUpdate({
_id: tid
}, {
tag_top: tag_top,
tag_topTime: time
}, function(err, doc) {
if (err) {
callback(err, null);
} else {
callback(null, doc);
}
});
};
//更新文章点赞数 //更新文章点赞数
exports.updateThreadRaiseCount = function(threadId, callback) { exports.updateThreadRaiseCount = function(threadId, callback) {
ForumThread.update({ ForumThread.update({
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment