Skip to content

P
pisns-forum-api
Commit fd749970 authored by 陈家荣's avatar 陈家荣
1 Browse files
Options

帖子修改排序号后及时在移动端更新效果

parent 18abca5d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 408 additions and 264 deletions
app/controllers/admin/forumThread.js
View file @ fd749970
...@@ -322,7 +322,7 @@ router.post('/thread/:tid/:fid/unTop', function(req, res, next) { ...@@ -322,7 +322,7 @@ router.post('/thread/:tid/:fid/unTop', function(req, res, next) {
} }
}); });
//文章推荐 //文章加精
router.post('/thread/:tid/:fid/recommend', function(req, res, next) { router.post('/thread/:tid/:fid/recommend', function(req, res, next) {
var tid = req.params.tid, var tid = req.params.tid,
fid = req.params.fid, fid = req.params.fid,
...@@ -364,7 +364,7 @@ router.post('/thread/:tid/:fid/recommend', function(req, res, next) { ...@@ -364,7 +364,7 @@ router.post('/thread/:tid/:fid/recommend', function(req, res, next) {
} }
}); });
//文章取消推荐 //文章取消加精
router.post('/thread/:tid/:fid/unRecommend', function(req, res, next) { router.post('/thread/:tid/:fid/unRecommend', function(req, res, next) {
var tid = req.params.tid; //文章ID var tid = req.params.tid; //文章ID
var fid = req.params.fid; //板块ID var fid = req.params.fid; //板块ID
...@@ -555,32 +555,43 @@ router.get('/threads/list', function(req, res, next) { ...@@ -555,32 +555,43 @@ router.get('/threads/list', function(req, res, next) {
//直接修改序号 //直接修改序号
function updateThreadTopIdx(id,idx,callback){ function updateThreadTopIdx(id,idx,callback){
ForumThread.update( // ForumThread.update({_id:id},{ top_order_idx: idx },
{_id:id}, // null,
{ top_order_idx: idx }, // function(err,result){
null, // if(err){
function(err,result){ // console.error(err);
if(err){ // callback(err,null);
console.error(err); // }else{
callback(err,null); // callback(null,true);
}else{ // }
callback(null,true); // });
} forumThreadService.updateThread({_id:id}, { top_order_idx: idx }, function(err, doc) {
}); if(err){
console.error(err);
callback(err,null);
}else{
callback(null,true);
}
});
} }
function updateThreadNewRecommendIdx(id,idx,callback){ function updateThreadNewRecommendIdx(id,idx,callback){
ForumThread.update( // ForumThread.update({_id:id},{ new_recommend_order_idx: idx },null, function(err,result){
{_id:id}, // if(err){
{ new_recommend_order_idx: idx }, // console.error(err);
null, // callback(err,null);
function(err,result){ // }else{
if(err){ // callback(null,true);
console.error(err); // }
callback(err,null); // });
}else{
callback(null,true); forumThreadService.updateThread({_id:id}, { new_recommend_order_idx: idx }, function(err, doc) {
} if(err){
}); console.error(err);
callback(err,null);
}else{
callback(null,true);
}
});
} }
router.put('/top_threads/orderIDX/:id/:order', function(req, res, next) { router.put('/top_threads/orderIDX/:id/:order', function(req, res, next) {
var id=req.params.id; var id=req.params.id;
......
app/controllers/mobile/forumThread.js
View file @ fd749970
...@@ -666,13 +666,16 @@ router.post('/thread/:tid/update', function(req, res, next) { ...@@ -666,13 +666,16 @@ router.post('/thread/:tid/update', function(req, res, next) {
router.post('/thread/:tid/delete', function(req, res, next) { router.post('/thread/:tid/delete', function(req, res, next) {
var tid = req.params.tid; var tid = req.params.tid;
if (tid) { if (tid) {
forumThreadService.deleteThreadById(tid, function(err, thread) { //注销此方法
if (err) {
res.json(returnCode.BUSY); // forumThreadService.deleteThreadById(tid, function(err, thread) {
} else { // if (err) {
res.json(returnCode.SUCCESS); // res.json(returnCode.BUSY);
} // } else {
}); // res.json(returnCode.SUCCESS);
// }
// });
res.json(returnCode.BUSY);
} else { } else {
res.json(returnCode.WRONG_PARAM); res.json(returnCode.WRONG_PARAM);
} }
...@@ -1756,8 +1759,6 @@ router.get('/thread/getThreadWithEssence', function(req, res, next) { ...@@ -1756,8 +1759,6 @@ router.get('/thread/getThreadWithEssence', function(req, res, next) {
var infoId = req.query.infoId || null; var infoId = req.query.infoId || null;
var ent_code = req.session.user.ent_code; var ent_code = req.session.user.ent_code;
var skip = (pageNo - 1) * pageSize; var skip = (pageNo - 1) * pageSize;
var redis_type = '_thread_essence';
var sort = { var sort = {
new_recommend:-1, new_recommend:-1,
new_recommend_order_idx:-1, new_recommend_order_idx:-1,
...@@ -1786,7 +1787,6 @@ router.get('/thread/getThreadWithEssence', function(req, res, next) { ...@@ -1786,7 +1787,6 @@ router.get('/thread/getThreadWithEssence', function(req, res, next) {
}] }]
}; };
if((pageNo * pageSize) > redisThreadList.getThreadRedisCount() || infoId){ if((pageNo * pageSize) > redisThreadList.getThreadRedisCount() || infoId){
if(infoId){ if(infoId){
conditions.info = infoId; conditions.info = infoId;
...@@ -1805,10 +1805,10 @@ router.get('/thread/getThreadWithEssence', function(req, res, next) { ...@@ -1805,10 +1805,10 @@ router.get('/thread/getThreadWithEssence', function(req, res, next) {
}); });
}else{ }else{
//更新推荐列表redis //更新推荐列表redis
redisThreadList.get(ent_code, "", redis_type, function(error, docs) { redisThreadList.get(ent_code, function(error, docs) {
var results = JSON.parse(docs); var results = JSON.parse(docs);
if(results.items == null || results.items.length <= 0){ //如果不存在，继续重新获取 if(results.items == null || results.items.length <= 0){ //如果不存在，继续重新获取
redisThreadList.getRedisEsenceThreads(ent_code, "", redis_type, function(error, docs){ redisThreadList.getRedisEsenceThreads(ent_code, function(error, docs){
if(error){ if(error){
console.error(err); console.error(err);
res.json(returnCode.BUSY); res.json(returnCode.BUSY);
...@@ -1945,7 +1945,7 @@ router.get('/thread/:tid/get/subThreads/:type', function(req, res, next) { ...@@ -1945,7 +1945,7 @@ router.get('/thread/:tid/get/subThreads/:type', function(req, res, next) {
if(type == 1){ //最新 if(type == 1){ //最新
sort = '-created'; sort = '-created';
}else if(type == 2){ //最热 }else if(type == 2){ //最热
sort = '-praise_count -comment_count';
} }
if (tid) { if (tid) {
......
app/service/forumThreadService.js
View file @ fd749970
This diff is collapsed.
app/utils/redisThreadList.js
View file @ fd749970
'use strict'; 'use strict';
var redis=global.redis; var redis=global.redis;
var expire = 60*10; var expire = 60*30;
//缓存数量 //缓存数量
var ThreadRedisCount = 50; var ThreadRedisCount = 50;
...@@ -12,6 +12,10 @@ var forumThreadService=require('../service/forumThreadService'); ...@@ -12,6 +12,10 @@ var forumThreadService=require('../service/forumThreadService');
var redisPraiseLog=require('./redisPraiseLog'); var redisPraiseLog=require('./redisPraiseLog');
var util=require('./util'); var util=require('./util');
var RefreshFlag = true;
var tyhread_redis_salt = '_tyhread_redis_salt';
var sort = { var sort = {
new_recommend:-1, new_recommend:-1,
new_recommend_order_idx:-1, new_recommend_order_idx:-1,
...@@ -25,13 +29,13 @@ var sort = { ...@@ -25,13 +29,13 @@ var sort = {
created:-1 created:-1
}; };
function getKey(ent_code,keyID,type){ function getKey(ent_code, salt){
var key = ent_code + keyID + type; var key = ent_code + salt;
return key; return key;
} }
function setToRedis(ent_code,keyID,type,value){ function setToRedis(ent_code,salt,value){
var key = getKey(ent_code,keyID,type); var key = getKey(ent_code,salt);
if(!redis){ if(!redis){
console.log('redis error'); console.log('redis error');
return 'error' return 'error'
...@@ -42,8 +46,37 @@ function setToRedis(ent_code,keyID,type,value){ ...@@ -42,8 +46,37 @@ function setToRedis(ent_code,keyID,type,value){
}); });
} }
exports.get=function(ent_code,keyID,type,callback){ function getEsenceThreads(ent_code, salt,callback){
var key = getKey(ent_code,keyID,type); var today = new Date();
var conditions = {
ent_code: ent_code,
level: 1,
status: 1,
new_recommend: 1,
$or: [{
isEvent: 0
}, {
isEvent: null
}, {
isEvent: 1,
'event.eventStartTime' : {$lte : today}
}]
};
forumThreadService.getThreadWithNotPopulateComment(conditions, 1, ThreadRedisCount, sort, function(err, results) {
if (err) {
console.error(err);
callback(err);
} else {
util.loadLevel(ent_code, results.items, function() {
setToRedis(ent_code, salt ,JSON.stringify(results));
callback(null);
});
}
});
};
exports.get=function(ent_code, callback){
var key = getKey(ent_code, tyhread_redis_salt);
if(!redis){ if(!redis){
console.log('redis error'); console.log('redis error');
return callback && callback('error'); return callback && callback('error');
...@@ -51,7 +84,7 @@ exports.get=function(ent_code,keyID,type,callback){ ...@@ -51,7 +84,7 @@ exports.get=function(ent_code,keyID,type,callback){
redis.get(key, function(error, res){ redis.get(key, function(error, res){
if(!res){ if(!res){
//不存在，先获取再返回 //不存在，先获取再返回
getEsenceThreads(ent_code, keyID, type,function(err){ getEsenceThreads(ent_code, tyhread_redis_salt,function(err){
redis.get(key, function(error, res){ redis.get(key, function(error, res){
return callback && callback(error, res.split(",")); return callback && callback(error, res.split(","));
}); });
...@@ -62,8 +95,8 @@ exports.get=function(ent_code,keyID,type,callback){ ...@@ -62,8 +95,8 @@ exports.get=function(ent_code,keyID,type,callback){
}); });
}; };
exports.set=function(ent_code,keyID,type,value,callback){ exports.set=function(ent_code, salt, value, callback){
var key = getKey(ent_code,keyID,type); var key = getKey(ent_code, salt);
if(!redis){ if(!redis){
console.log('redis error'); console.log('redis error');
return callback && callback('error'); return callback && callback('error');
...@@ -74,8 +107,8 @@ exports.set=function(ent_code,keyID,type,value,callback){ ...@@ -74,8 +107,8 @@ exports.set=function(ent_code,keyID,type,value,callback){
}); });
}; };
exports.clear = function(ent_code,keyID,type,callback){ exports.clear = function(ent_code,salt,callback){
var key = getKey(ent_code,keyID,type); var key = getKey(ent_code, salt);
if(!redis){ if(!redis){
console.log('redis error'); console.log('redis error');
return callback && callback('error'); return callback && callback('error');
...@@ -85,53 +118,24 @@ exports.clear = function(ent_code,keyID,type,callback){ ...@@ -85,53 +118,24 @@ exports.clear = function(ent_code,keyID,type,callback){
}); });
}; };
function getEsenceThreads(ent_code,keyID,type,callback){
var today = new Date();
var conditions = {
ent_code: ent_code,
level: 1,
status: 1,
new_recommend: 1,
$or: [{
isEvent: 0
}, {
isEvent: null
}, {
isEvent: 1,
'event.eventStartTime' : {$lte : today}
}]
};
forumThreadService.getThreadWithNotPopulateComment(conditions, 1, ThreadRedisCount, sort, function(err, results) {
if (err) {
console.error(err);
callback(err);
} else {
util.loadLevel(ent_code, results.items, function() {
setToRedis(ent_code,keyID,type,JSON.stringify(results));
callback(null);
});
}
});
};
//获取缓存列表 //获取缓存列表
exports.getRedisEsenceThreads = function(ent_code,keyID,type,callback){ exports.getRedisEsenceThreads = function(ent_code, callback){
var key = getKey(ent_code,keyID,type); var key = getKey(ent_code, tyhread_redis_salt);
getEsenceThreads(ent_code, keyID,type, function(err){ getEsenceThreads(ent_code, tyhread_redis_salt, function(err){
redis.get(key, function(error, res){ redis.get(key, function(error, res){
return callback && callback(error, res.split(",")); return callback && callback(error, res.split(","));
}); });
}); });
}; };
//更新缓存列表
/*exports.updateRedisEsenceThreads = function(ent_code,keyID,type,callback){
getEsenceThreads(ent_code, keyID,type, function(err){
callback();
});
};*/
//获取缓存数值 //获取缓存数值
exports.getThreadRedisCount = function(){ exports.getThreadRedisCount = function(){
return ThreadRedisCount; return ThreadRedisCount;
};
//更新缓存列表
exports.updateRedisEsenceThreads = function(ent_code){
if(RefreshFlag){
getEsenceThreads(ent_code, tyhread_redis_salt, function(err){});
}
}; };
\ No newline at end of file
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