Commit 5673127d authored by 刘文胜's avatar 刘文胜

11

parent 65eddaa0
...@@ -225,6 +225,9 @@ router.post('/thread/:tid/update', function(req, res, next) { ...@@ -225,6 +225,9 @@ router.post('/thread/:tid/update', function(req, res, next) {
if (err) { if (err) {
res.json(returnCode.BUSY); res.json(returnCode.BUSY);
} else { } else {
if(!isNaN(req.body.status)){
forumAboutMEService.updateThreadStatus(thread._id,thread.status)
}
res.json({ res.json({
message: "success", message: "success",
data: thread, data: thread,
...@@ -574,6 +577,12 @@ router.post('/thread/comment/update/:cid', function(req, res, next) { ...@@ -574,6 +577,12 @@ router.post('/thread/comment/update/:cid', function(req, res, next) {
}); });
} }
}else{ }else{
if(comment && comment.level==1){
forumAboutMEService.updateCommentLevel1Status(comment._id,status);
}
if(comment && comment.level==2){
forumAboutMEService.updateCommentLevel2Status(comment._id,status);
}
callback(); callback();
} }
} }
......
...@@ -15,6 +15,8 @@ router.get('/aboutme/me2other', function(req, res, next) { ...@@ -15,6 +15,8 @@ router.get('/aboutme/me2other', function(req, res, next) {
var entcode = req.session.user.ent_code; var entcode = req.session.user.ent_code;
var pageNo=req.query.pageNo || 1; var pageNo=req.query.pageNo || 1;
var pageSize=req.query.pageSize || 10; var pageSize=req.query.pageSize || 10;
console.log(userId);
console.log(entcode);
forumAboutMEService.me2other(entcode,userId,pageNo,pageSize,function(err,result){ forumAboutMEService.me2other(entcode,userId,pageNo,pageSize,function(err,result){
if(err){ if(err){
res.json(returnCode.UNCHECK_ERROR(err)); res.json(returnCode.UNCHECK_ERROR(err));
...@@ -29,6 +31,8 @@ router.get('/aboutme/other2me', function(req, res, next) { ...@@ -29,6 +31,8 @@ router.get('/aboutme/other2me', function(req, res, next) {
var entcode = req.session.user.ent_code; var entcode = req.session.user.ent_code;
var pageNo=req.query.pageNo || 1; var pageNo=req.query.pageNo || 1;
var pageSize=req.query.pageSize || 10; var pageSize=req.query.pageSize || 10;
console.log(userId);
console.log(entcode);
forumAboutMEService.other2me(entcode,userId,pageNo,pageSize,function(err,result){ forumAboutMEService.other2me(entcode,userId,pageNo,pageSize,function(err,result){
if(err){ if(err){
res.json(returnCode.UNCHECK_ERROR(err)); res.json(returnCode.UNCHECK_ERROR(err));
......
...@@ -12,6 +12,7 @@ var ForumModerator = mongoose.model('ForumModerator'); ...@@ -12,6 +12,7 @@ var ForumModerator = mongoose.model('ForumModerator');
var forumThreadService = require('../../service/forumThreadService'); var forumThreadService = require('../../service/forumThreadService');
var forumLimitOperationService = require('../../service/forumLimitOperationService'); var forumLimitOperationService = require('../../service/forumLimitOperationService');
var forumModeratorApplyService = require('../../service/forumModeratorApplyService'); var forumModeratorApplyService = require('../../service/forumModeratorApplyService');
var forumAboutMEService=require('../../service/forumAboutMEService');
var httpService = require('../../service/httpService'); var httpService = require('../../service/httpService');
var request=require('request'); var request=require('request');
var env = process.env.NODE_ENV; var env = process.env.NODE_ENV;
...@@ -214,6 +215,7 @@ router.get('/moderators/delthread/:tid', function(req, res, next) { ...@@ -214,6 +215,7 @@ router.get('/moderators/delthread/:tid', function(req, res, next) {
} else { } else {
res.json(returnCode.SUCCESS); res.json(returnCode.SUCCESS);
moderatorOperateLog(result.forumUser,t,3); moderatorOperateLog(result.forumUser,t,3);
forumAboutMEService.updateThreadStatus(tid,3);
} }
}); });
}); });
......
...@@ -292,6 +292,9 @@ router.post('/thread/:tid/update', function(req, res, next) { ...@@ -292,6 +292,9 @@ router.post('/thread/:tid/update', function(req, res, next) {
if (err) { if (err) {
res.json(returnCode.BUSY); res.json(returnCode.BUSY);
} else { } else {
if(!isNaN(req.body.status)){
forumAboutMEService.updateThreadStatus(thread._id,thread.status)
}
res.json(returnCode.SUCCESS); res.json(returnCode.SUCCESS);
} }
}); });
...@@ -949,6 +952,12 @@ router.post('/thread/:tid/comment/:cid/disable', function(req, res, next) { ...@@ -949,6 +952,12 @@ router.post('/thread/:tid/comment/:cid/disable', function(req, res, next) {
if (err) { if (err) {
res.json(returnCode.BUSY); res.json(returnCode.BUSY);
} else { } else {
if(comment && comment.level==1){
forumAboutMEService.updateCommentLevel1Status(comment._id,comment.status);
}
if(comment && comment.level==2){
forumAboutMEService.updateCommentLevel2Status(comment._id,comment.status);
}
res.json(returnCode.SUCCESS); res.json(returnCode.SUCCESS);
} }
}); });
...@@ -1369,6 +1378,7 @@ router.post('/thread/:tid/disable', function(req, res, next) { ...@@ -1369,6 +1378,7 @@ router.post('/thread/:tid/disable', function(req, res, next) {
if (err) { if (err) {
res.json(returnCode.BUSY); res.json(returnCode.BUSY);
} else { } else {
forumAboutMEService.updateThreadStatus(tid,3);
res.json(returnCode.SUCCESS); res.json(returnCode.SUCCESS);
} }
}); });
......
...@@ -32,18 +32,27 @@ var ForumAboutMeSchema = new Schema({ ...@@ -32,18 +32,27 @@ var ForumAboutMeSchema = new Schema({
ref: 'ForumThread', ref: 'ForumThread',
require:true require:true
}, },
threadStatus:{
type: Number
},
commentLevel1:{//一级评论 commentLevel1:{//一级评论
type: Schema.Types.ObjectId, type: Schema.Types.ObjectId,
require: false, require: false,
index: true, index: true,
ref: 'ForumComment' ref: 'ForumComment'
}, },
commentLevel1Status:{
type: Number
},
commentLevel2:{//二级评论 commentLevel2:{//二级评论
type: Schema.Types.ObjectId, type: Schema.Types.ObjectId,
require: false, require: false,
index: true, index: true,
ref: 'ForumComment' ref: 'ForumComment'
}, },
commentLevel2Status:{
type: Number
},
created: { //时间 created: { //时间
type: Date, type: Date,
require: true, require: true,
...@@ -53,5 +62,4 @@ var ForumAboutMeSchema = new Schema({ ...@@ -53,5 +62,4 @@ var ForumAboutMeSchema = new Schema({
'collection': 'pisns_forum_about_me' 'collection': 'pisns_forum_about_me'
}); });
module.exports = mongoose.model('ForumAboutMe', ForumAboutMeSchema); module.exports = mongoose.model('ForumAboutMe', ForumAboutMeSchema);
\ No newline at end of file
...@@ -5,12 +5,14 @@ var THREAD_TYPE=1; ...@@ -5,12 +5,14 @@ var THREAD_TYPE=1;
var COMMENTLEVEL1_TYPE=2; var COMMENTLEVEL1_TYPE=2;
var COMMENTLEVEL2_TYPE=3; var COMMENTLEVEL2_TYPE=3;
var forumCommentService = require('./forumCommentService'); var forumCommentService = require('./forumCommentService');
var forumThreadService = require('./forumThreadService');
exports.saveThread=function(thread){ exports.saveThread=function(thread){
var forumAboutMe=new ForumAboutMe({ var forumAboutMe=new ForumAboutMe({
ent_code:thread.ent_code, ent_code:thread.ent_code,
from:thread.from, from:thread.from,
type:THREAD_TYPE, type:THREAD_TYPE,
thread:thread._id, thread:thread._id,
threadStatus:thread.status,
created:new Date() created:new Date()
}); });
forumAboutMe.save(function(err){ forumAboutMe.save(function(err){
...@@ -27,7 +29,9 @@ exports.saveCommentLevel1=function(thread,commentLevel1){ ...@@ -27,7 +29,9 @@ exports.saveCommentLevel1=function(thread,commentLevel1){
to:commentLevel1.to, to:commentLevel1.to,
type:COMMENTLEVEL1_TYPE, type:COMMENTLEVEL1_TYPE,
thread:thread._id, thread:thread._id,
threadStatus:thread.status,
commentLevel1:commentLevel1._id, commentLevel1:commentLevel1._id,
commentLevel1Status:commentLevel1.status,
created:new Date() created:new Date()
}); });
forumAboutMe.save(function(err){ forumAboutMe.save(function(err){
...@@ -38,14 +42,18 @@ exports.saveCommentLevel1=function(thread,commentLevel1){ ...@@ -38,14 +42,18 @@ exports.saveCommentLevel1=function(thread,commentLevel1){
}; };
exports.saveCommentLevel2=function(tid,commentLevel1,commentLevel2){ exports.saveCommentLevel2=function(tid,commentLevel1,commentLevel2){
forumThreadService.getById(tid,function(err,thread){
var forumAboutMe=new ForumAboutMe({ var forumAboutMe=new ForumAboutMe({
ent_code:commentLevel2.ent_code, ent_code:commentLevel2.ent_code,
from:commentLevel2.from, from:commentLevel2.from,
to:commentLevel2.to, to:commentLevel2.to,
type:COMMENTLEVEL2_TYPE, type:COMMENTLEVEL2_TYPE,
thread:tid, thread:thread._id,
threadStatus:thread.status,
commentLevel1:commentLevel1._id, commentLevel1:commentLevel1._id,
commentLevel1Status:commentLevel1.status,
commentLevel2:commentLevel2._id, commentLevel2:commentLevel2._id,
commentLevel2Status:commentLevel2.status,
created:new Date() created:new Date()
}); });
forumAboutMe.save(function(err){ forumAboutMe.save(function(err){
...@@ -53,22 +61,33 @@ exports.saveCommentLevel2=function(tid,commentLevel1,commentLevel2){ ...@@ -53,22 +61,33 @@ exports.saveCommentLevel2=function(tid,commentLevel1,commentLevel2){
console.log(err); console.log(err);
} }
}); });
});
}; };
exports.saveCommentLevel2BySearch=function(tid,l1id,l2id){ exports.saveCommentLevel2BySearch=function(tid,l1id,l2id){
forumThreadService.getById(tid,function(err,thread){
if(err || !thread){
return console.log(err || '没有对应的thread');
}
forumCommentService.getCommentById(l1id,function(err,commentLevel1){
if(err || !commentLevel1){
return console.log(err || '没有对应的一级评论');
}
forumCommentService.getCommentById(l2id,function(err,commentLevel2){ forumCommentService.getCommentById(l2id,function(err,commentLevel2){
if(err){ if(err || !commentLevel2){
return console.log(err); return console.log(err || '没有对应的二级评论');
} }
if(commentLevel2){
var forumAboutMe=new ForumAboutMe({ var forumAboutMe=new ForumAboutMe({
ent_code:commentLevel2.ent_code, ent_code:commentLevel2.ent_code,
from:commentLevel2.from, from:commentLevel2.from,
to:commentLevel2.to, to:commentLevel2.to,
type:COMMENTLEVEL2_TYPE, type:COMMENTLEVEL2_TYPE,
thread:tid, thread:thread._id,
commentLevel1:l1id, threadStatus:thread.status,
commentLevel2:l2id, commentLevel1:commentLevel1._id,
commentLevel1Status:commentLevel1.status,
commentLevel2:commentLevel2._id,
commentLevel2Status:commentLevel2.status,
created:new Date() created:new Date()
}); });
forumAboutMe.save(function(err){ forumAboutMe.save(function(err){
...@@ -76,58 +95,96 @@ exports.saveCommentLevel2BySearch=function(tid,l1id,l2id){ ...@@ -76,58 +95,96 @@ exports.saveCommentLevel2BySearch=function(tid,l1id,l2id){
console.log(err); console.log(err);
} }
}); });
} });
});
}); });
}; };
/*exports.updateThreadStatus=function(tid,status){ exports.updateThreadStatus=function(tid,status){
var condition={ var condition={
type:THREAD_TYPE, type:THREAD_TYPE,
thread:tid thread:new mongoose.Types.ObjectId(tid),
threadStatus:{$ne:status}
}
var obj={threadStatus:status};
ForumAboutMe.find(condition,function(err,docs){
if(err){
return console.log(err);
}
if(!docs || !docs.length){
return false;
} }
ForumAboutMe.findOneAndUpdate(condition,{threadStatus:status},function(err){ docs.forEach(function(doc){
ForumAboutMe.findOneAndUpdate({_id:doc._id},obj,function(err){
if(err){ if(err){
console.log(err); console.log(err);
} }
}); });
});
});
}; };
exports.updateCommentLevel1Status=function(cid,status){ exports.updateCommentLevel1Status=function(cid,status){
var condition={ var condition={
type:COMMENTLEVEL1_TYPE, type:COMMENTLEVEL1_TYPE,
commentLevel1:cid commentLevel1:new mongoose.Types.ObjectId(cid),
commentLevel1Status:{$ne:status}
}
var obj={commentLevel1Status:status};
ForumAboutMe.find(condition,function(err,docs){
if(err){
return console.log(err);
}
if(!docs || !docs.length){
return false;
} }
ForumAboutMe.findOneAndUpdate(condition,{commentLevel1Status:status},function(err){ docs.forEach(function(doc){
ForumAboutMe.findOneAndUpdate({_id:doc._id},obj,function(err){
if(err){ if(err){
console.log(err); console.log(err);
} }
}); });
});
});
}; };
exports.updateCommentLevel2Status=function(cid,status){ exports.updateCommentLevel2Status=function(cid,status){
var condition={ var condition={
type:COMMENTLEVEL2_TYPE, type:COMMENTLEVEL2_TYPE,
commentLevel2:cid commentLevel2:new mongoose.Types.ObjectId(cid),
commentLevel2Status:{$ne:status}
} }
ForumAboutMe.findOneAndUpdate(condition,{commentLevel2Status:status},function(err){ var obj={commentLevel2Status:status};
ForumAboutMe.find(condition,function(err,docs){
if(err){
return console.log(err);
}
if(!docs || !docs.length){
return false;
}
docs.forEach(function(doc){
ForumAboutMe.findOneAndUpdate({_id:doc._id},obj,function(err){
if(err){ if(err){
console.log(err); console.log(err);
} }
}); });
};*/ });
});
};
exports.me2other=function(ent_code,id,pageNo,pageSize,callback){ exports.me2other=function(ent_code,id,pageNo,pageSize,callback){
var condition={ var condition={
ent_code:ent_code, ent_code:ent_code,
from:id, from:new mongoose.Types.ObjectId(id),
$or:[{ $or:[{
type:THREAD_TYPE,'thread.status':1 type:THREAD_TYPE,threadStatus:1
},{ },{
type:COMMENTLEVEL1_TYPE,'commentLevel1.status':1 type:COMMENTLEVEL1_TYPE,threadStatus:1,commentLevel1Status:1
},{ },{
type:COMMENTLEVEL2_TYPE,'commentLevel2.status':1 type:COMMENTLEVEL2_TYPE,threadStatus:1,commentLevel1Status:1,commentLevel2Status:1
}] }]
}; };
ForumAboutMe.find(condition).count(function(err,count){ ForumAboutMe.find(condition).count(function(err,count){
if(err){ if(err){
return callback && callback(err); return callback && callback(err);
...@@ -165,11 +222,11 @@ exports.me2other=function(ent_code,id,pageNo,pageSize,callback){ ...@@ -165,11 +222,11 @@ exports.me2other=function(ent_code,id,pageNo,pageSize,callback){
exports.other2me=function(ent_code,id,pageNo,pageSize,callback){ exports.other2me=function(ent_code,id,pageNo,pageSize,callback){
var condition={ var condition={
ent_code:ent_code, ent_code:ent_code,
to:id, to:new mongoose.Types.ObjectId(id),
$or:[{ $or:[{
type:COMMENTLEVEL1_TYPE,'commentLevel1.status':1 type:COMMENTLEVEL1_TYPE,threadStatus:1,commentLevel1Status:1
},{ },{
type:COMMENTLEVEL2_TYPE,'commentLevel2.status':1 type:COMMENTLEVEL2_TYPE,threadStatus:1,commentLevel1Status:1,commentLevel2Status:1
}] }]
}; };
ForumAboutMe.find(condition).count(function(err,count){ ForumAboutMe.find(condition).count(function(err,count){
......
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