From 29bb04f5981562726febc3538dbb5bc394017273 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 09 五月 2020 21:41:47 +0800
Subject: [PATCH] 2.1.1相关功能提交
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/PushController.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 56 insertions(+), 2 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 17887b7..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
@@ -17,16 +17,23 @@
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.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;
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.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;
@@ -44,7 +51,6 @@
@Controller
@RequestMapping(value = "api/v1/push")
public class PushController {
-
@Resource
private BusinessSystemService businessSystemService;
@@ -80,6 +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) {
@@ -275,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 = "";
}
@@ -337,4 +352,43 @@
}
}
+ @RequestMapping("registerOppo")
+ public void registerOppo(AcceptData acceptData, String registerId, Long uid, PrintWriter out) {
+ 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(""));
+ }
+
+ @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