From db88b87df461820152d68d3d55a28f30c2da83e6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 20 九月 2019 17:54:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceActiveServiceImpl.java | 7 +++++++
1 files changed, 7 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 a331254..d645020 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
@@ -52,6 +52,8 @@
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()));
@@ -91,4 +93,9 @@
return deviceActiveMapper.selectFirst(device);
}
+ @Override
+ public DeviceActive getFirstActiveInfoByImei(String imei) {
+ return deviceActiveMapper.selectFirstByImei(imei);
+ }
+
}
--
Gitblit v1.8.0