From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserActiveLogServiceImpl.java | 48 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 34 insertions(+), 14 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 324b7f4..3e44e8e 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
@@ -6,27 +6,35 @@
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.user.ChannelEnumUtil;
+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 UserInfoExtraService userInfoExtraService;
-
+
@Resource
private UserInfoRegisterService userInfoRegisterService;
-
+
+ @Resource(name = "producer")
+ private Producer producer;
@Override
public void addUserActiveLog(UserActiveLog userActiveLog) {
@@ -34,29 +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(ChannelEnumUtil.getChannelEnum(userActiveLog.getChannel()));
+ 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() + "#"
@@ -68,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
@@ -83,14 +104,13 @@
return userActiveLogMapper.selectFirstActiveInfo(uid);
}
-
@Override
- public long count90DaysLaterActiveNum(String date){
- Long count = userActiveLogMapper.countActiveNumByDate(date);
+ public long count90DaysLaterActiveNum(String preDay) {
+ Long count = userActiveLogMapper.countActiveNumByDate(preDay);
if (count == null) {
count = 0L;
}
return count;
}
-
+
}
--
Gitblit v1.8.0