小米推送bug修改，增加用户团队信息消费

admin

2020-04-30 a5fde818ef9969e2e53acfa29b2e6f423bd0c8fc

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

@@ -6,13 +6,19 @@


import org.springframework.stereotype.Service;



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.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.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.service.inter.user.UserInfoRegisterService;

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

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



@Service

public class UserActiveLogServiceImpl implements UserActiveLogService {

@@ -26,6 +32,8 @@
   @Resource

   private UserInfoRegisterService userInfoRegisterService;

   

   @Resource(name = "producer")

   private Producer producer;



   @Override

   public void addUserActiveLog(UserActiveLog userActiveLog) {

@@ -48,7 +56,6 @@
         }

      }

      

		
      // 间隔5分钟以上再记录

      if (latestLog == null || System.currentTimeMillis() - latestLog.getCreateTime().getTime() > 1000 * 60 * 5L) {

         userActiveLog.setCreateTime(new Date());

@@ -56,6 +63,7 @@
         userActiveLogMapper.insertSelective(userActiveLog);

         // 更新最新活跃时间

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

         addMQMsg(userActiveLog.getUid());

      } else if (latestLog != null) {

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

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

@@ -68,8 +76,17 @@
            userActiveLogMapper.insertSelective(userActiveLog);

            // 更新最新活跃时间

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

            addMQMsg(userActiveLog.getUid());

         }

      }

   }



   //添加活跃消息

   private void addMQMsg(Long uid) {

      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

@@ -81,7 +98,6 @@
   public UserActiveLog getFirstActiveInfo(Long uid) {

      return userActiveLogMapper.selectFirstActiveInfo(uid);

   }



   

   @Override

   public long count90DaysLaterActiveNum(String preDay){