소스 검색

feat: 累计所有登录时长

zhangweicheng 4 년 전
부모
커밋
1aa7eeebe3
3개의 변경된 파일9개의 추가작업 그리고 5개의 파일을 삭제
  1. 2 2
      logs/online_logs.js
  2. 6 2
      modules/all_models/user.js
  3. 1 1
      web/building_saas/main/html/main.html

+ 2 - 2
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);

+ 6 - 2
modules/all_models/user.js

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

+ 1 - 1
web/building_saas/main/html/main.html

@@ -1341,7 +1341,7 @@
         </div>
         <div class="modal-footer">
           <a href="javascript:void(0);" class="btn btn-primary" id="property_default" data-dismiss="modal"
-            style="margin-right: 485px">恢复默认系统设置</a>
+            style="margin-right: 475px">恢复默认系统设置</a>
           <a href="javascript:void(0);" class="btn btn-primary" id="property_ok" data-dismiss="modal">确定</a>
           <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
         </div>