Commit 46939f20 authored by 刘文胜's avatar 刘文胜

1111

parent 974f1dd2
...@@ -1911,10 +1911,10 @@ router.get('/thread/getThreadWithEssence', function(req, res, next) { ...@@ -1911,10 +1911,10 @@ router.get('/thread/getThreadWithEssence', function(req, res, next) {
}); });
}else{ }else{
//更新推荐列表redis //更新推荐列表redis
redisThreadList.get(ent_code, "", redis_type,sort, function(error, docs) { redisThreadList.get(ent_code, "", redis_type, function(error, docs) {
var results = JSON.parse(docs); var results = JSON.parse(docs);
if(results.items == null){ //如果不存在,继续重新获取 if(results.items == null){ //如果不存在,继续重新获取
redisThreadList.getRedisEsenceThreads(ent_code, "", redis_type,sort, function(error, docs){ redisThreadList.getRedisEsenceThreads(ent_code, "", redis_type, function(error, docs){
if(error){ if(error){
console.error(err); console.error(err);
res.json(returnCode.BUSY); res.json(returnCode.BUSY);
......
...@@ -12,6 +12,19 @@ var forumThreadService=require('../service/forumThreadService'); ...@@ -12,6 +12,19 @@ var forumThreadService=require('../service/forumThreadService');
var redisPraiseLog=require('./redisPraiseLog'); var redisPraiseLog=require('./redisPraiseLog');
var util=require('./util'); var util=require('./util');
var sort = {
new_recommend:-1,
new_recommend_order_idx:-1,
new_recommend_time:-1,
top:-1,
top_order_idx:-1,
topTime:-1,
tag_top:-1,
tag_topTime:-1,
quality:-1,
created:-1
};
function getKey(ent_code,keyID,type){ function getKey(ent_code,keyID,type){
var key = ent_code + keyID + type; var key = ent_code + keyID + type;
return key; return key;
...@@ -29,7 +42,7 @@ function setToRedis(ent_code,keyID,type,value){ ...@@ -29,7 +42,7 @@ function setToRedis(ent_code,keyID,type,value){
}); });
} }
exports.get=function(ent_code,keyID,type,sort,callback){ exports.get=function(ent_code,keyID,type,callback){
var key = getKey(ent_code,keyID,type); var key = getKey(ent_code,keyID,type);
if(!redis){ if(!redis){
console.log('redis error'); console.log('redis error');
...@@ -38,7 +51,7 @@ exports.get=function(ent_code,keyID,type,sort,callback){ ...@@ -38,7 +51,7 @@ exports.get=function(ent_code,keyID,type,sort,callback){
redis.get(key, function(error, res){ redis.get(key, function(error, res){
if(!res){ if(!res){
//不存在,先获取再返回 //不存在,先获取再返回
getEsenceThreads(ent_code, keyID, type,sort,function(err){ getEsenceThreads(ent_code, keyID, type,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(","));
}); });
...@@ -61,7 +74,6 @@ exports.set=function(ent_code,keyID,type,value,callback){ ...@@ -61,7 +74,6 @@ exports.set=function(ent_code,keyID,type,value,callback){
}); });
}; };
exports.clear = function(ent_code,keyID,type,callback){ exports.clear = function(ent_code,keyID,type,callback){
var key = getKey(ent_code,keyID,type); var key = getKey(ent_code,keyID,type);
if(!redis){ if(!redis){
...@@ -73,8 +85,7 @@ exports.clear = function(ent_code,keyID,type,callback){ ...@@ -73,8 +85,7 @@ exports.clear = function(ent_code,keyID,type,callback){
}); });
}; };
function getEsenceThreads(ent_code,keyID,type,callback){
function getEsenceThreads(ent_code,keyID,type,sort,callback){
var today = new Date(); var today = new Date();
var conditions = { var conditions = {
ent_code: ent_code, ent_code: ent_code,
...@@ -104,9 +115,9 @@ function getEsenceThreads(ent_code,keyID,type,sort,callback){ ...@@ -104,9 +115,9 @@ function getEsenceThreads(ent_code,keyID,type,sort,callback){
}; };
//获取缓存列表 //获取缓存列表
exports.getRedisEsenceThreads = function(ent_code,keyID,type,sort,callback){ exports.getRedisEsenceThreads = function(ent_code,keyID,type,callback){
var key = getKey(ent_code,keyID,type); var key = getKey(ent_code,keyID,type);
getEsenceThreads(ent_code, keyID,type,sort, function(err){ getEsenceThreads(ent_code, keyID,type, 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(","));
}); });
......
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