From 651a15c78f668bef3859d9ed1bb7ad0b669d3600 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 03 七月 2020 17:52:07 +0800
Subject: [PATCH] 多APP优化
---
fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceActiveServiceImpl.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 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 a331254..5bedb40 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,7 +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;
+import com.yeshi.fanli.util.mq.cmq.DouYinDeviceActiveCMQManager;
@Service
public class DeviceActiveServiceImpl implements DeviceActiveService {
@@ -38,8 +38,10 @@
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()));
}
@@ -52,10 +54,16 @@
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);
}
@@ -91,4 +99,9 @@
return deviceActiveMapper.selectFirst(device);
}
+ @Override
+ public DeviceActive getFirstActiveInfoByImei(String imei) {
+ return deviceActiveMapper.selectFirstByImei(imei);
+ }
+
}
--
Gitblit v1.8.0