From 114685cc870d0e00dc157656ae9039f285d3f5f1 Mon Sep 17 00:00:00 2001 From: Administrator <Administrator@S0ZHK00LKCA6OYY> Date: 星期五, 30 十一月 2018 15:59:42 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceActiveServiceImpl.java | 25 +++++++++++++++++++++++++ 1 files changed, 25 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 353cace..ccbce8a 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 @@ -81,5 +81,30 @@ return; } } + + + /** + * + * @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); + + } else if ("ios".equalsIgnoreCase(platform)) { + + deviceActive = deviceActiveMapper.selectByDeviceToeknMd5AndPlatform(StringUtil.Md5(deviceToken), + DeviceActive.PLATFORM_IOS); + + } + + return deviceActive; + } } -- Gitblit v1.8.0