代码合并

app/controllers/admin/forumThread.js

@@ -29,9 +29,10 @@ router.post('/thread/create', function(req, res, next) {
 
 	var rs = {};
 	req.body.ent_code=req.session.user.ent_code;
+
 	var uid=req.session.user.id;
 	// var uid='12345';
-	
+
 	async.waterfall([
 			function(callback){
 				forumUserService.getUserByUid(uid,callback);
@@ -138,6 +139,7 @@ router.post('/thread/:tid/update', function(req, res, next) {
 	}
 });
 
+
 //删除文章
 router.post('/thread/:tid/delete', function(req, res, next) {
 	var tid=req.params.tid;
@@ -226,4 +228,75 @@ router.get('/threads/list', function(req, res, next) {
 			res.json(_.assign(results, returnCode.SUCCESS));
 		}
 	});
+});
+
+
+//评论列表
+router.get('/thread/:tid/comment/list', function(req, res, next) {
+
+
+	var tid=req.params.tid || null;
+	var pageNo = req.query.pageNo || 1;
+    var pageSize = req.query.pageSize || 10;
+
+    var conditions={
+		ent_code:req.session.user.ent_code,
+		thread:tid,
+		level:'1',
+		status:{$ne : 2} //过滤被删除的数据，status 为 2 表示删除
+	};
+
+	if(tid){
+		//获取最新5条评论											
+		forumCommentService.getAllComment(conditions,pageNo,pageSize,function(err,results){
+			if(err){
+				console.log(err);
+				res.json(returnCode.BUSY);
+			}else{
+				res.json(_.assign(results, returnCode.SUCCESS));
+			}
+		});
+	}else{
+		res.json(returnCode.WRONG_PARAM);
+	}
+});
+
+// 更新评论
+router.post('/thread/comment/update/:cid',function(req,res,next){
+	var cid = req.params.cid || null;
+	var status = req.body.status;
+
+	if(cid){
+		forumCommentService.updateCommentById(cid, status, function(err,result){
+			if(err){
+				res.json(returnCode.BUSY);
+			}else{
+				res.json(returnCode.SUCCESS);
+			}
+		});
+	}else{
+		res.json(returnCode.WRONG_PARAM);
+	}
+});
+
+
+//添加评论
+router.post('/thread/comment/add', function(req, res, next) {
+	var tid = req.body.tid || null;
+	var entity = req.body;
+	entity.created = new Date();
+	entity.ent_code = req.session.user.ent_code;
+	// entity.from = req.session.mobileForumUser.userId;  // 正式环境
+	entity.from = '55015675868b65a028187c49';  // 测试环境
+	if(tid){
+		// 添加评论
+		forumCommentService.createComment(entity,function(err,result){
+			if(err){
+				res.json(returnCode.BUSY);
+			}else{
+				res.json(returnCode.SUCCESS);
+			}
+		});
+	}
+	
 });
\ No newline at end of file