From 744594ef1a2f530fc3e86ea9dc48b62247f79420 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 19 五月 2020 17:13:23 +0800
Subject: [PATCH] 饿了么绘图，添加口碑
---
fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceActiveServiceImpl.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 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 d99ce29..95b664e 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 {
@@ -37,22 +38,32 @@
deviceActive.getPlatform());
if (da == null) {
deviceActive.setId(null);
- deviceActive.setUpdateTime(new Date());
- deviceActive.setCreateTime(new Date());
+ if (deviceActive.getUpdateTime() == null)
+ deviceActive.setUpdateTime(new Date());
+ if (deviceActive.getCreateTime() == null)
+ deviceActive.setCreateTime(new Date());
if (!StringUtil.isNullOrEmpty(deviceActive.getDeviceToken())) {
deviceActive.setDeviceTokenMd5(StringUtil.Md5(deviceActive.getDeviceToken()));
}
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.setMac(deviceActive.getMac());
+
deviceActiveMapper.updateByPrimaryKeySelective(updateDeviceActive);
}
@@ -72,16 +83,25 @@
DeviceActive deviceActive = null;
if ("android".equalsIgnoreCase(platform)) {
- deviceActive = deviceActiveMapper.selectByDeviceAndPlatform(device, DeviceActive.PLATFORM_ANDROID);
+ deviceActive = deviceActiveMapper.selectFirstByDeviceAndPlatform(device, DeviceActive.PLATFORM_ANDROID);
} else if ("ios".equalsIgnoreCase(platform)) {
- deviceActive = deviceActiveMapper.selectByDeviceToeknMd5AndPlatform(StringUtil.Md5(deviceToken),
- DeviceActive.PLATFORM_IOS);
+ deviceActive = deviceActiveMapper.selectFirstByDeviceAndPlatform(device, DeviceActive.PLATFORM_IOS);
}
return deviceActive;
}
+ @Override
+ public DeviceActive getFirstActiveInfo(String device) {
+ return deviceActiveMapper.selectFirst(device);
+ }
+
+ @Override
+ public DeviceActive getFirstActiveInfoByImei(String imei) {
+ return deviceActiveMapper.selectFirstByImei(imei);
+ }
+
}
--
Gitblit v1.8.0