From 286e7a9b9632087798fbcd7b0a63b12d2a458235 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期四, 22 十一月 2018 10:00:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/PushController.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 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 d82cf43..19004ba 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
@@ -7,16 +7,18 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
+import org.yeshi.utils.JsonUtil;
import com.yeshi.fanli.entity.accept.AcceptData;
+import com.yeshi.fanli.entity.push.DeviceActive;
import com.yeshi.fanli.entity.push.DeviceTokenIOS;
import com.yeshi.fanli.entity.system.System;
import com.yeshi.fanli.service.inter.config.SystemService;
+import com.yeshi.fanli.service.inter.push.DeviceActiveService;
import com.yeshi.fanli.service.inter.push.DeviceTokenHWService;
import com.yeshi.fanli.service.inter.push.IOSPushService;
import com.yeshi.fanli.service.inter.push.PushRecordService;
import com.yeshi.fanli.util.StringUtil;
-import org.yeshi.utils.JsonUtil;
@Controller
@RequestMapping(value = "api/v1/push")
@@ -33,6 +35,9 @@
@Resource
private DeviceTokenHWService deviceTokenHWService;
+
+ @Resource
+ private DeviceActiveService deviceActiveService;
@RequestMapping(value = "callback", method = RequestMethod.POST)
public void callback(AcceptData acceptData, String pushId, PrintWriter out) {
@@ -60,6 +65,13 @@
@RequestMapping(value = "/insertDeviceToken", method = RequestMethod.POST)
public void insertIOSDeviceToken(AcceptData acceptData, String deviceToken, PrintWriter out) {
if (!StringUtil.isNullOrEmpty(acceptData.getDevice()) && !StringUtil.isNullOrEmpty(deviceToken)) {
+ // 娣诲姞璁惧娲昏穬璁板綍
+ DeviceActive da = new DeviceActive();
+ da.setDeviceToken(deviceToken);
+ da.setPlatform(DeviceActive.PLATFORM_IOS);
+ da.setVersionCode(Integer.parseInt(acceptData.getVersion()));
+ deviceActiveService.addDeviceActive(da);
+
DeviceTokenIOS deviceTokenIOS = iosPushService.getDeviceTokenByDeviceToken(deviceToken);
if (deviceTokenIOS == null)
iosPushService.addDeviceToken(null, Integer.parseInt(acceptData.getVersion()), deviceToken,
@@ -83,6 +95,13 @@
@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)) {
+ // 娣诲姞璁惧娲昏穬璁板綍
+ DeviceActive da = new DeviceActive();
+ da.setDeviceToken(deviceToken);
+ da.setPlatform(DeviceActive.PLATFORM_IOS);
+ da.setVersionCode(Integer.parseInt(acceptData.getVersion()));
+ deviceActiveService.addDeviceActive(da);
+ // 娣诲姞token
DeviceTokenIOS deviceTokenIOS = iosPushService.getDeviceTokenByDeviceToken(acceptData.getDevice());
if (deviceTokenIOS != null) {
deviceTokenIOS.setUid(uid);
--
Gitblit v1.8.0