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/push/DeviceActiveServiceImpl.java | 107 ++++++++++++++++++++++++++---------------------------
1 files changed, 52 insertions(+), 55 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 ccbce8a..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 {
@@ -27,84 +28,80 @@
if (deviceActive.getVersionCode() == null)
return;
- if (deviceActive.getPlatform() == DeviceActive.PLATFORM_ANDROID
- && StringUtil.isNullOrEmpty(deviceActive.getDevice()))
+ if (StringUtil.isNullOrEmpty(deviceActive.getDevice()))
return;
- if (deviceActive.getPlatform() == DeviceActive.PLATFORM_IOS
- && StringUtil.isNullOrEmpty(deviceActive.getDeviceToken()))
+ // Android鐨勫敮涓�鏍囪瘑涓篸evice
+ if (StringUtil.isNullOrEmpty(deviceActive.getDevice()))
return;
-
- switch (deviceActive.getPlatform()) {
- case DeviceActive.PLATFORM_ANDROID:
- // Android鐨勫敮涓�鏍囪瘑涓篸evice
- if (StringUtil.isNullOrEmpty(deviceActive.getDevice()))
- return;
- DeviceActive da = deviceActiveMapper.selectByDeviceAndPlatform(deviceActive.getDevice(),
- deviceActive.getPlatform());
- if (da == null) {
- deviceActive.setId(null);
+ DeviceActive da = deviceActiveMapper.selectByDeviceAndPlatform(deviceActive.getDevice(),
+ deviceActive.getPlatform());
+ if (da == null) {
+ deviceActive.setId(null);
+ if (deviceActive.getUpdateTime() == null)
deviceActive.setUpdateTime(new Date());
+ if (deviceActive.getCreateTime() == null)
deviceActive.setCreateTime(new Date());
- deviceActiveMapper.insertSelective(deviceActive);
- } else {
- DeviceActive updateDeviceActive = new DeviceActive();
- updateDeviceActive.setId(da.getId());
- updateDeviceActive.setUpdateTime(new Date());
- updateDeviceActive.setVersionCode(deviceActive.getVersionCode());
- deviceActiveMapper.updateByPrimaryKeySelective(updateDeviceActive);
+ if (!StringUtil.isNullOrEmpty(deviceActive.getDeviceToken())) {
+ deviceActive.setDeviceTokenMd5(StringUtil.Md5(deviceActive.getDeviceToken()));
}
- break;
- case DeviceActive.PLATFORM_IOS:
- // IOS鐨勮澶囨爣璇嗕负deviceToken
- if (StringUtil.isNullOrEmpty(deviceActive.getDeviceToken()))
- return;
- deviceActive.setDeviceTokenMd5(StringUtil.Md5(deviceActive.getDeviceToken()));
- DeviceActive da1 = deviceActiveMapper.selectByDeviceToeknMd5AndPlatform(deviceActive.getDeviceTokenMd5(),
+ deviceActiveMapper.insertSelective(deviceActive);
+ DouYinDeviceActiveCMQManager.getInstance().addDeviceActive(deviceActive.getDevice(),
deviceActive.getPlatform());
- if (da1 == null) {
- deviceActive.setId(null);
- deviceActive.setUpdateTime(new Date());
- deviceActive.setCreateTime(new Date());
- deviceActiveMapper.insertSelective(deviceActive);
- } else {
- DeviceActive updateDeviceActive = new DeviceActive();
- updateDeviceActive.setId(da1.getId());
- updateDeviceActive.setUpdateTime(new Date());
- updateDeviceActive.setVersionCode(deviceActive.getVersionCode());
- deviceActiveMapper.updateByPrimaryKeySelective(updateDeviceActive);
+ } 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()));
}
- break;
- default:
- return;
+ if (StringUtil.isNullOrEmpty(da.getMac()))
+ updateDeviceActive.setMac(deviceActive.getMac());
+
+ deviceActiveMapper.updateByPrimaryKeySelective(updateDeviceActive);
}
+
}
-
-
+
/**
*
- * @param device 璁惧鍙�
- * @param platform 骞冲彴绫诲瀷
+ * @param device
+ * 璁惧鍙�
+ * @param platform
+ * 骞冲彴绫诲瀷
* @return
*/
@Override
public DeviceActive getDeviceByDeviceAndPlatform(String device, String deviceToken, String platform) {
-
+
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