Skip to content

P
pisns-forum-api
Commit 3e747e2a authored by 陈志良's avatar 陈志良
Browse files
Options

1

parent fef007c6
Hide whitespace changes
Inline Side-by-side
Showing with 165 additions and 3 deletions
app/controllers/mobile/commentTips.js 0 → 100644
View file @ 3e747e2a
'use strict';
var express = require('express'),
router = express.Router(),
user = require('../../utils/user'),
returnCode = require('../../utils/returnCode'),
commentTips = require('../../utils/commentTips'),
_ = require('lodash');
module.exports = function(app) {
app.use('/v1/forum', router);
};
router.get('/commentTips', function(req, res, next) {
var userId = user.getMobileUser(req);
var entcode = req.session.user.ent_code;
commentTips.get(entcode,userId,function(err,result){
if(err){
res.json(returnCode.UNCHECK_ERROR(err));
}else{
res.json(_.assign(result, returnCode.SUCCESS));
}
});
});
router.put('/commentTips/:id', function(req, res, next) {
var userId = req.params.id;
var entcode = req.session.user.ent_code;
commentTips.incrTips(entcode,userId,function(err,result){
if(err){
res.json(returnCode.UNCHECK_ERROR(err));
}else{
res.json(_.assign(result, returnCode.SUCCESS));
}
});
});
router.put('/commentTips/del', function(req, res, next) {
var userId = user.getMobileUser(req);
var entcode = req.session.user.ent_code;
commentTips.clear(entcode,userId,function(err,result){
if(err){
res.json(returnCode.UNCHECK_ERROR(err));
}else{
res.json(_.assign(result, returnCode.SUCCESS));
}
});
});
\ No newline at end of file
app/controllers/mobile/forumInfo.js
View file @ 3e747e2a
......@@ -10,6 +10,7 @@ var forumInfoService = require('../../service/forumInfoService');
var forumThreadService = require('../../service/forumThreadService');
var forumUserThreadControlService = require('../../service/forumUserThreadControlService');
var forumTagService=require('../../service/forumTagService');
var forumCommentService=require('../../service/forumCommentService');
var httpService = require('../../service/httpService');
var user = require('../../utils/user');
......@@ -364,6 +365,76 @@ router.get('/info/:fid/myThreads', function(req, res, next) {
}
});
//获取我的文章列表
router.get('/info/myThreads', function(req, res, next) {
var pageNo = req.query.pageNo || 1;
var pageSize = req.query.pageSize || 10;
var conditions = {
ent_code: req.session.user.ent_code,
from: user.getMobileUser(req)
};
async.waterfall([
function(callback) {
callback();
// forumUserThreadControlService.getUserThreadControlById(user.getMobileUser(req), function(err, doc) {
// if (err) {
// callback(err, null);
// } else {
// if (doc) {
// callback(null, doc);
// } else {
// callback(null, null);
// }
// }
// });
}
], function(err, result) {
if (err) {
console.error(err);
res.json(returnCode.BUSY);
} else {
if (result) {
conditions._id = {
$nin: result.thread
};
}
//获取子话题数据
forumThreadService.getAllThreadByFid(conditions, pageNo, pageSize, '-praise_count', function(err, results) {
if (err) {
console.error(err);
res.json(returnCode.BUSY);
} else {
res.json(_.assign(results, returnCode.SUCCESS));
}
});
}
});
});
//获取我的评论列表
router.get('/info/myComments', function(req, res, next) {
var fid = req.params.fid || null;
var pageNo = req.query.pageNo || 1;
var pageSize = req.query.pageSize || 10;
var id=user.getMobileUser(req);
var conditions = {
ent_code: req.session.user.ent_code,
status:1,
//$or:[{from: id},{to: id}]
to: id
};
forumCommentService.getMyComment(conditions, pageNo, pageSize, function(err, results) {
if (err) {
console.error(err);
res.json(returnCode.BUSY);
} else {
res.json(_.assign(results, returnCode.SUCCESS));
}
});
});
//搜索文章列表
router.get('/info/:fid/serachThreads', function(req, res, next) {
var fid = req.params.fid || null;
......
app/controllers/mobile/forumNotice.js
View file @ 3e747e2a
......@@ -94,7 +94,7 @@ router.get('/notice/newestMsg', function(req, res, next) {
pageSize=req.query.pageSize,
plate=req.query.plate;
var _condition = {status:1,type:2,ent_code:req.session.openUser.ent_code},_sort = {top:-1,createtime:-1};
var _condition = {status:1,type:2,ent_code:req.session.user.ent_code},_sort = {top:-1,createtime:-1};
if(plate){
_condition.$or=[{plate:plate},{plate:null}];
}else{
......@@ -125,7 +125,7 @@ router.get('/notice/newestAct', function(req, res, next) {
var curdate = new Date(),
_condition = {status:1,finished:0,type:1,
,ent_code:req.session.openUser.ent_code,
ent_code:req.session.user.ent_code,
startdate:{$lte:curdate},
indate:{$gte:curdate},
},_sort = {top:-1,startdate:-1};
......@@ -134,6 +134,7 @@ router.get('/notice/newestAct', function(req, res, next) {
}else{
_condition.plate=null;
}
console.log(_condition);
queryList(_condition,_sort,pageNo,pageSize,function(err,result){
if(err){
return res.json(err);
......@@ -156,7 +157,7 @@ router.get('/notice/oldAct', function(req, res, next) {
pageSize=req.query.pageSize,
plate=req.query.plate,
curdate = new Date(),
_condition = {status:1,type:1,ent_code:req.session.openUser.ent_code,$or:[{indate:{$lt:curdate}},{finished:1}]},
_condition = {status:1,type:1,ent_code:req.session.user.ent_code,$or:[{indate:{$lt:curdate}},{finished:1}]},
_sort = {top:-1,indate:-1};
if(plate){
_condition.$or=[{plate:plate},{plate:null}];
......
app/utils/commentTips.js 0 → 100644
View file @ 3e747e2a
'use strict';
var redis=global.redis;
var prefix = '_forum_comment_count_';
var expire = 60*60*24*180;
function getKey(entcode,userId){
return entcode + prefix + userId;
}
exports.clear = function(entcode,userId,callback){
var key = getKey(entcode,userId);
if(!redis){
console.log('redis error');
return callback && callback('error');
}
redis.del(key, function(error, res){
return callback && callback(error, !!res);
});
};
exports.incrTips=function(entcode,userId,callback){
var key = getKey(entcode,userId);
if(!redis){
console.log('redis error');
return callback && callback('error');
}
redis.incr(key, function(error, res){
redis.expire(key, expire);
return callback && callback(error, !!res);
});
};
exports.get=function(entcode,userId,callback){
var key = getKey(entcode,userId);
if(!redis){
console.log('redis error');
return callback && callback('error');
}
redis.get(key, function(error, res){
return callback && callback(error, res || 0);
});
};
\ 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