From 01d627f3c67e2bc5c28b2dd5e23983ddcf7a08f3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 10 十二月 2018 12:13:20 +0800
Subject: [PATCH] IOS唯一设备标识修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/push/IOSPushServiceImpl.java | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/IOSPushServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/IOSPushServiceImpl.java
index 1b8730b..17905a7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/IOSPushServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/IOSPushServiceImpl.java
@@ -6,8 +6,6 @@
import javax.annotation.Resource;
-import net.sf.json.JSONObject;
-
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -21,14 +19,14 @@
import com.yeshi.fanli.entity.xinge.MessageInfo;
import com.yeshi.fanli.entity.xinge.PushRecord;
import com.yeshi.fanli.exception.PushException;
-import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.log.PushLogHelper;
import com.yeshi.fanli.service.inter.push.IOSPushService;
import com.yeshi.fanli.util.CMQManager;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.push.IOSPushUtil;
+
+import net.sf.json.JSONObject;
@Service
public class IOSPushServiceImpl implements IOSPushService {
@@ -241,7 +239,7 @@
@Override
public void addDeviceToken(Long uid, int version, String deviceToken, String device) {
// 濡傛灉device涓虹┖灏辫繑鍥�
- if (StringUtil.isNullOrEmpty(device))
+ if (StringUtil.isNullOrEmpty(device) || StringUtil.isNullOrEmpty(deviceToken))
return;
// 鍒ゆ柇device鏄惁瀛樺湪
@@ -252,9 +250,18 @@
deviceTokenIos.setUpdateTime(new Date());
deviceTokenIos.setDevice(device);
deviceTokenIos.setDeviceToken(deviceToken);
+ deviceTokenIos.setDeviceTokenMd5(StringUtil.Md5(deviceToken));
deviceTokenIos.setUid(uid);
deviceTokenIos.setVersion(version);
deviceTokenIOSMapper.insertSelective(deviceTokenIos);
+ } else {// 鏇存柊devicetoken
+ DeviceTokenIOS updateDeviceTokenIOS = new DeviceTokenIOS();
+ updateDeviceTokenIOS.setId(deviceTokenIos.getId());
+ updateDeviceTokenIOS.setDeviceToken(deviceToken);
+ updateDeviceTokenIOS.setDeviceTokenMd5(StringUtil.Md5(deviceToken));
+ updateDeviceTokenIOS.setUid(uid);
+ updateDeviceTokenIOS.setUpdateTime(new Date());
+ deviceTokenIOSMapper.updateByPrimaryKeySelective(updateDeviceTokenIOS);
}
}
@@ -288,8 +295,8 @@
}
@Override
- public DeviceTokenIOS getDeviceTokenByDevice(String device) {
- return deviceTokenIOSMapper.selectByDevice(device);
+ public DeviceTokenIOS getDeviceTokenByDeviceToken(String deviceToken) {
+ return deviceTokenIOSMapper.selectByDeviceToken(deviceToken);
}
/**
@@ -468,4 +475,16 @@
pushQueueRecordMapper.updateByPrimaryKeySelective(pushQueueRecord);
}
+ @Override
+ public void unBindUidAndDevice(String device) {
+ if (StringUtil.isNullOrEmpty(device))
+ return;
+ DeviceTokenIOS deviceTokenIOS = deviceTokenIOSMapper.selectByDevice(device);
+ if (device != null) {
+ deviceTokenIOS.setUpdateTime(new Date());
+ deviceTokenIOS.setUid(null);
+ deviceTokenIOSMapper.updateByPrimaryKey(deviceTokenIOS);
+ }
+ }
+
}
--
Gitblit v1.8.0