Merge commit 'cde83141' into SANDBOX

# Conflicts:
#	app/models/forumThread.js

app/controllers/admin/forumThread.js

@@ -393,6 +393,7 @@ router.get('/threads/list', function(req, res, next) {
     var nickName = req.query.nickName;
     var mid = req.query.mid;
     var quality = req.query.quality;
+    var new_recommend = req.query.new_recommend;
 
     var conditions = {
         ent_code: req.session.user.ent_code,
@@ -431,6 +432,11 @@ router.get('/threads/list', function(req, res, next) {
     if (quality) {
         conditions.quality = quality;
     }
+
+    if (new_recommend) {
+        conditions.new_recommend = new_recommend;
+    }
+
     if (mid) {
         forumThreadService.getAllThreadByFidAndMid(mid, conditions, pageNo, pageSize, null, function(err, results) {
             if (err) {
@@ -1544,8 +1550,6 @@ router.get('/thread/:tid/exportComments', function(req, res, next) {
     });
 });
 
-
-
 //更新文章质量
 router.post('/thread/:tid/quality', function(req, res, next) {
     var tid = req.params.tid; //文章ID
@@ -1566,3 +1570,57 @@ router.post('/thread/:tid/quality', function(req, res, next) {
         res.json(returnCode.WRONG_PARAM);
     }
 });
+
+
+//文章推荐
+router.post('/thread/:tid/essence', function(req, res, next) {
+    var tid = req.params.tid
+    var ent_code = req.session.user.ent_code;
+    if (tid) {
+        var condition = {
+            _id: tid,
+            ent_code: ent_code
+        };
+        var entity = {
+            essence: 1,
+            essenceTime: new Date()
+        };
+
+        forumThreadService.updateThread(condition, entity, function(err, doc) {
+            if (err) {
+                console.error(err);
+                res.json(returnCode.BUSY);
+            } else {
+                res.json(returnCode.SUCCESS);
+            }
+        });
+    } else {
+        res.json(returnCode.WRONG_PARAM);
+    }
+});
+
+//文章取消推荐
+router.post('/thread/:tid/unEssence', function(req, res, next) {
+    var tid = req.params.tid; //文章ID
+    var ent_code = req.session.user.ent_code;
+    if (tid) {
+        var condition = {
+            _id: tid,
+            ent_code: ent_code
+        };
+        var entity = {
+            essence: 0,
+            essenceTime: null
+        };
+        forumThreadService.updateThread(condition, entity, function(err, doc) {
+            if (err) {
+                console.error(err);
+                res.json(returnCode.BUSY);
+            } else {
+                res.json(returnCode.SUCCESS);
+            }
+        });
+    } else {
+        res.json(returnCode.WRONG_PARAM);
+    }
+});
\ No newline at end of file

app/controllers/mobile/forumThread.js

@@ -1777,3 +1777,27 @@ router.post('/thread/:tid/disable', function(req, res, next) {
         res.json(returnCode.WRONG_PARAM);
     }
 });
+
+
+//获取推荐文章
+router.get('/thread/getThreadWithEssence', function(req, res, next) {
+    var pageNo = req.query.pageNo || 1,
+        pageSize = req.query.pageSize || 10,
+        ent_code = req.session.user.ent_code;
+    if (pageNo && pageSize) {
+        var q = {
+            ent_code: ent_code,
+            new_recommend: 1
+        };
+
+        forumThreadService.findThread(pageNo, pageSize, q, '-new_recommend_time', function(err, result) {
+            if (err) {
+                console.error(err);
+                res.json(returnCode.BUSY);
+            }
+            res.json(_.assign(result, returnCode.SUCCESS));
+        });
+    } else {
+        res.json(returnCode.WRONG_PARAM);
+    }
+});
\ No newline at end of file

app/models/forumThread.js

@@ -122,6 +122,14 @@ var ForumThreadSchema = new Schema({
 	    type: Schema.Types.ObjectId,
 	    ref: 'ForumUser'
 	}],
+	new_recommend : { //推荐 0否，1是
+		type: Number,
+		require: true,
+		default: 0
+	},
+	new_recommend_time:{//推荐时间
+		type: Date
+	},
 	created: {
 	    type: Date,
 	    required: true,