From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 一月 2020 12:06:27 +0800
Subject: [PATCH] 用户注册信息

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/PushController.java |   43 +++++++++++++++++++++++++++++++++++++++----
 1 files changed, 39 insertions(+), 4 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 c5bc5b2..9c055d3 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
@@ -18,10 +18,13 @@
 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.DeviceTokenXM;
 import com.yeshi.fanli.entity.push.PushGoods;
 import com.yeshi.fanli.entity.push.PushGoodsGroup;
 import com.yeshi.fanli.entity.push.PushGoodsRecord;
 import com.yeshi.fanli.entity.system.BusinessSystem;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
 import com.yeshi.fanli.exception.push.PushGoodsGroupException;
 import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
 import com.yeshi.fanli.service.inter.config.BusinessSystemService;
@@ -29,6 +32,8 @@
 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.DeviceTokenXMService;
 import com.yeshi.fanli.service.inter.push.IOSPushService;
 import com.yeshi.fanli.service.inter.push.PushGoodsGroupService;
 import com.yeshi.fanli.service.inter.push.PushGoodsRecordService;
@@ -81,9 +86,15 @@
 
 	@Resource(name = "taskExecutor")
 	private TaskExecutor executor;
-	
+
 	@Resource
 	private DeviceTokenOPPOService deviceTokenOPPOService;
+
+	@Resource
+	private DeviceTokenVIVOService deviceTokenVIVOService;
+
+	@Resource
+	private DeviceTokenXMService deviceTokenXMService;
 
 	@RequestMapping(value = "callback", method = RequestMethod.POST)
 	public void callback(AcceptData acceptData, String pushId, PrintWriter out) {
@@ -279,7 +290,7 @@
 								Integer.parseInt(acceptData.getVersion()));
 
 					} else {
-						String url = configService.get("push_goods_details");
+						String url = configService.get(ConfigKeyEnum.pushGoodsDetails.getKey());
 						if (url == null) {
 							url = "";
 						}
@@ -341,8 +352,6 @@
 		}
 	}
 
-	
-
 	@RequestMapping("registerOppo")
 	public void registerOppo(AcceptData acceptData, String registerId, Long uid, PrintWriter out) {
 		DeviceActive deviceActive = deviceActiveService.getFirstActiveInfo(acceptData.getDevice());
@@ -356,4 +365,30 @@
 		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(""));
+	}
+
+	@RequestMapping("registerXM")
+	public void registerXM(AcceptData acceptData, String regId, Long uid, PrintWriter out) {
+		DeviceActive deviceActive = deviceActiveService.getFirstActiveInfo(acceptData.getDevice());
+		if (deviceActive != null) {
+			DeviceTokenXM xm = new DeviceTokenXM();
+			xm.setDeviceActiveId(deviceActive.getId());
+			xm.setRegisterId(regId);
+			xm.setUid(uid);
+			deviceTokenXMService.addDeviceToken(xm);
+		}
+		out.print(JsonUtil.loadTrueResult(""));
+	}
+
 }

--
Gitblit v1.8.0