From a980ade25b3dc1a7da482e37113f2935a2719c0b Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 05 十一月 2019 10:01:11 +0800
Subject: [PATCH] 红包表明修改

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/PushController.java |   34 +++++++++++++++++++++++++++++++---
 1 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/PushController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/PushController.java
index 6979936..14cf274 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/PushController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/PushController.java
@@ -17,6 +17,8 @@
 import com.yeshi.fanli.entity.common.JumpDetailV2;
 import com.yeshi.fanli.entity.goods.CommonGoods;
 import com.yeshi.fanli.entity.push.DeviceActive;
+import com.yeshi.fanli.entity.push.DeviceTokenOPPO;
+import com.yeshi.fanli.entity.push.DeviceTokenVIVO;
 import com.yeshi.fanli.entity.push.PushGoods;
 import com.yeshi.fanli.entity.push.PushGoodsGroup;
 import com.yeshi.fanli.entity.push.PushGoodsRecord;
@@ -27,6 +29,8 @@
 import com.yeshi.fanli.service.inter.config.ConfigService;
 import com.yeshi.fanli.service.inter.push.DeviceActiveService;
 import com.yeshi.fanli.service.inter.push.DeviceTokenHWService;
+import com.yeshi.fanli.service.inter.push.DeviceTokenOPPOService;
+import com.yeshi.fanli.service.inter.push.DeviceTokenVIVOService;
 import com.yeshi.fanli.service.inter.push.IOSPushService;
 import com.yeshi.fanli.service.inter.push.PushGoodsGroupService;
 import com.yeshi.fanli.service.inter.push.PushGoodsRecordService;
@@ -44,7 +48,6 @@
 @Controller
 @RequestMapping(value = "api/v1/push")
 public class PushController {
-
 	@Resource
 	private BusinessSystemService businessSystemService;
 
@@ -80,6 +83,12 @@
 
 	@Resource(name = "taskExecutor")
 	private TaskExecutor executor;
+
+	@Resource
+	private DeviceTokenOPPOService deviceTokenOPPOService;
+
+	@Resource
+	private DeviceTokenVIVOService deviceTokenVIVOService;
 
 	@RequestMapping(value = "callback", method = RequestMethod.POST)
 	public void callback(AcceptData acceptData, String pushId, PrintWriter out) {
@@ -339,8 +348,27 @@
 
 	@RequestMapping("registerOppo")
 	public void registerOppo(AcceptData acceptData, String registerId, Long uid, PrintWriter out) {
-		System.out.println(registerId);
-		System.out.println(uid);
+		DeviceActive deviceActive = deviceActiveService.getFirstActiveInfo(acceptData.getDevice());
+		if (deviceActive != null) {
+			DeviceTokenOPPO oppo = new DeviceTokenOPPO();
+			oppo.setDeviceActiveId(deviceActive.getId());
+			oppo.setRegisterId(registerId);
+			oppo.setUid(uid);
+			deviceTokenOPPOService.addDeviceTokenOPPO(oppo);
+		}
+		out.print(JsonUtil.loadTrueResult(""));
+	}
+
+	@RequestMapping("registerVivo")
+	public void registerVivo(AcceptData acceptData, String regId, Long uid, PrintWriter out) {
+		DeviceActive deviceActive = deviceActiveService.getFirstActiveInfo(acceptData.getDevice());
+		if (deviceActive != null) {
+			DeviceTokenVIVO vivo = new DeviceTokenVIVO();
+			vivo.setDeviceActiveId(deviceActive.getId());
+			vivo.setRegisterId(regId);
+			vivo.setUid(uid);
+			deviceTokenVIVOService.addDeviceTokenVIVO(vivo);
+		}
 		out.print(JsonUtil.loadTrueResult(""));
 	}
 

--
Gitblit v1.8.0