Merge remote-tracking branch 'origin/div' into div

admin

2020-02-18 ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserActiveLogServiceImpl.java

@@ -1,20 +1,33 @@
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.service.inter.user.UserActiveLogService;

import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

import com.yeshi.fanli.util.TimeUtil;



@Service

public class UserActiveLogServiceImpl implements UserActiveLogService {



   @Resource

   private UserActiveLogMapper userActiveLogMapper;

	
   @Resource

   private UserActiveNumHistoryDao userActiveNumHistoryDao;

	
   @Resource

   private UserInfoExtraService userInfoExtraService;



   @Override

   public void addUserActiveLog(UserActiveLog userActiveLog) {

@@ -28,6 +41,21 @@
         userActiveLog.setCreateTime(new Date());

         userActiveLog.setUpdateTime(new Date());

         userActiveLogMapper.insertSelective(userActiveLog);

         // 更新最新活跃时间

         userInfoExtraService.updateActiveTime(userActiveLog.getUid() , new Date());

      } else if (latestLog != null) {

         // 如果设备 ，版本，渠道有变化则需要更改

         String oldIdentify = latestLog.getDevice() + "#" + latestLog.getVersionCode() + "#"

               + latestLog.getChannel();

         String newIdentify = userActiveLog.getDevice() + "#" + userActiveLog.getVersionCode() + "#"

               + userActiveLog.getChannel();

         if (!oldIdentify.equalsIgnoreCase(newIdentify)) {// 设备信息变化要记录信息

            userActiveLog.setCreateTime(new Date());

            userActiveLog.setUpdateTime(new Date());

            userActiveLogMapper.insertSelective(userActiveLog);

            // 更新最新活跃时间

            userInfoExtraService.updateActiveTime(userActiveLog.getUid() , new Date());

         }

      }

   }



@@ -36,8 +64,63 @@
      return userActiveLogMapper.selectLatestByUid(uid);

   }



   @Override

   public UserActiveLog getFirstActiveInfo(Long uid) {

      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) {

         // 
      }

   }

	
   /*

    * 统计当天活跃用户中有多少个用户是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);

   }

   

   

}