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/inter/push/DeviceTokenHWService.java |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/push/DeviceTokenHWService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/push/DeviceTokenHWService.java
index 1fd41df..0f5e9f7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/push/DeviceTokenHWService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/push/DeviceTokenHWService.java
@@ -18,9 +18,10 @@
 	 * @param page
 	 * @return
 	 */
-	List<DeviceTokenHW> getDeviceTokenList(int page, int pageSize);
 
-	Long getDeviceTokenCount();
+	List<DeviceTokenHW> getDeviceTokenList(int page, int pageSize, List<Integer> versionList);
+
+	Long countDeviceToken(List<Integer> versionList);
 
 	/**
 	 * 娣诲姞鏁版嵁
@@ -30,7 +31,7 @@
 	 * @param uid
 	 * @param version
 	 */
-	void addDeviceToken(String token, String device, Long uid,int version);
+	void addDeviceToken(String token, String device, Long uid, int version);
 
 	/**
 	 * 鑾峰彇鏌愪釜鐢ㄦ埛鐨刣eviceToken
@@ -41,6 +42,15 @@
 	List<DeviceTokenHW> getDeviceTokenByUid(Long uid);
 
 	/**
+	 * 鏍规嵁鐗堟湰鑾峰彇deviceToken
+	 * 
+	 * @param uid
+	 * @param versionList
+	 * @return
+	 */
+	List<DeviceTokenHW> getDeviceTokenByUid(Long uid, List<Integer> versionList);
+
+	/**
 	 * 瑙ｇ粦鐢ㄦ埛token
 	 * 
 	 * @param uid

--
Gitblit v1.8.0