Skip to content

P
pisns-forum-api
Commit 0c1302b5 authored by strong's avatar strong
Browse files
Options

Merge branch 'newfunc_1120_thread_quality' 

# Conflicts:
#	app/controllers/mobile/forumThread.js
parents 43a2e2b3 89770488
Hide whitespace changes
Inline Side-by-side
Showing with 629 additions and 156 deletions
app/controllers/admin/forumIdentifyUser.js
View file @ 0c1302b5
...@@ -6,6 +6,7 @@ var express = require('express'), ...@@ -6,6 +6,7 @@ var express = require('express'),
var mongoose = require('mongoose'); var mongoose = require('mongoose');
var moment = require('moment'); var moment = require('moment');
var ForumThread=require('../../models/forumThread');
var forumUserService=require('../../service/forumUserService'); var forumUserService=require('../../service/forumUserService');
var forumThreadService=require('../../service/forumThreadService'); var forumThreadService=require('../../service/forumThreadService');
var httpService=require('../../service/httpService'); var httpService=require('../../service/httpService');
...@@ -37,27 +38,36 @@ function compareTime(now, begin_time, end_time) { ...@@ -37,27 +38,36 @@ function compareTime(now, begin_time, end_time) {
} }
} }
var updateUser = function(uid,nickName,icon){ var updateUser = function(user,entity){
var entity = {}, var updateObj = {},
isUpdate = false; isUpdate = false;
if(nickName){ if(user && entity && user._id){
entity.nickName = nickName; if(entity.nickName && user.nickName !== entity.nickName){
isUpdate = true; updateObj.nickName = entity.nickName;
} isUpdate = true;
if(icon){ }
entity.icon = icon;
isUpdate = true; if(entity.icon && user.icon !== entity.icon){
} updateObj.icon = entity.icon;
if(isUpdate){ isUpdate = true;
forumUserService.updateUserById(uid,entity,function(err,result){ }
if(err){
console.log(err); if(entity.mid && !user.mid){
}else{ updateObj.mid = entity.mid;
console.log('用户:'+uid+'---------更新成功'); isUpdate = true;
console.log(entity); }
}
}); if(isUpdate){
} forumUserService.updateUserById(user._id,updateObj,function(err,result){
if(err){
console.log(err);
}else{
console.log('用户:'+user._id+'---------更新成功');
console.log(updateObj);
}
});
}
}
} }
//验证用户身份 //验证用户身份
router.post('/user/identifyUser',function(req,res,next){ router.post('/user/identifyUser',function(req,res,next){
...@@ -67,29 +77,27 @@ router.post('/user/identifyUser',function(req,res,next){ ...@@ -67,29 +77,27 @@ router.post('/user/identifyUser',function(req,res,next){
}else if(!req.session.mobileForumUser || req.session.mobileForumUser.openId !== entity.openId){ }else if(!req.session.mobileForumUser || req.session.mobileForumUser.openId !== entity.openId){
forumUserService.getUserByUid(entity.uid,function(err,doc){ forumUserService.getUserByUid(entity.uid,function(err,doc){
if(err){ if(err){
console.log(err); console.error(err);
res.json('error'); res.json('error');
}else{ }else{
if(doc){ if(doc){
if(entity.nickName || entity.icon){ updateUser(doc,entity);
if(doc.nickName !== entity.nickName || doc.icon !== entity.icon){
updateUser(doc._id,entity.nickName,entity.icon);
}
}
req.session.mobileForumUser={ req.session.mobileForumUser={
userId:doc._id, userId:doc._id,
openId:doc.uid openId:doc.uid,
mid:doc.mid || entity.mid
}; };
res.json({result:'success',userId:doc._id}); res.json({result:'success',userId:doc._id});
}else{ }else{
forumUserService.createUser(entity,function(err,doc){ forumUserService.createUser(entity,function(err,doc){
if(err){ if(err){
console.log(err); console.error(err);
res.json('error'); res.json('error');
}else{ }else{
req.session.mobileForumUser={ req.session.mobileForumUser={
userId:doc._id, userId:doc._id,
openId:doc.uid openId:doc.uid,
mid:doc.mid
}; };
res.json({result:'success',userId:doc._id}); res.json({result:'success',userId:doc._id});
} }
...@@ -196,4 +204,3 @@ router.post('/user/checkLimitAction', function(req, res, next) { ...@@ -196,4 +204,3 @@ router.post('/user/checkLimitAction', function(req, res, next) {
res.json(returnObject); res.json(returnObject);
} }
}); });
app/controllers/admin/forumMember.js
View file @ 0c1302b5
...@@ -51,6 +51,9 @@ router.post('/member/searchMembers', function(req, res, next) { ...@@ -51,6 +51,9 @@ router.post('/member/searchMembers', function(req, res, next) {
$regex: search.nickName $regex: search.nickName
}; };
} }
if(search.mid){
q.mid = search.mid;
}
if (search.displayName) { if (search.displayName) {
q.displayName = { q.displayName = {
$regex: search.displayName $regex: search.displayName
......
app/controllers/admin/forumThread.js
View file @ 0c1302b5
...@@ -20,7 +20,7 @@ var forumThreadService = require('../../service/forumThreadService'), ...@@ -20,7 +20,7 @@ var forumThreadService = require('../../service/forumThreadService'),
forumCommentService = require('../../service/forumCommentService'), forumCommentService = require('../../service/forumCommentService'),
forumTagService = require('../../service/forumTagService'), forumTagService = require('../../service/forumTagService'),
forumUserService = require('../../service/forumUserService'), forumUserService = require('../../service/forumUserService'),
// var forumLimitActionRefService = require('../../service/forumLimitActionRefService'); // var forumLimitActionRefService = require('../../service/forumLimitActionRefService');
forumLimitOperationService = require('../../service/forumLimitOperationService'), forumLimitOperationService = require('../../service/forumLimitOperationService'),
forumAboutMEService = require('../../service/forumAboutMEService'), forumAboutMEService = require('../../service/forumAboutMEService'),
httpService = require('../../service/httpService'); httpService = require('../../service/httpService');
...@@ -385,6 +385,8 @@ router.get('/threads/list', function(req, res, next) { ...@@ -385,6 +385,8 @@ router.get('/threads/list', function(req, res, next) {
var type = req.query.type; var type = req.query.type;
var status = req.query.status; var status = req.query.status;
var nickName = req.query.nickName; var nickName = req.query.nickName;
var mid = req.query.mid;
var quality = req.query.quality;
var conditions = { var conditions = {
ent_code: req.session.user.ent_code, ent_code: req.session.user.ent_code,
...@@ -420,8 +422,27 @@ router.get('/threads/list', function(req, res, next) { ...@@ -420,8 +422,27 @@ router.get('/threads/list', function(req, res, next) {
if (status) { if (status) {
conditions.status = status; conditions.status = status;
} }
if (quality) {
if (nickName) { conditions.quality = quality;
}
if (mid) {
forumThreadService.getAllThreadByFidAndMid(mid, conditions, pageNo, pageSize, null, function(err, results) {
if (err) {
console.error(err);
res.json(returnCode.BUSY);
} else {
if (pid) {
forumThreadService.getById(pid, function(err, parentThread) {
res.json(_.assign({
parentThread: parentThread
}, results, returnCode.SUCCESS));
});
} else {
res.json(_.assign(results, returnCode.SUCCESS));
}
}
});
} else if (nickName) {
forumThreadService.getAllThreadByFidAndNickName(nickName, conditions, pageNo, pageSize, null, function(err, results) { forumThreadService.getAllThreadByFidAndNickName(nickName, conditions, pageNo, pageSize, null, function(err, results) {
if (err) { if (err) {
console.error(err); console.error(err);
...@@ -440,7 +461,7 @@ router.get('/threads/list', function(req, res, next) { ...@@ -440,7 +461,7 @@ router.get('/threads/list', function(req, res, next) {
} }
}); });
} else { } else {
forumThreadService.getAllThreadByFid(conditions, pageNo, pageSize, null, function(err, results) { forumThreadService.getAllThreadByFid(conditions, pageNo, pageSize, "-created", function(err, results) {
if (err) { if (err) {
console.error(err); console.error(err);
res.json(returnCode.BUSY); res.json(returnCode.BUSY);
...@@ -561,6 +582,37 @@ router.get('/thread/:tid/comment/list/:floor', function(req, res, next) { ...@@ -561,6 +582,37 @@ router.get('/thread/:tid/comment/list/:floor', function(req, res, next) {
} }
}); });
//评论列表(根据楼层查询)
router.get('/thread/:tid/comment/list/member/:mid', function(req, res, next) {
var tid = req.params.tid || null,
content = req.query.content || '',
mid = req.params.mid,
pageNo = req.query.pageNo || 1,
pageSize = req.query.pageSize || 10;
var conditions = {
ent_code: req.session.user.ent_code,
thread: tid
};
if (content) {
conditions.content = {
$regex: content,
$options: 'i'
};
}
if (tid && mid) {
forumCommentService.getCommentListByMid(mid, conditions, pageNo, pageSize, function(err, results) {
if (err) {
console.error(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) { router.post('/thread/comment/update/:cid', function(req, res, next) {
var cid = req.params.cid || null; var cid = req.params.cid || null;
...@@ -1024,81 +1076,109 @@ router.get('/thread/:tid/spreadchain', function(req, res, next) { ...@@ -1024,81 +1076,109 @@ router.get('/thread/:tid/spreadchain', function(req, res, next) {
// 导出文章评论内容 // 导出文章评论内容
router.get('/thread/:tid/exportComments', function(req, res, next) { router.get('/thread/:tid/exportComments', function(req, res, next) {
var tid = req.params.tid || null, var tid = req.params.tid || null,
ent_code = req.query.ent_code || null; ent_code = req.session.user.ent_code || null,
then(function(cont){ mid = req.query.mid,
if(tid && ent_code){ floor = req.query.floor,
content = req.query.content;
then(function(cont) {
if (tid && ent_code) {
then.parallel([ then.parallel([
function(cont2){ function(cont2) {
forumThreadService.getThreadByIdSimple({_id:tid},function(err,doc){ forumThreadService.getThreadByIdSimple({
forumPraiseLogService.queryPraiseLogV2({ent_code:ent_code,thread:tid,type:1}, function(err, results){ _id: tid
if(err){ }, function(err, doc) {
forumPraiseLogService.queryPraiseLogV2({
ent_code: ent_code,
thread: tid,
type: 1
}, function(err, results) {
if (err) {
cont2(err); cont2(err);
}else{ } else {
if(results && results.length>0){ if (results && results.length > 0) {
var praiseNames = []; var praiseNames = [];
var praiseOpenIds = []; var praiseOpenIds = [];
_.forEach(results, function(e) { _.forEach(results, function(e) {
if(e.user){ if (e.user) {
praiseNames.push(e.user.nickName || '游客'); praiseNames.push(e.user.nickName || '游客');
praiseOpenIds.push(e.user.uid); praiseOpenIds.push(e.user.uid);
} }
}); });
doc = doc.toObject(); doc = doc.toObject();
doc.praiseNames = praiseNames.toString(); doc.praiseNames = praiseNames.toString();
doc.praiseOpenIds = praiseOpenIds.toString(); doc.praiseOpenIds = praiseOpenIds.toString();
cont2(null,doc); cont2(null, doc);
}else{ } else {
doc = doc.toObject(); doc = doc.toObject();
doc.praiseNames = ''; doc.praiseNames = '';
doc.praiseOpenIds = ''; doc.praiseOpenIds = '';
cont2(null,doc); cont2(null, doc);
} }
} }
}); });
}); });
}, },
function(cont2){ function(cont2) {
var conditions = { var conditions = {
ent_code: ent_code, ent_code: ent_code,
thread: tid, thread: tid
level:1
}; };
//查询所有评论 if (content) {
forumCommentService.getAllCommentByThread(conditions, function(err, docs) { conditions.content = {
cont2(err,docs); $regex: content,
}); $options: 'i'
};
}
if (mid) {
forumCommentService.getCommentListByMid(mid, conditions, 1, 10000, function(err, results) {
cont2(err, results ? results.items : []);
});
} else if (floor) {
conditions.level = '1';
conditions.floor = floor;
forumCommentService.getAllComment(conditions, 1, 1, function(err, results) {
cont2(err, results ? results.items : []);
});
} else {
conditions.level = '1';
//查询所有评论
forumCommentService.getAllCommentByThread(conditions, function(err, docs) {
cont2(err, docs);
});
}
} }
]).then(function(cont2,datas){ ]).then(function(cont2, datas) {
cont(null,datas[0],datas[1]); cont(null, datas[0], datas[1]);
}).fail(function(cont2,err){ }).fail(function(cont2, err) {
cont(err); cont(err);
}); });
}else{ } else {
cont('params error'); cont('params error');
} }
}).then(function(cont,thread,comments){ }).then(function(cont, thread, comments) {
//获取点赞信息 //获取点赞信息
var asyncTasks = []; var asyncTasks = [];
_.forEach(comments, function(e) { _.forEach(comments, function(e) {
asyncTasks.push(function(cb) { asyncTasks.push(function(cb) {
var conditions = { var conditions = {
ent_code:ent_code, ent_code: ent_code,
thread:tid, thread: tid,
type:2, type: 2,
comment:e._id comment: e._id
} }
forumPraiseLogService.queryPraiseLogV2(conditions, function(err, results){ forumPraiseLogService.queryPraiseLogV2(conditions, function(err, results) {
if(err){ if (err) {
cb(null, e); cb(null, e);
}else{ } else {
if(results){ if (results) {
var praiseNames = []; var praiseNames = [];
var praiseOpenIds = []; var praiseOpenIds = [];
_.forEach(results, function(e2) { _.forEach(results, function(e2) {
if(e2.user){ if (e2.user) {
praiseNames.push(e2.user.nickName || '游客'); praiseNames.push(e2.user.nickName || '游客');
praiseOpenIds.push(e2.user.uid); praiseOpenIds.push(e2.user.uid);
} }
}); });
e.praiseNames = praiseNames.toString(); e.praiseNames = praiseNames.toString();
...@@ -1111,94 +1191,141 @@ router.get('/thread/:tid/exportComments', function(req, res, next) { ...@@ -1111,94 +1191,141 @@ router.get('/thread/:tid/exportComments', function(req, res, next) {
}); });
}); });
async.parallel(asyncTasks, function(err, items) { async.parallel(asyncTasks, function(err, items) {
cont(err,thread,items); cont(err, thread, items);
}); });
}).then(function(cont,thread,items){ }).then(function(cont, thread, items) {
//表头 //表头
var conf = {}, var conf = {},
rows = []; rows = [];
conf.cols = [ conf.cols = [{
{caption:'帖子标题', type:'string'}, caption: '帖子标题',
{caption:'发布时间', type:'string'}, type: 'string'
{caption:'发帖人', type:'string'}, }, {
{caption:'openId', type:'string'}, caption: '发布时间',
{caption:'内容', type:'string'}, type: 'string'
{caption:'评论数', type:'string'}, }, {
{caption:'转发数', type:'string'}, caption: '发帖人',
{caption:'点赞数', type:'string'}, type: 'string'
{caption:'点赞人', type:'string'}, }, {
{caption:'点赞点赞人openId', type:'string'} caption: 'openId',
]; type: 'string'
//内容 }, {
//文章内容 caption: '会员编号',
var t_title = thread.title == '发话题'?'无标题':thread.title, type: 'string'
t_time = date_format(thread.created), }, {
t_from = thread.from?thread.from.nickName:'游客', caption: '内容',
t_from_openId = thread.from?thread.from.uid:'', type: 'string'
t_praiseNames = thread.praiseNames, }, {
t_praiseOpenIds = thread.praiseOpenIds; caption: '评论数',
type: 'string'
var contentReplace = function(str){ }, {
var strAfter = ''; caption: '转发数',
var regex = /[\0-\x1F\x7F-\x9F\xAD\u0378\u0379\u037F-\u0383\u038B\u038D\u03A2\u0528-\u0530\u0557\u0558\u0560\u0588\u058B-\u058E\u0590\u05C8-\u05CF\u05EB-\u05EF\u05F5-\u0605\u061C\u061D\u06DD\u070E\u070F\u074B\u074C\u07B2-\u07BF\u07FB-\u07FF\u082E\u082F\u083F\u085C\u085D\u085F-\u089F\u08A1\u08AD-\u08E3\u08FF\u0978\u0980\u0984\u098D\u098E\u0991\u0992\u09A9\u09B1\u09B3-\u09B5\u09BA\u09BB\u09C5\u09C6\u09C9\u09CA\u09CF-\u09D6\u09D8-\u09DB\u09DE\u09E4\u09E5\u09FC-\u0A00\u0A04\u0A0B-\u0A0E\u0A11\u0A12\u0A29\u0A31\u0A34\u0A37\u0A3A\u0A3B\u0A3D\u0A43-\u0A46\u0A49\u0A4A\u0A4E-\u0A50\u0A52-\u0A58\u0A5D\u0A5F-\u0A65\u0A76-\u0A80\u0A84\u0A8E\u0A92\u0AA9\u0AB1\u0AB4\u0ABA\u0ABB\u0AC6\u0ACA\u0ACE\u0ACF\u0AD1-\u0ADF\u0AE4\u0AE5\u0AF2-\u0B00\u0B04\u0B0D\u0B0E\u0B11\u0B12\u0B29\u0B31\u0B34\u0B3A\u0B3B\u0B45\u0B46\u0B49\u0B4A\u0B4E-\u0B55\u0B58-\u0B5B\u0B5E\u0B64\u0B65\u0B78-\u0B81\u0B84\u0B8B-\u0B8D\u0B91\u0B96-\u0B98\u0B9B\u0B9D\u0BA0-\u0BA2\u0BA5-\u0BA7\u0BAB-\u0BAD\u0BBA-\u0BBD\u0BC3-\u0BC5\u0BC9\u0BCE\u0BCF\u0BD1-\u0BD6\u0BD8-\u0BE5\u0BFB-\u0C00\u0C04\u0C0D\u0C11\u0C29\u0C34\u0C3A-\u0C3C\u0C45\u0C49\u0C4E-\u0C54\u0C57\u0C5A-\u0C5F\u0C64\u0C65\u0C70-\u0C77\u0C80\u0C81\u0C84\u0C8D\u0C91\u0CA9\u0CB4\u0CBA\u0CBB\u0CC5\u0CC9\u0CCE-\u0CD4\u0CD7-\u0CDD\u0CDF\u0CE4\u0CE5\u0CF0\u0CF3-\u0D01\u0D04\u0D0D\u0D11\u0D3B\u0D3C\u0D45\u0D49\u0D4F-\u0D56\u0D58-\u0D5F\u0D64\u0D65\u0D76-\u0D78\u0D80\u0D81\u0D84\u0D97-\u0D99\u0DB2\u0DBC\u0DBE\u0DBF\u0DC7-\u0DC9\u0DCB-\u0DCE\u0DD5\u0DD7\u0DE0-\u0DF1\u0DF5-\u0E00\u0E3B-\u0E3E\u0E5C-\u0E80\u0E83\u0E85\u0E86\u0E89\u0E8B\u0E8C\u0E8E-\u0E93\u0E98\u0EA0\u0EA4\u0EA6\u0EA8\u0EA9\u0EAC\u0EBA\u0EBE\u0EBF\u0EC5\u0EC7\u0ECE\u0ECF\u0EDA\u0EDB\u0EE0-\u0EFF\u0F48\u0F6D-\u0F70\u0F98\u0FBD\u0FCD\u0FDB-\u0FFF\u10C6\u10C8-\u10CC\u10CE\u10CF\u1249\u124E\u124F\u1257\u1259\u125E\u125F\u1289\u128E\u128F\u12B1\u12B6\u12B7\u12BF\u12C1\u12C6\u12C7\u12D7\u1311\u1316\u1317\u135B\u135C\u137D-\u137F\u139A-\u139F\u13F5-\u13FF\u169D-\u169F\u16F1-\u16FF\u170D\u1715-\u171F\u1737-\u173F\u1754-\u175F\u176D\u1771\u1774-\u177F\u17DE\u17DF\u17EA-\u17EF\u17FA-\u17FF\u180F\u181A-\u181F\u1878-\u187F\u18AB-\u18AF\u18F6-\u18FF\u191D-\u191F\u192C-\u192F\u193C-\u193F\u1941-\u1943\u196E\u196F\u1975-\u197F\u19AC-\u19AF\u19CA-\u19CF\u19DB-\u19DD\u1A1C\u1A1D\u1A5F\u1A7D\u1A7E\u1A8A-\u1A8F\u1A9A-\u1A9F\u1AAE-\u1AFF\u1B4C-\u1B4F\u1B7D-\u1B7F\u1BF4-\u1BFB\u1C38-\u1C3A\u1C4A-\u1C4C\u1C80-\u1CBF\u1CC8-\u1CCF\u1CF7-\u1CFF\u1DE7-\u1DFB\u1F16\u1F17\u1F1E\u1F1F\u1F46\u1F47\u1F4E\u1F4F\u1F58\u1F5A\u1F5C\u1F5E\u1F7E\u1F7F\u1FB5\u1FC5\u1FD4\u1FD5\u1FDC\u1FF0\u1FF1\u1FF5\u1FFF\u200B-\u200F\u202A-\u202E\u2060-\u206F\u2072\u2073\u208F\u209D-\u209F\u20BB-\u20CF\u20F1-\u20FF\u218A-\u218F\u23F4-\u23FF\u2427-\u243F\u244B-\u245F\u2700\u2B4D-\u2B4F\u2B5A-\u2BFF\u2C2F\u2C5F\u2CF4-\u2CF8\u2D26\u2D28-\u2D2C\u2D2E\u2D2F\u2D68-\u2D6E\u2D71-\u2D7E\u2D97-\u2D9F\u2DA7\u2DAF\u2DB7\u2DBF\u2DC7\u2DCF\u2DD7\u2DDF\u2E3C-\u2E7F\u2E9A\u2EF4-\u2EFF\u2FD6-\u2FEF\u2FFC-\u2FFF\u3040\u3097\u3098\u3100-\u3104\u312E-\u3130\u318F\u31BB-\u31BF\u31E4-\u31EF\u321F\u32FF\u4DB6-\u4DBF\u9FCD-\u9FFF\uA48D-\uA48F\uA4C7-\uA4CF\uA62C-\uA63F\uA698-\uA69E\uA6F8-\uA6FF\uA78F\uA794-\uA79F\uA7AB-\uA7F7\uA82C-\uA82F\uA83A-\uA83F\uA878-\uA87F\uA8C5-\uA8CD\uA8DA-\uA8DF\uA8FC-\uA8FF\uA954-\uA95E\uA97D-\uA97F\uA9CE\uA9DA-\uA9DD\uA9E0-\uA9FF\uAA37-\uAA3F\uAA4E\uAA4F\uAA5A\uAA5B\uAA7C-\uAA7F\uAAC3-\uAADA\uAAF7-\uAB00\uAB07\uAB08\uAB0F\uAB10\uAB17-\uAB1F\uAB27\uAB2F-\uABBF\uABEE\uABEF\uABFA-\uABFF\uD7A4-\uD7AF\uD7C7-\uD7CA\uD7FC-\uF8FF\uFA6E\uFA6F\uFADA-\uFAFF\uFB07-\uFB12\uFB18-\uFB1C\uFB37\uFB3D\uFB3F\uFB42\uFB45\uFBC2-\uFBD2\uFD40-\uFD4F\uFD90\uFD91\uFDC8-\uFDEF\uFDFE\uFDFF\uFE1A-\uFE1F\uFE27-\uFE2F\uFE53\uFE67\uFE6C-\uFE6F\uFE75\uFEFD-\uFF00\uFFBF-\uFFC1\uFFC8\uFFC9\uFFD0\uFFD1\uFFD8\uFFD9\uFFDD-\uFFDF\uFFE7\uFFEF-\uFFFB\uFFFE\uFFFF]/g type: 'string'
if(str){ }, {
strAfter = str.replace(/<[^>]+>/g,'').replace(regex,''); caption: '点赞数',
type: 'string'
}, {
caption: '点赞人',
type: 'string'
}, {
caption: '点赞点赞人openId',
type: 'string'
}];
var contentReplace = function(str) {
var strAfter = '';
var regex = /[\0-\x1F\x7F-\x9F\xAD\u0378\u0379\u037F-\u0383\u038B\u038D\u03A2\u0528-\u0530\u0557\u0558\u0560\u0588\u058B-\u058E\u0590\u05C8-\u05CF\u05EB-\u05EF\u05F5-\u0605\u061C\u061D\u06DD\u070E\u070F\u074B\u074C\u07B2-\u07BF\u07FB-\u07FF\u082E\u082F\u083F\u085C\u085D\u085F-\u089F\u08A1\u08AD-\u08E3\u08FF\u0978\u0980\u0984\u098D\u098E\u0991\u0992\u09A9\u09B1\u09B3-\u09B5\u09BA\u09BB\u09C5\u09C6\u09C9\u09CA\u09CF-\u09D6\u09D8-\u09DB\u09DE\u09E4\u09E5\u09FC-\u0A00\u0A04\u0A0B-\u0A0E\u0A11\u0A12\u0A29\u0A31\u0A34\u0A37\u0A3A\u0A3B\u0A3D\u0A43-\u0A46\u0A49\u0A4A\u0A4E-\u0A50\u0A52-\u0A58\u0A5D\u0A5F-\u0A65\u0A76-\u0A80\u0A84\u0A8E\u0A92\u0AA9\u0AB1\u0AB4\u0ABA\u0ABB\u0AC6\u0ACA\u0ACE\u0ACF\u0AD1-\u0ADF\u0AE4\u0AE5\u0AF2-\u0B00\u0B04\u0B0D\u0B0E\u0B11\u0B12\u0B29\u0B31\u0B34\u0B3A\u0B3B\u0B45\u0B46\u0B49\u0B4A\u0B4E-\u0B55\u0B58-\u0B5B\u0B5E\u0B64\u0B65\u0B78-\u0B81\u0B84\u0B8B-\u0B8D\u0B91\u0B96-\u0B98\u0B9B\u0B9D\u0BA0-\u0BA2\u0BA5-\u0BA7\u0BAB-\u0BAD\u0BBA-\u0BBD\u0BC3-\u0BC5\u0BC9\u0BCE\u0BCF\u0BD1-\u0BD6\u0BD8-\u0BE5\u0BFB-\u0C00\u0C04\u0C0D\u0C11\u0C29\u0C34\u0C3A-\u0C3C\u0C45\u0C49\u0C4E-\u0C54\u0C57\u0C5A-\u0C5F\u0C64\u0C65\u0C70-\u0C77\u0C80\u0C81\u0C84\u0C8D\u0C91\u0CA9\u0CB4\u0CBA\u0CBB\u0CC5\u0CC9\u0CCE-\u0CD4\u0CD7-\u0CDD\u0CDF\u0CE4\u0CE5\u0CF0\u0CF3-\u0D01\u0D04\u0D0D\u0D11\u0D3B\u0D3C\u0D45\u0D49\u0D4F-\u0D56\u0D58-\u0D5F\u0D64\u0D65\u0D76-\u0D78\u0D80\u0D81\u0D84\u0D97-\u0D99\u0DB2\u0DBC\u0DBE\u0DBF\u0DC7-\u0DC9\u0DCB-\u0DCE\u0DD5\u0DD7\u0DE0-\u0DF1\u0DF5-\u0E00\u0E3B-\u0E3E\u0E5C-\u0E80\u0E83\u0E85\u0E86\u0E89\u0E8B\u0E8C\u0E8E-\u0E93\u0E98\u0EA0\u0EA4\u0EA6\u0EA8\u0EA9\u0EAC\u0EBA\u0EBE\u0EBF\u0EC5\u0EC7\u0ECE\u0ECF\u0EDA\u0EDB\u0EE0-\u0EFF\u0F48\u0F6D-\u0F70\u0F98\u0FBD\u0FCD\u0FDB-\u0FFF\u10C6\u10C8-\u10CC\u10CE\u10CF\u1249\u124E\u124F\u1257\u1259\u125E\u125F\u1289\u128E\u128F\u12B1\u12B6\u12B7\u12BF\u12C1\u12C6\u12C7\u12D7\u1311\u1316\u1317\u135B\u135C\u137D-\u137F\u139A-\u139F\u13F5-\u13FF\u169D-\u169F\u16F1-\u16FF\u170D\u1715-\u171F\u1737-\u173F\u1754-\u175F\u176D\u1771\u1774-\u177F\u17DE\u17DF\u17EA-\u17EF\u17FA-\u17FF\u180F\u181A-\u181F\u1878-\u187F\u18AB-\u18AF\u18F6-\u18FF\u191D-\u191F\u192C-\u192F\u193C-\u193F\u1941-\u1943\u196E\u196F\u1975-\u197F\u19AC-\u19AF\u19CA-\u19CF\u19DB-\u19DD\u1A1C\u1A1D\u1A5F\u1A7D\u1A7E\u1A8A-\u1A8F\u1A9A-\u1A9F\u1AAE-\u1AFF\u1B4C-\u1B4F\u1B7D-\u1B7F\u1BF4-\u1BFB\u1C38-\u1C3A\u1C4A-\u1C4C\u1C80-\u1CBF\u1CC8-\u1CCF\u1CF7-\u1CFF\u1DE7-\u1DFB\u1F16\u1F17\u1F1E\u1F1F\u1F46\u1F47\u1F4E\u1F4F\u1F58\u1F5A\u1F5C\u1F5E\u1F7E\u1F7F\u1FB5\u1FC5\u1FD4\u1FD5\u1FDC\u1FF0\u1FF1\u1FF5\u1FFF\u200B-\u200F\u202A-\u202E\u2060-\u206F\u2072\u2073\u208F\u209D-\u209F\u20BB-\u20CF\u20F1-\u20FF\u218A-\u218F\u23F4-\u23FF\u2427-\u243F\u244B-\u245F\u2700\u2B4D-\u2B4F\u2B5A-\u2BFF\u2C2F\u2C5F\u2CF4-\u2CF8\u2D26\u2D28-\u2D2C\u2D2E\u2D2F\u2D68-\u2D6E\u2D71-\u2D7E\u2D97-\u2D9F\u2DA7\u2DAF\u2DB7\u2DBF\u2DC7\u2DCF\u2DD7\u2DDF\u2E3C-\u2E7F\u2E9A\u2EF4-\u2EFF\u2FD6-\u2FEF\u2FFC-\u2FFF\u3040\u3097\u3098\u3100-\u3104\u312E-\u3130\u318F\u31BB-\u31BF\u31E4-\u31EF\u321F\u32FF\u4DB6-\u4DBF\u9FCD-\u9FFF\uA48D-\uA48F\uA4C7-\uA4CF\uA62C-\uA63F\uA698-\uA69E\uA6F8-\uA6FF\uA78F\uA794-\uA79F\uA7AB-\uA7F7\uA82C-\uA82F\uA83A-\uA83F\uA878-\uA87F\uA8C5-\uA8CD\uA8DA-\uA8DF\uA8FC-\uA8FF\uA954-\uA95E\uA97D-\uA97F\uA9CE\uA9DA-\uA9DD\uA9E0-\uA9FF\uAA37-\uAA3F\uAA4E\uAA4F\uAA5A\uAA5B\uAA7C-\uAA7F\uAAC3-\uAADA\uAAF7-\uAB00\uAB07\uAB08\uAB0F\uAB10\uAB17-\uAB1F\uAB27\uAB2F-\uABBF\uABEE\uABEF\uABFA-\uABFF\uD7A4-\uD7AF\uD7C7-\uD7CA\uD7FC-\uF8FF\uFA6E\uFA6F\uFADA-\uFAFF\uFB07-\uFB12\uFB18-\uFB1C\uFB37\uFB3D\uFB3F\uFB42\uFB45\uFBC2-\uFBD2\uFD40-\uFD4F\uFD90\uFD91\uFDC8-\uFDEF\uFDFE\uFDFF\uFE1A-\uFE1F\uFE27-\uFE2F\uFE53\uFE67\uFE6C-\uFE6F\uFE75\uFEFD-\uFF00\uFFBF-\uFFC1\uFFC8\uFFC9\uFFD0\uFFD1\uFFD8\uFFD9\uFFDD-\uFFDF\uFFE7\uFFEF-\uFFFB\uFFFE\uFFFF]/g
if (str) {
strAfter = str.replace(/<[^>]+>/g, '').replace(regex, '');
}
return strAfter;
} }
return strAfter; //文章内容
} var t_title = thread.title == '发话题' ? '无标题' : thread.title,
t_time = date_format(thread.created),
t_from = contentReplace(thread.from ? thread.from.nickName : '游客'),
t_from_openId = thread.from ? thread.from.uid : '暂无',
t_praiseNames = contentReplace(thread.praiseNames),
t_praiseOpenIds = thread.praiseOpenIds,
t_from_mid = thread.from ? thread.from.mid : '暂无';
rows.push([ rows.push([
t_title, t_title,
t_time, t_time,
t_from, t_from,
t_from_openId, t_from_openId,
t_from_mid ? t_from_mid.toString() : '暂无',
contentReplace(thread.content), contentReplace(thread.content),
thread.comment_count.toString(), thread.comment_count.toString(),
thread.share_count.toString(), thread.share_count.toString(),
thread.praise_count.toString(), thread.praise_count.toString(),
t_praiseNames, t_praiseNames,
t_praiseOpenIds]); t_praiseOpenIds
rows.push(['','','','','','','','','','']); ]);
rows.push(['楼层','发布时间','openId','会员名', '内容','点赞数','点赞人','点赞人openId',null,null]); rows.push(['', '', '', '', '', '', '', '', '', '', '']);
rows.push(['楼层', '发布时间', '会员名', 'openId', '会员编号', '内容', '点赞数', '点赞人', '点赞人openId', null, null]);
for (var i = items.length - 1; i >= 0; i--) { for (var i = items.length - 1; i >= 0; i--) {
var comment = items[i]; var comment = items[i];
var floor = comment.floor, var thisFloor = comment.floor || '互动',
time = date_format(comment.created), time = date_format(comment.created),
openId = '', openId = '暂无',
nickName = '', nickName = '暂无',
content = comment.content?contentReplace(comment.content) : '', fromMid = '暂无',
content = comment.content ? contentReplace(comment.content) : '暂无',
praiseCount = comment.praiseCount || 0, praiseCount = comment.praiseCount || 0,
praiseNames = '', praiseNames = '暂无',
praiseOpenIds = ''; praiseOpenIds = '暂无';
if(comment.praiseNames){ if (comment.praiseNames) {
praiseNames = comment.praiseNames.toString(); praiseNames = comment.praiseNames.toString();
praiseOpenIds = comment.praiseOpenIds.toString(); praiseOpenIds = comment.praiseOpenIds.toString();
} }
if(comment.from){ if (comment.from) {
openId = comment.from.uid || ''; openId = comment.from.uid || '暂无';
nickName = comment.from.nickName || '游客'; nickName = comment.from.displayName || comment.from.nickName || '游客';
fromMid = comment.from.mid || '暂无';
} }
var this_row = [floor + '', time,openId, nickName, content, praiseCount.toString(), praiseNames,praiseOpenIds,null,null]; var this_row = [
thisFloor + '',
time,
contentReplace(nickName),
openId,
fromMid.toString(),
content,
praiseCount.toString(),
praiseNames,
praiseOpenIds,
null, null
];
rows.push(this_row); rows.push(this_row);
if(comment.comments.length > 0){ if (!mid && comment.comments.length > 0) {
for (var k = 0; k < comment.comments.length; k++) { for (var k = 0; k < comment.comments.length; k++) {
var sub_comment = comment.comments[k]; var subComment = comment.comments[k];
var subTime = date_format(subComment.created),
var time = date_format(sub_comment.created), subOpenId = '暂无',
openId = '', subMid = '暂无',
nickName = '', subNickName = '暂无',
content = sub_comment.content?contentReplace(sub_comment.content) : '', subContent = subComment.content ? contentReplace(subComment.content) : '暂无',
to = ''; subTo = '暂无';
if(sub_comment.from){ if (subComment.from) {
openId = sub_comment.from.uid || ''; subOpenId = subComment.from.uid || '暂无';
nickName = sub_comment.from.nickName || '游客'; subNickName = subComment.from.nickName || '游客';
} subMid = subComment.from.mid || '暂无';
if(sub_comment.to){
to = sub_comment.to.nickName || '游客';
} }
var this_row = [nickName + ' 回复 ' + to, time,openId, nickName, content, '0', null,null,null,null]; if (subComment.to) {
rows.push(this_row); subTo = contentReplace(subComment.to.nickName) || '游客';
}
var subRow = [
subNickName + ' 回复 ' + subTo,
subTime,
subNickName,
subOpenId,
subMid.toString(),
content,
'0',
null, null, null, null
];
rows.push(subRow);
}; };
} }
}; };
...@@ -1208,14 +1335,35 @@ router.get('/thread/:tid/exportComments', function(req, res, next) { ...@@ -1208,14 +1335,35 @@ router.get('/thread/:tid/exportComments', function(req, res, next) {
res.setHeader('Content-Type', 'application/vnd.openxmlformats'); res.setHeader('Content-Type', 'application/vnd.openxmlformats');
res.setHeader('Content-Disposition', 'attachment; filename=commentsReport.xlsx'); res.setHeader('Content-Disposition', 'attachment; filename=commentsReport.xlsx');
res.end(result, 'binary'); res.end(result, 'binary');
}).fail(function(cont,err){ }).fail(function(cont, err) {
console.error(err); console.error(err);
if(err === 'params error'){ if (err === 'params error') {
res.json(returnCode.WRONG_PARAM); res.json(returnCode.WRONG_PARAM);
}else{ } else {
res.json(returnCode.BUSY); res.json(returnCode.BUSY);
} }
}); });
}); });
//更新文章质量
router.post('/thread/:tid/quality', function(req, res, next) {
var tid = req.params.tid; //文章ID
var quality = req.body.quality;
if (tid && quality) {
forumThreadService.updateThread({
_id: tid
}, {
quality: quality
}, function(err, thread) {
if (err) {
res.json(returnCode.BUSY);
} else {
res.json(returnCode.SUCCESS);
}
});
} else {
res.json(returnCode.WRONG_PARAM);
}
});
app/controllers/mobile/forumInfo.js
View file @ 0c1302b5
...@@ -157,7 +157,7 @@ router.get('/info/:fid/threads', function(req, res, next) { ...@@ -157,7 +157,7 @@ router.get('/info/:fid/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 fid = req.params.fid; var fid = req.params.fid;
var sort = '-top -topTime -created'; var sort = '-top -topTime -quality -created';
var ent_code = req.session.user.ent_code; var ent_code = req.session.user.ent_code;
var conditions = { var conditions = {
ent_code: ent_code, ent_code: ent_code,
...@@ -378,7 +378,7 @@ router.get('/info/:fid/myThreads', function(req, res, next) { ...@@ -378,7 +378,7 @@ router.get('/info/:fid/myThreads', function(req, res, next) {
}; };
} }
//获取子话题数据 //获取子话题数据
forumThreadService.getAllThreadByFid(conditions, pageNo, pageSize, '-created', function(err, results) { forumThreadService.getAllThreadByFid(conditions, pageNo, pageSize, '-quality -created', function(err, results) {
if (err) { if (err) {
console.error(err); console.error(err);
res.json(returnCode.BUSY); res.json(returnCode.BUSY);
...@@ -431,7 +431,7 @@ router.get('/info/myThreads', function(req, res, next) { ...@@ -431,7 +431,7 @@ router.get('/info/myThreads', function(req, res, next) {
}; };
} }
//获取子话题数据 //获取子话题数据
forumThreadService.getAllThreadByFid(conditions, pageNo, pageSize, '-created', function(err, results) { forumThreadService.getAllThreadByFid(conditions, pageNo, pageSize, '-quality -created', function(err, results) {
if (err) { if (err) {
console.error(err); console.error(err);
res.json(returnCode.BUSY); res.json(returnCode.BUSY);
...@@ -482,7 +482,7 @@ router.get('/info/hisThreads/:id', function(req, res, next) { ...@@ -482,7 +482,7 @@ router.get('/info/hisThreads/:id', function(req, res, next) {
}; };
} }
//获取子话题数据 //获取子话题数据
forumThreadService.getAllThreadByFid(conditions, pageNo, pageSize, '-created', function(err, results) { forumThreadService.getAllThreadByFid(conditions, pageNo, pageSize, '-quality -created', function(err, results) {
if (err) { if (err) {
console.error(err); console.error(err);
res.json(returnCode.BUSY); res.json(returnCode.BUSY);
......
app/controllers/mobile/forumThread.js
View file @ 0c1302b5
...@@ -888,6 +888,223 @@ router.post('/thread/:tid/delete', function(req, res, next) { ...@@ -888,6 +888,223 @@ router.post('/thread/:tid/delete', function(req, res, next) {
// }); // });
//文章点赞
// router.post('/thread/:tid/raise', function(req, res, next) {
// var userId = req.session.mobileForumUser.userId;
// var mid = req.session.openUser.mid;
// var tid = req.params.tid || null;
// var ent_code = req.session.user.ent_code;
// if (tid) {
// var integral = req.session.openUser.integral || 0;
// var exp = req.session.openUser.exp || 0;
// //判断是否已经点赞
// forumPraiseLogService.queryPraiseLog(tid, null, user.getMobileUser(req), 1, function(err, doc) {
// if (err) {
// res.json(returnCode.BUSY);
// } else {
// //1.检查是否有权限
// forumRolePermissionService.checkRolePermiss(ent_code, 'raise', integral, exp, function(err, result) {
// if (err) {
// res.json(returnCode.BUSY);
// } else {
// if (result) { //有操作权限
// //2.获取论坛文章
// forumThreadService.getThreadById(tid, function(err, thread) {
// if (err) {
// res.json(returnCode.BUSY);
// } else {
// async.parallel([
// function(callback) {
// //3.更新文章统计数据(点赞数)
// if (thread) {
// forumThreadService.updateThreadRaiseCount(tid, function(err, cb) {
// if (err) {
// callback(err, null);
// } else {
// callback(null, null);
// }
// });
// } else {
// callback('cannot find thread by id', null);
// }
// },
// function(callback) {
// if (doc) { //如果已存在，更新为点赞日志
// forumPraiseLogService.updatePraiseLog(doc._id, 0, function(err, result) {
// if (err) {
// callback(err, null);
// } else {
// callback(null, null);
// }
// });
// } else { //不存在，创建点赞日志
// var entity = {
// ent_code: ent_code,
// user: user.getMobileUser(req),
// thread: tid,
// ip: req.ip,
// comment: null,
// type: 1,
// status: 0
// };
// //4.创建点赞日志
// forumPraiseLogService.createPraiseLog(entity, function(err, result) {
// if (err) {
// callback(err, null);
// } else {
// callback(null, null);
// }
// });
// }
// }
// ], function(err, results) {
// if (err) {
// console.error(err);
// res.json(returnCode.BUSY);
// } else {
// // forumLimitOperationService.checkLimitOperationProhibitionAddIntegral(userId, function(err, flag){
// // if(err){
// // console.error(err);
// // }else{
// // if(!flag){
// // httpService.sendRequest(ent_code, req.session.openUser.mid, 'thread_praise');
// // }
// // }
// // });
// //更新点赞redis
// redisPraiseLog.get(ent_code, userId, 'thread', function(error, docs) {
// var list = docs;
// list.push(tid);
// redisPraiseLog.set(ent_code, userId, 'thread', list, function() {});
// });
// forumThreadService.getThreadById(tid, function(err, doc) {
// if (err) {
// console.error(err);
// res.json(returnCode.BUSY);
// } else {
// var rs = {};
// rs.praise_count = doc.praise_count;
// res.json(_.assign(rs, returnCode.SUCCESS));
// }
// });
// }
// });
// }
// });
// } else {
// res.json(returnCode.ACTION_NOT_PERMISSION);
// }
// }
// });
// }
// });
// } else {
// res.json(returnCode.WRONG_PARAM);
// }
// });
//文章取消点赞
// router.post('/thread/:tid/cancelRaise', function(req, res, next) {
// var userId = req.session.mobileForumUser.userId;
// var mid = req.session.openUser.mid;
// var tid = req.params.tid || null;
// var ent_code = req.session.user.ent_code;
// if (tid) {
// var integral = req.session.openUser.integral || 0;
// var exp = req.session.openUser.exp || 0;
// //判断是否已经点赞
// forumPraiseLogService.queryPraiseLog(tid, null, userId, 1, function(err, doc) {
// if (err) {
// res.json(returnCode.BUSY);
// } else {
// if (doc) {
// var praiseId = doc._id;
// //1.检查是否有权限
// forumRolePermissionService.checkRolePermiss(ent_code, 'raise', integral, exp, function(err, result) {
// if (err) {
// res.json(returnCode.BUSY);
// } else {
// if (result) { //有操作权限
// //2.获取论坛文章
// forumThreadService.getThreadById(tid, function(err, thread) {
// if (err) {
// res.json(returnCode.BUSY);
// } else {
// async.parallel([
// function(callback) {
// //3.更新文章统计数据(点赞数)
// if (thread && thread.praise_count > 0) {
// forumThreadService.updateThreadRaiseCountDec(tid, function(err, cb) {
// if (err) {
// callback(err, null);
// } else {
// callback(null, null);
// }
// });
// } else {
// callback('cannot find thread by id', null);
// }
// },
// function(callback) {
// //4.更新点赞日志
// forumPraiseLogService.updatePraiseLog(praiseId, 1, function(err, result) {
// if (err) {
// callback(err, null);
// } else {
// callback(null, null);
// }
// });
// }
// ], function(err, results) {
// if (err) {
// console.error(err);
// res.json(returnCode.BUSY);
// } else {
// //更新点赞redis
// redisPraiseLog.get(ent_code, userId, 'thread', function(error, docs) {
// var list = docs;
// for (var i = 0; i < list.length; i++) {
// if (list[i].toString() == tid) {
// list.splice(i, 1);
// break;
// }
// }
// redisPraiseLog.set(ent_code, userId, 'thread', list, function() {});
// });
// forumThreadService.getThreadById(tid, function(err, doc) {
// if (err) {
// console.error(err);
// res.json(returnCode.BUSY);
// } else {
// var rs = {};
// rs.praise_count = doc.praise_count;
// res.json(_.assign(rs, returnCode.SUCCESS));
// }
// });
// }
// });
// }
// });
// } else {
// res.json(returnCode.ACTION_NOT_PERMISSION);
// }
// }
// });
// }
// }
// });
// } else {
// res.json(returnCode.WRONG_PARAM);
// }
// });
//文章点赞 //文章点赞
router.post('/thread/:tid/raise', function(req, res, next) { router.post('/thread/:tid/raise', function(req, res, next) {
var userId = req.session.mobileForumUser.userId; var userId = req.session.mobileForumUser.userId;
...@@ -933,6 +1150,7 @@ router.post('/thread/:tid/praiseOrCancelPraise', function(req, res, next) { ...@@ -933,6 +1150,7 @@ router.post('/thread/:tid/praiseOrCancelPraise', function(req, res, next) {
} }
}); });
//文章分享 //文章分享
router.post('/thread/:tid/share', function(req, res, next) { router.post('/thread/:tid/share', function(req, res, next) {
var tid = req.params.tid || null; var tid = req.params.tid || null;
...@@ -1839,7 +2057,7 @@ router.get('/thread/:tid/latestPhotos', function(req, res, next) { ...@@ -1839,7 +2057,7 @@ router.get('/thread/:tid/latestPhotos', function(req, res, next) {
}; };
} }
//获取子话题数据 //获取子话题数据
forumThreadService.getAllThreadByFid(conditions, pageNo, pageSize, '-created', function(err, results) { forumThreadService.getAllThreadByFid(conditions, pageNo, pageSize, '-quality -created', function(err, results) {
if (err) { if (err) {
console.error(err); console.error(err);
res.json(returnCode.BUSY); res.json(returnCode.BUSY);
......
app/models/forumThread.js
View file @ 0c1302b5
...@@ -113,6 +113,11 @@ var ForumThreadSchema = new Schema({ ...@@ -113,6 +113,11 @@ var ForumThreadSchema = new Schema({
require: true, require: true,
default: 0 default: 0
}, },
quality:{//质量 高：100，中：50，低：0
type: Number,
require: true,
default: 100
},
created: { created: {
type: Date, type: Date,
required: true, required: true,
......
app/models/forumUser.js
View file @ 0c1302b5
...@@ -15,6 +15,12 @@ var ForumUserSchema = new Schema({ ...@@ -15,6 +15,12 @@ var ForumUserSchema = new Schema({
unique:true, unique:true,
require: true require: true
}, },
mid: { //会员ID，这里直接存放会员ID
type: Number,
index: true,
unique:true,
require: false
},
nickName: { //用户昵称，这里直接存放用户的nickname nickName: { //用户昵称，这里直接存放用户的nickname
type: String type: String
}, },
......
app/service/forumCommentService.js
View file @ 0c1302b5
'use strict'; 'use strict';
var mongoose = require('mongoose'); var mongoose = require('mongoose');
var ForumComment = mongoose.model('ForumComment'); var ForumComment = mongoose.model('ForumComment');
var forumUserService = require('./forumUserService');
var async = require('async'); var async = require('async');
//创建评论 //创建评论
...@@ -181,7 +181,7 @@ function populateComment(doc, callback) { ...@@ -181,7 +181,7 @@ function populateComment(doc, callback) {
status: 1 status: 1
}).populate({ }).populate({
path: 'from to', path: 'from to',
select: 'uid nickName icon' select: 'uid nickName icon mid'
}).exec(function(err, c) { }).exec(function(err, c) {
if (err) { if (err) {
console.error(err); console.error(err);
...@@ -349,6 +349,51 @@ exports.getCommentList = function(conditions, pageNo, pageSize, callback) { ...@@ -349,6 +349,51 @@ exports.getCommentList = function(conditions, pageNo, pageSize, callback) {
} }
}); });
}; };
//获取评论列表
exports.getCommentListByMid = function(mid,conditions, pageNo, pageSize, callback) {
//查询到用户
forumUserService.searchMembersByMid(mid, function(err, users) {
if (err) {
console.error(err);
callback(err, null);
} else {
//查询对应用户的文章
var user_ids = [];
for(var i in users){
user_ids.push(users[i]._id);
}
conditions.from = {
$in:user_ids
}
countAll(conditions, function(err, count) {
if (err) {
callback(err);
} else {
var skip = (pageNo - 1) * pageSize;
var limit = count - skip > pageSize ? pageSize : (count - skip);
ForumComment.find(conditions).populate('from').populate('to').limit(limit).skip(skip).sort('-created').exec(function(err, docs) {
if (err) {
console.error(err);
callback(err, null);
} else {
var obj = {};
obj.total = count;
obj.pageNo = pageNo;
obj.pageSize = pageSize;
obj.items = docs;
callback(null, obj);
}
});
}
});
}
});
};
exports.getCommentParent = function(cid, callback) { exports.getCommentParent = function(cid, callback) {
ForumComment.findOne({ ForumComment.findOne({
comments: { comments: {
...@@ -491,7 +536,7 @@ exports.getAllCommentByThread = function(conditions, callback) { ...@@ -491,7 +536,7 @@ exports.getAllCommentByThread = function(conditions, callback) {
select: 'from' select: 'from'
}).populate({ }).populate({
path: 'from to', path: 'from to',
select: '_id uid nickName icon' select: '_id uid nickName icon mid'
}).sort('-created').exec(function(err, docs) { }).sort('-created').exec(function(err, docs) {
if (err) { if (err) {
console.error(err); console.error(err);
......
app/service/forumThreadService.js
View file @ 0c1302b5
...@@ -17,7 +17,7 @@ exports.findThreadByPage = function(pageNo, pageSize, q, callback) { ...@@ -17,7 +17,7 @@ exports.findThreadByPage = function(pageNo, pageSize, q, callback) {
}).then(function(cont, count) { }).then(function(cont, count) {
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);
ForumThread.find(q).skip(skip).limit(limit).sort('-created').exec(function(err, docs) { ForumThread.find(q).skip(skip).limit(limit).sort('-quality -created').exec(function(err, docs) {
cont(err, count, docs); cont(err, count, docs);
}); });
...@@ -607,7 +607,7 @@ function getSubThreads(doc, sort, callback) { ...@@ -607,7 +607,7 @@ function getSubThreads(doc, sort, callback) {
console.error(err); console.error(err);
callback(err, null); callback(err, null);
} else { } else {
var sortBy = '-top -created'; var sortBy = '-top -quality -created';
if (sort) { if (sort) {
sortBy = sort; sortBy = sort;
} }
...@@ -638,7 +638,7 @@ function getAllThreadByFidHelp(conditions, pageNo, pageSize, sort, callback) { ...@@ -638,7 +638,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 -tag_topTime -created'; var sortBy = '-topTime -tag_topTime -quality -created';
if (sort) { if (sort) {
sortBy = sort; sortBy = sort;
} }
...@@ -706,7 +706,7 @@ function getAllThreadByFidHelpNoLimit(conditions, pageNo, pageSize, sort, callba ...@@ -706,7 +706,7 @@ function getAllThreadByFidHelpNoLimit(conditions, pageNo, pageSize, sort, callba
} 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 -tag_topTime -created'; var sortBy = '-topTime -tag_topTime -quality -created';
if (sort) { if (sort) {
sortBy = sort; sortBy = sort;
} }
...@@ -1010,7 +1010,7 @@ exports.remove = function(array,val) { ...@@ -1010,7 +1010,7 @@ exports.remove = function(array,val) {
}; };
function getAllThreadByFidHelpAndNickName(user_ids, conditions, pageNo, pageSize, sort, callback) { function getAllThreadByFidAndUserHelp(user_ids, conditions, pageNo, pageSize, sort, callback) {
conditions.from = { conditions.from = {
"$in" : user_ids "$in" : user_ids
}; };
...@@ -1023,7 +1023,7 @@ function getAllThreadByFidHelpAndNickName(user_ids, conditions, pageNo, pageSize ...@@ -1023,7 +1023,7 @@ function getAllThreadByFidHelpAndNickName(user_ids, conditions, pageNo, pageSize
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 -tag_topTime -created'; var sortBy = '-topTime -tag_topTime -quality -created';
if (sort) { if (sort) {
sortBy = sort; sortBy = sort;
} }
...@@ -1067,9 +1067,39 @@ exports.getAllThreadByFidAndNickName = function(nickName, conditions, pageNo, pa ...@@ -1067,9 +1067,39 @@ exports.getAllThreadByFidAndNickName = function(nickName, conditions, pageNo, pa
for(var i in users){ for(var i in users){
user_ids.push(users[i]._id); user_ids.push(users[i]._id);
} }
getAllThreadByFidHelpAndNickName(user_ids, conditions, pageNo, pageSize, sort, callback); getAllThreadByFidAndUserHelp(user_ids, conditions, pageNo, pageSize, sort, callback);
} }
}); });
} }
//获取某个文章 //获取全部列表数据
exports.getAllThreadByFidAndMid = function(mid, conditions, pageNo, pageSize, sort, callback) {
//查询到用户
forumUserService.searchMembersByMid(mid, function(err, users) {
if (err) {
console.error(err);
callback(err, null);
} else {
//查询对应用户的文章
var user_ids = [];
for(var i in users){
user_ids.push(users[i]._id);
}
getAllThreadByFidAndUserHelp(user_ids, conditions, pageNo, pageSize, sort, callback);
}
});
}
//更新文章
exports.updateThread = function(condition, entity, callback) {
ForumThread.findOneAndUpdate(condition, entity, function(err, doc){
if (err) {
console.error(err);
callback(err, null);
} else {
callback(null, doc);
}
});
};
\ No newline at end of file
app/service/forumUserService.js
View file @ 0c1302b5
...@@ -107,6 +107,17 @@ exports.searchMembersByNickName=function(nickName, callback){ ...@@ -107,6 +107,17 @@ exports.searchMembersByNickName=function(nickName, callback){
}); });
}; };
//根据mid查询用户
exports.searchMembersByMid=function(mid, callback){
ForumUser.find({mid:mid}).exec(function(err,result){
if(err){
callback(err,null);
}else{
callback(null,result);
}
});
};
//查询用户和行为限制信息 //查询用户和行为限制信息
exports.searchMembersAndLimitActions=function(pageNo, pageSize, q, callback){ exports.searchMembersAndLimitActions=function(pageNo, pageSize, q, callback){
then(function(cont) { then(function(cont) {
......
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