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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

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

@@ -1,33 +1,40 @@
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.aliyun.openservices.ons.api.Message;

import com.aliyun.openservices.ons.api.Producer;

import com.yeshi.fanli.dao.mybatis.user.UserActiveLogMapper;

import com.yeshi.fanli.dao.user.UserActiveNumHistoryDao;

import com.yeshi.fanli.dto.mq.user.UserTopicTagEnum;

import com.yeshi.fanli.dto.mq.user.body.UserActiveMQMsg;

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.Constant;

import com.yeshi.fanli.util.rocketmq.MQMsgBodyFactory;

import com.yeshi.fanli.util.rocketmq.MQTopicName;



@Service

public class UserActiveLogServiceImpl implements UserActiveLogService {



   @Resource

   private UserActiveLogMapper userActiveLogMapper;

	
   @Resource

   private UserActiveNumHistoryDao userActiveNumHistoryDao;

	


   @Resource

   private UserInfoExtraService userInfoExtraService;



   @Resource

   private UserInfoRegisterService userInfoRegisterService;



   @Resource(name = "producer")

   private Producer producer;



   @Override

   public void addUserActiveLog(UserActiveLog userActiveLog) {

@@ -35,14 +42,29 @@
         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(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());

         userActiveLog.setUpdateTime(new Date());

         userActiveLogMapper.insertSelective(userActiveLog);

         // 更新最新活跃时间

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

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

         addMQMsg(userActiveLog.getUid());

      } else if (latestLog != null) {

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

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

@@ -54,9 +76,22 @@
            userActiveLog.setUpdateTime(new Date());

            userActiveLogMapper.insertSelective(userActiveLog);

            // 更新最新活跃时间

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

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

            addMQMsg(userActiveLog.getUid());

         }

      }

   }



   //添加活跃消息

   private void addMQMsg(Long uid) {

      if (Constant.IS_TEST) {

         return;

      }

		
      UserActiveMQMsg msg = new UserActiveMQMsg(uid, new Date());

      Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.userActve, msg);

      message.setStartDeliverTime(System.currentTimeMillis() + 1000 * 5L);// 5s后发送活跃消息

      producer.send(message);

   }



   @Override

@@ -70,57 +105,12 @@
   }



   @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, history.getDay()));

            }

         }

         // 重新统计今日

         addUserActiveNumHistory(TimeUtil.getGernalTime(today.getTime()));

      } catch (Exception e) {

         // 
   public long count90DaysLaterActiveNum(String preDay) {

      Long count = userActiveLogMapper.countActiveNumByDate(preDay);

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

   }

	
	


}