From fd1dce3121a7773419263c495f92e160cc1e7124 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 24 三月 2020 11:36:36 +0800
Subject: [PATCH] 2.1 +后台编辑
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserActiveLogServiceImpl.java | 86 ++++++++++++++-----------------------------
1 files changed, 28 insertions(+), 58 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserActiveLogServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserActiveLogServiceImpl.java
index 108380c..324b7f4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserActiveLogServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserActiveLogServiceImpl.java
@@ -1,21 +1,19 @@
package com.yeshi.fanli.service.impl.user;
-import java.text.ParseException;
import java.util.Date;
-import java.util.List;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
-import org.yeshi.utils.DateUtil;
import com.yeshi.fanli.dao.mybatis.user.UserActiveLogMapper;
-import com.yeshi.fanli.dao.user.UserActiveNumHistoryDao;
import com.yeshi.fanli.entity.bus.user.UserActiveLog;
-import com.yeshi.fanli.entity.bus.user.UserActiveNumHistory;
+import com.yeshi.fanli.entity.bus.user.UserInfoRegister;
+import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.user.UserActiveLogService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
-import com.yeshi.fanli.util.TimeUtil;
+import com.yeshi.fanli.service.inter.user.UserInfoRegisterService;
+import com.yeshi.fanli.util.user.ChannelEnumUtil;
@Service
public class UserActiveLogServiceImpl implements UserActiveLogService {
@@ -24,10 +22,11 @@
private UserActiveLogMapper userActiveLogMapper;
@Resource
- private UserActiveNumHistoryDao userActiveNumHistoryDao;
+ private UserInfoExtraService userInfoExtraService;
@Resource
- private UserInfoExtraService userInfoExtraService;
+ private UserInfoRegisterService userInfoRegisterService;
+
@Override
public void addUserActiveLog(UserActiveLog userActiveLog) {
@@ -35,7 +34,22 @@
return;
if (userActiveLog.getUid() == null || userActiveLog.getUid() == 0)
return;
+
UserActiveLog latestLog = getUserLatestActiveInfo(userActiveLog.getUid());
+ if (latestLog == null) {
+ try { // 淇濆瓨娉ㄥ唽淇℃伅
+ UserInfoRegister register = new UserInfoRegister();
+ register.setId(userActiveLog.getUid());
+ register.setIp(userActiveLog.getIp());
+ register.setChannel(ChannelEnumUtil.getChannelEnum(userActiveLog.getChannel()));
+ register.setDevice(userActiveLog.getDevice());
+ userInfoRegisterService.addRegisterInfo(register);
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
+ }
+
+
// 闂撮殧5鍒嗛挓浠ヤ笂鍐嶈褰�
if (latestLog == null || System.currentTimeMillis() - latestLog.getCreateTime().getTime() > 1000 * 60 * 5L) {
userActiveLog.setCreateTime(new Date());
@@ -69,58 +83,14 @@
return userActiveLogMapper.selectFirstActiveInfo(uid);
}
+
@Override
- public List<UserActiveNumHistory> query(Date startTime, Date endTime){
- // 閲嶆柊鏌ヨ缁熻浠婃棩浠ュ強绌虹己
- initUserActiveNumCount();
-
- return userActiveNumHistoryDao.query(startTime, endTime);
- }
-
-
- // 鍒濆鍖栫粺璁�
- private void initUserActiveNumCount() {
- UserActiveNumHistory history = userActiveNumHistoryDao.getMaxDate();
- Date lastDay = null;
- if (history != null && history.getDay() != null)
- lastDay = history.getDay();
-
- Date today = new Date();
- try {
- if (lastDay == null)
- lastDay = TimeUtil.parse("2018-09-01");
- int betweenDays = DateUtil.daysBetween2(lastDay, today);
-
- // 缁熻浠婃棩涔嬪墠鐨�
- if (betweenDays > 0) {
- for (int i = 1; i <= betweenDays; i++ ) {
- addUserActiveNumHistory(DateUtil.plusDay(i, lastDay));
- }
- }
- // 閲嶆柊缁熻浠婃棩
- addUserActiveNumHistory(TimeUtil.getGernalTime(today.getTime()));
- } catch (Exception e) {
- //
+ public long count90DaysLaterActiveNum(String date){
+ Long count = userActiveLogMapper.countActiveNumByDate(date);
+ if (count == null) {
+ count = 0L;
}
+ return count;
}
-
- /*
- * 缁熻褰撳ぉ娲昏穬鐢ㄦ埛涓湁澶氬皯涓敤鎴锋槸90澶╁墠鎵嶆椿璺冭繃锛屾湡闂翠粠鏈椿璺冪殑鐢ㄦ埛鏁伴噺銆�
- */
- @Override
- public void addUserActiveNumHistory(String date){
- int num = userActiveLogMapper.countActiveNumByDate(date);
-
- UserActiveNumHistory history = new UserActiveNumHistory();
- history.setId(date);
- history.setNum(num);
- try {
- history.setDay(TimeUtil.parse(date));
- } catch (ParseException e) {
- e.printStackTrace();
- }
- userActiveNumHistoryDao.save(history);
- }
-
}
--
Gitblit v1.8.0