Skip to content

P
pisns-forum-api
Commit 39c167aa authored by 陈志良's avatar 陈志良
Browse files
Options

1

parent bc504856
Show whitespace changes
Inline Side-by-side
Showing with 68 additions and 70 deletions
app/controllers/mobile/forumThread.js
View file @ 39c167aa
...@@ -445,8 +445,10 @@ router.post('/thread/:tid/share', function(req, res, next) { ...@@ -445,8 +445,10 @@ router.post('/thread/:tid/share', function(req, res, next) {
}); });
//新增文章评论 //新增文章评论
router.post('/thread/:tid/comment/create', function(req, res, next) { router.post('/thread/:tid/comment/add', function(req, res, next) {
var userId = req.session.mobileForumUser.userId; var userId = req.session.mobileForumUser.userId;
console.log('!!!!!!!!!!!!!!!!!!!!!!!!!!!');
var data = null;
forumLimitActionRefService.checkLimitActionProhibitionOfSpeech(userId, function(err, isProhibition){ forumLimitActionRefService.checkLimitActionProhibitionOfSpeech(userId, function(err, isProhibition){
if(err){ if(err){
console.error(err); console.error(err);
...@@ -461,16 +463,17 @@ router.post('/thread/:tid/comment/create', function(req, res, next) { ...@@ -461,16 +463,17 @@ router.post('/thread/:tid/comment/create', function(req, res, next) {
var exp = req.session.openUser.exp || 0; var exp = req.session.openUser.exp || 0;
var destination = req.body.destination || '1'; var destination = req.body.destination || '1';
//1.检查是否有权限 //1.检查是否有权限
forumRolePermissionService.checkRolePermiss(req.session.user.ent_code, 'comment', integral, exp, function(err, result) { // forumRolePermissionService.checkRolePermiss(req.session.user.ent_code, 'comment', integral, exp, function(err, result) {
if (err) { // if (err) {
console.error(err); // console.error(err);
res.json(returnCode.BUSY); // res.json(returnCode.BUSY);
} else { // } else {
if (result) { //有操作权限 // if (result) { //有操作权限
var content = req.body.content; var content = req.body.content;
if (content) { //评论不能为空 if (content) { //评论不能为空
//2.获取论坛文章 //2.获取论坛文章
forumThreadService.getThreadById(tid, function(err, thread) { forumThreadService.getThreadById(tid, function(err, thread) {
console.log(err);
if (err) { if (err) {
res.json(returnCode.BUSY); res.json(returnCode.BUSY);
} else { } else {
...@@ -505,6 +508,7 @@ router.post('/thread/:tid/comment/create', function(req, res, next) { ...@@ -505,6 +508,7 @@ router.post('/thread/:tid/comment/create', function(req, res, next) {
if (err) { if (err) {
callback(err, null); callback(err, null);
} else { } else {
data = newComment ;
var comments = thread.comments; var comments = thread.comments;
// console.log('========='); // console.log('=========');
// console.log(comments); // console.log(comments);
...@@ -557,43 +561,9 @@ router.post('/thread/:tid/comment/create', function(req, res, next) { ...@@ -557,43 +561,9 @@ router.post('/thread/:tid/comment/create', function(req, res, next) {
} }
} }
}); });
async.parallel([
function(callback) {
//获取最新5条评论
var conditions = {
thread: tid,
level: '1'
};
forumCommentService.getAllComment(conditions, 1, 5, function(err, results) {
if (err) {
console.log(err);
callback(err, null);
} else {
callback(null, results);
}
});
},
function(callback) {
forumThreadService.getThreadById(tid, function(err, thread) {
if (err) {
console.log(err);
callback(err, null);
} else {
callback(null, thread);
}
});
}
], function(err, results) {
if (err) {
res.json(returnCode.BUSY);
} else {
var rs = {}; var rs = {};
rs.comments = results[0].items; rs.data = data;
rs.commentCount = results[1].comment_count;
res.json(_.assign(rs, returnCode.SUCCESS)); res.json(_.assign(rs, returnCode.SUCCESS));
}
});
} }
}); });
...@@ -602,11 +572,11 @@ router.post('/thread/:tid/comment/create', function(req, res, next) { ...@@ -602,11 +572,11 @@ router.post('/thread/:tid/comment/create', function(req, res, next) {
} else { } else {
res.json(returnCode.WRONG_PARAM); res.json(returnCode.WRONG_PARAM);
} }
} else { // } else {
res.json(returnCode.ACTION_NOT_PERMISSION); // res.json(returnCode.ACTION_NOT_PERMISSION);
} // }
} // }
}); // });
} else { } else {
res.json(returnCode.WRONG_PARAM); res.json(returnCode.WRONG_PARAM);
} }
...@@ -615,9 +585,8 @@ router.post('/thread/:tid/comment/create', function(req, res, next) { ...@@ -615,9 +585,8 @@ router.post('/thread/:tid/comment/create', function(req, res, next) {
}); });
}); });
//新增文章评论 //新增文章评论
router.post('/thread/:tid/comment/createv2', function(req, res, next) { router.post('/thread/:tid/comment/create', function(req, res, next) {
var userId = req.session.mobileForumUser.userId; var userId = req.session.mobileForumUser.userId;
var data = null;
forumLimitActionRefService.checkLimitActionProhibitionOfSpeech(userId, function(err, isProhibition){ forumLimitActionRefService.checkLimitActionProhibitionOfSpeech(userId, function(err, isProhibition){
if(err){ if(err){
console.error(err); console.error(err);
...@@ -632,17 +601,16 @@ router.post('/thread/:tid/comment/createv2', function(req, res, next) { ...@@ -632,17 +601,16 @@ router.post('/thread/:tid/comment/createv2', function(req, res, next) {
var exp = req.session.openUser.exp || 0; var exp = req.session.openUser.exp || 0;
var destination = req.body.destination || '1'; var destination = req.body.destination || '1';
//1.检查是否有权限 //1.检查是否有权限
// forumRolePermissionService.checkRolePermiss(req.session.user.ent_code, 'comment', integral, exp, function(err, result) { forumRolePermissionService.checkRolePermiss(req.session.user.ent_code, 'comment', integral, exp, function(err, result) {
// if (err) { if (err) {
// console.error(err); console.error(err);
// res.json(returnCode.BUSY); res.json(returnCode.BUSY);
// } else { } else {
// if (result) { //有操作权限 if (result) { //有操作权限
var content = req.body.content; var content = req.body.content;
if (content) { //评论不能为空 if (content) { //评论不能为空
//2.获取论坛文章 //2.获取论坛文章
forumThreadService.getThreadById(tid, function(err, thread) { forumThreadService.getThreadById(tid, function(err, thread) {
console.log(err);
if (err) { if (err) {
res.json(returnCode.BUSY); res.json(returnCode.BUSY);
} else { } else {
...@@ -677,7 +645,6 @@ router.post('/thread/:tid/comment/createv2', function(req, res, next) { ...@@ -677,7 +645,6 @@ router.post('/thread/:tid/comment/createv2', function(req, res, next) {
if (err) { if (err) {
callback(err, null); callback(err, null);
} else { } else {
data = newComment ;
var comments = thread.comments; var comments = thread.comments;
// console.log('========='); // console.log('=========');
// console.log(comments); // console.log(comments);
...@@ -730,9 +697,43 @@ router.post('/thread/:tid/comment/createv2', function(req, res, next) { ...@@ -730,9 +697,43 @@ router.post('/thread/:tid/comment/createv2', function(req, res, next) {
} }
} }
}); });
async.parallel([
function(callback) {
//获取最新5条评论
var conditions = {
thread: tid,
level: '1'
};
forumCommentService.getAllComment(conditions, 1, 5, function(err, results) {
if (err) {
console.log(err);
callback(err, null);
} else {
callback(null, results);
}
});
},
function(callback) {
forumThreadService.getThreadById(tid, function(err, thread) {
if (err) {
console.log(err);
callback(err, null);
} else {
callback(null, thread);
}
});
}
], function(err, results) {
if (err) {
res.json(returnCode.BUSY);
} else {
var rs = {}; var rs = {};
rs.data = data; rs.comments = results[0].items;
rs.commentCount = results[1].comment_count;
res.json(_.assign(rs, returnCode.SUCCESS)); res.json(_.assign(rs, returnCode.SUCCESS));
}
});
} }
}); });
...@@ -741,11 +742,11 @@ router.post('/thread/:tid/comment/createv2', function(req, res, next) { ...@@ -741,11 +742,11 @@ router.post('/thread/:tid/comment/createv2', function(req, res, next) {
} else { } else {
res.json(returnCode.WRONG_PARAM); res.json(returnCode.WRONG_PARAM);
} }
// } else { } else {
// res.json(returnCode.ACTION_NOT_PERMISSION); res.json(returnCode.ACTION_NOT_PERMISSION);
// } }
// } }
// }); });
} else { } else {
res.json(returnCode.WRONG_PARAM); res.json(returnCode.WRONG_PARAM);
} }
...@@ -879,9 +880,6 @@ router.post('/thread/:tid/comment/:cid/create', function(req, res, next) { ...@@ -879,9 +880,6 @@ router.post('/thread/:tid/comment/:cid/create', function(req, res, next) {
} }
} }
}); });
}); });
//更改评论状态为3(删除) //更改评论状态为3(删除)
......
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