From 744594ef1a2f530fc3e86ea9dc48b62247f79420 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 19 五月 2020 17:13:23 +0800
Subject: [PATCH] 饿了么绘图,添加口碑

---
 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 60a29ef..ef76ef9 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
@@ -6,6 +6,7 @@
 import javax.annotation.Resource;
 
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import com.yeshi.fanli.dao.mybatis.push.DeviceTokenHWMapper;
 import com.yeshi.fanli.entity.bus.user.UserInfo;
@@ -20,16 +21,17 @@
 	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;
 	}
 
+	@Transactional
 	@Override
 	public void addDeviceToken(String token, String device, Long uid, int version) {
 		if (StringUtil.isNullOrEmpty(device))
@@ -38,7 +40,7 @@
 		if (uid != null && uid == 0)
 			uid = null;
 
-		List<DeviceTokenHW> list = deviceTokenHWMapper.selectByDevice(device);
+		List<DeviceTokenHW> list = deviceTokenHWMapper.selectByDeviceForUpdate(device);
 		if (list == null || list.size() == 0) {
 			DeviceTokenHW deviceTokenHW = new DeviceTokenHW();
 			deviceTokenHW.setDevice(device);
@@ -70,7 +72,7 @@
 	public List<DeviceTokenHW> getDeviceTokenByUid(Long uid) {
 		if (uid == null)
 			return null;
-		return deviceTokenHWMapper.selectByUid(uid);
+		return deviceTokenHWMapper.selectByUid(uid, null);
 	}
 
 	@Override
@@ -90,4 +92,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