From 28a0efc6ec16f3f82eb8e16e87269300d6744fd4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 25 九月 2019 19:18:17 +0800
Subject: [PATCH] 金币版本拦截与频率拦截bug修改

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceActiveServiceImpl.java |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceActiveServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceActiveServiceImpl.java
index 0fbaac4..17868de 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceActiveServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceActiveServiceImpl.java
@@ -10,6 +10,7 @@
 import com.yeshi.fanli.entity.push.DeviceActive;
 import com.yeshi.fanli.service.inter.push.DeviceActiveService;
 import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.cmq.DouYinDeviceActiveCMQManager;
 
 @Service
 public class DeviceActiveServiceImpl implements DeviceActiveService {
@@ -44,15 +45,23 @@
 			}
 
 			deviceActiveMapper.insertSelective(deviceActive);
+			DouYinDeviceActiveCMQManager.getInstance().addDeviceActive(deviceActive.getDevice(),
+					deviceActive.getPlatform());
 		} else {
 			DeviceActive updateDeviceActive = new DeviceActive();
 			updateDeviceActive.setId(da.getId());
 			updateDeviceActive.setUpdateTime(new Date());
 			updateDeviceActive.setVersionCode(deviceActive.getVersionCode());
+			if (StringUtil.isNullOrEmpty(da.getImei()))
+				updateDeviceActive.setImei(deviceActive.getImei());
 			if (!StringUtil.isNullOrEmpty(deviceActive.getDeviceToken())) {
 				updateDeviceActive.setDeviceToken(deviceActive.getDeviceToken());
 				updateDeviceActive.setDeviceTokenMd5(StringUtil.Md5(deviceActive.getDeviceToken()));
 			}
+
+			if (StringUtil.isNullOrEmpty(da.getMac()))
+				updateDeviceActive.setImei(deviceActive.getMac());
+
 			deviceActiveMapper.updateByPrimaryKeySelective(updateDeviceActive);
 		}
 
@@ -88,4 +97,9 @@
 		return deviceActiveMapper.selectFirst(device);
 	}
 
+	@Override
+	public DeviceActive getFirstActiveInfoByImei(String imei) {
+		return deviceActiveMapper.selectFirstByImei(imei);
+	}
+
 }

--
Gitblit v1.8.0