From b669c03260b4445350089df1014f46970ae21bde Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@S0ZHK00LKCA6OYY>
Date: 星期二, 20 十一月 2018 17:21:23 +0800
Subject: [PATCH] IOS推送优化

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/PushController.java |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/PushController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/PushController.java
index 29101da..d82cf43 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/PushController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/PushController.java
@@ -60,12 +60,12 @@
 	@RequestMapping(value = "/insertDeviceToken", method = RequestMethod.POST)
 	public void insertIOSDeviceToken(AcceptData acceptData, String deviceToken, PrintWriter out) {
 		if (!StringUtil.isNullOrEmpty(acceptData.getDevice()) && !StringUtil.isNullOrEmpty(deviceToken)) {
-			DeviceTokenIOS deviceTokenIOS = iosPushService.getDeviceTokenByDevice(acceptData.getDevice());
+			DeviceTokenIOS deviceTokenIOS = iosPushService.getDeviceTokenByDeviceToken(deviceToken);
 			if (deviceTokenIOS == null)
 				iosPushService.addDeviceToken(null, Integer.parseInt(acceptData.getVersion()), deviceToken,
 						acceptData.getDevice());
 			else {
-				deviceTokenIOS.setDeviceToken(deviceToken);
+				deviceTokenIOS.setDevice(acceptData.getDevice());
 				iosPushService.updateDeviceToken(deviceTokenIOS);
 			}
 			out.print(JsonUtil.loadTrue(0, null, "鎴愬姛"));
@@ -80,21 +80,20 @@
 	 * @param deviceToken
 	 */
 
-	// 浼犱竴涓猟evice 濡傛灉瀛樺湪device 鏍规嵁device鎵цupdate鎿嶄綔 锛� 濡傛灉涓嶅瓨鍦� 閮芥墽琛宨nsert鎿嶄綔涓変釜鍙傛暟
 	@RequestMapping(value = "/uidBindDeviceToken", method = RequestMethod.POST)
 	public void uidBindIOSDeviceToken(AcceptData acceptData, Long uid, String deviceToken, PrintWriter out) {
 		if (uid != null && uid != 0 && !StringUtil.isNullOrEmpty(deviceToken)) {
-			DeviceTokenIOS deviceTokenIOS = iosPushService.getDeviceTokenByDevice(acceptData.getDevice());
+			DeviceTokenIOS deviceTokenIOS = iosPushService.getDeviceTokenByDeviceToken(acceptData.getDevice());
 			if (deviceTokenIOS != null) {
-				if (!StringUtil.isNullOrEmpty(deviceToken))
-					deviceTokenIOS.setDeviceToken(deviceToken);
 				deviceTokenIOS.setUid(uid);
+				deviceTokenIOS.setDevice(acceptData.getDevice());
 				deviceTokenIOS.setVersion(Integer.parseInt(acceptData.getVersion()));
 				iosPushService.updateDeviceToken(deviceTokenIOS);
 			} else {
 				iosPushService.addDeviceToken(uid, Integer.parseInt(acceptData.getVersion()), deviceToken,
 						acceptData.getDevice());
 			}
+			out.print(JsonUtil.loadTrueResult(""));
 		}
 	}
 
@@ -106,8 +105,8 @@
 	 */
 	@RequestMapping(value = "/unBind", method = RequestMethod.POST)
 	public void unBind(AcceptData acceptData, String deviceToken, PrintWriter out) {
-		if (deviceToken != null && !"".equals(deviceToken)) {
-			DeviceTokenIOS deviceTokenIOS = iosPushService.getDeviceTokenByDevice(acceptData.getDevice());
+		if (!StringUtil.isNullOrEmpty(deviceToken)) {
+			DeviceTokenIOS deviceTokenIOS = iosPushService.getDeviceTokenByDeviceToken(deviceToken);
 			if (deviceTokenIOS != null) {
 				deviceTokenIOS.setUid(null);
 				iosPushService.updateDeviceToken(deviceTokenIOS);

--
Gitblit v1.8.0