Merge branch 'master' of http://192.168.1.41:3000/SmartCost/YangHuCost

logs/online_logs.js

@@ -33,13 +33,13 @@ async function saveOnlineTime(req) {
         let record = await logs_model.findOne(condition);
         if(record){ //如果找到，则累加
             await logs_model.update(condition,{$inc:{'online_times' : online_times }});
-            await user_model.update(userCondition,{$inc:{'online_times' : online_times }});
+            await user_model.update(userCondition,{$inc:{'online_times' : online_times, 'all_online_times' : online_times}});
         }else {//如果没找到，则新增一条记录
             condition["online_times"] = online_times;
             let today = moment(dataString).toDate();
             condition["dateTime"] = +today;
             await logs_model.create(condition);
-            await user_model.update(userCondition,{'online_times' : online_times});
+            await user_model.update(userCondition,{'online_times' : online_times,$inc:{'all_online_times' : online_times }});
         }
     }catch (e){
         console.log("统计登录时间错误，online_times值："+online_times);

modules/all_models/user.js

@@ -125,6 +125,10 @@ let schema = {
         type: Number,
         default: 0
     }, //最近一天的登录时长累计
+    all_online_times: {//所有登录时长累计
+        type: Number,
+        default: 0
+    },
     is_cld: {
         type: Number,
         default: 0, // 0为普通用户，时间戳代表CLD剔除用户并按时间戳排序

modules/users/controllers/cld_controller.js

@@ -208,6 +208,7 @@ class CLDController {
             userData.create_time = date.getFullYear() + '年' +
                 (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1) + '月' +
                 (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + '日';
+            userData.all_online_times = online_facade.getTimeString(userData.all_online_times).s;
 
             //获取编办列表
             let compilationModel = new CompilationModel();

modules/users/facade/online_facade.js

@@ -4,7 +4,8 @@
 
 module.exports = {
     setOnlineTimes:setOnlineTimes,
-    getOnlineInfo:getOnlineInfo
+    getOnlineInfo:getOnlineInfo,
+    getTimeString:getTimeString,
 };
 
 let mongoose = require("mongoose");
@@ -47,6 +48,7 @@ async function setOnlineTimes(userList,condition){
         u._doc.filter = JSON.stringify(filter);
         if(result.length > 0)  u._doc.online_times = getTimeString(result[0].total).s;
         u._doc.online_list = await this.getOnlineInfo(filter);
+        u._doc.all_online_times = getTimeString(u.all_online_times).s;
     }
 }