From 944926d24e6fefa3b052a5e1352e90fd60795ed0 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 09 八月 2019 15:58:41 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceTokenHWServiceImpl.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceTokenHWServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceTokenHWServiceImpl.java
index 49d8ca9..fce776c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceTokenHWServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceTokenHWServiceImpl.java
@@ -20,18 +20,18 @@
private DeviceTokenHWMapper deviceTokenHWMapper;
@Override
- public List<DeviceTokenHW> getDeviceTokenList(int page, int pageSize) {
- return deviceTokenHWMapper.selectList((page - 1) * pageSize, pageSize);
+ public List<DeviceTokenHW> getDeviceTokenList(int page, int pageSize, List<Integer> versionList) {
+ return deviceTokenHWMapper.selectList((page - 1) * pageSize, pageSize, versionList);
}
@Override
- public Long getDeviceTokenCount() {
- Long count = deviceTokenHWMapper.selectCount();
+ public Long countDeviceToken(List<Integer> versionList) {
+ Long count = deviceTokenHWMapper.selectCount(versionList);
return count == null ? 0 : count;
}
@Override
- public void addDeviceToken(String token, String device, Long uid) {
+ public void addDeviceToken(String token, String device, Long uid, int version) {
if (StringUtil.isNullOrEmpty(device))
return;
//
@@ -44,6 +44,7 @@
deviceTokenHW.setDevice(device);
deviceTokenHW.setDeviceToken(token);
deviceTokenHW.setDeviceTokenMd5(StringUtil.Md5(token));
+ deviceTokenHW.setVersion(version);
deviceTokenHW.setUpdateTime(new Date());
if (uid != null)
deviceTokenHW.setUser(new UserInfo(uid));
@@ -55,6 +56,7 @@
if (!StringUtil.isNullOrEmpty(token)) {
update.setDeviceToken(token);
update.setDeviceTokenMd5(StringUtil.Md5(token));
+ update.setVersion(version);
}
update.setUpdateTime(new Date());
if (uid != null)
@@ -68,7 +70,7 @@
public List<DeviceTokenHW> getDeviceTokenByUid(Long uid) {
if (uid == null)
return null;
- return deviceTokenHWMapper.selectByUid(uid);
+ return deviceTokenHWMapper.selectByUid(uid, null);
}
@Override
@@ -88,4 +90,15 @@
deviceTokenHWMapper.bindUidByDevice(uid, device);
}
+ @Override
+ public List<DeviceTokenHW> getDeviceTokenByUid(Long uid, List<Integer> versionList) {
+ if (uid == null)
+ return null;
+
+ if (versionList != null && versionList.size() == 0)
+ return null;
+
+ return deviceTokenHWMapper.selectByUid(uid, versionList);
+ }
+
}
--
Gitblit v1.8.0