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/impl/push/DeviceTokenHWServiceImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 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 fce776c..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;
@@ -30,6 +31,7 @@
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);
--
Gitblit v1.8.0