From 5d59c0ad6e82b6255cf38c3dba715395af1d60a7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 10 十二月 2018 14:37:15 +0800
Subject: [PATCH] 取消红包参数异常

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/SystemClientController.java |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/SystemClientController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/SystemClientController.java
index dba8d0c..91a8484 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/SystemClientController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/SystemClientController.java
@@ -8,20 +8,21 @@
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.yeshi.utils.JsonUtil;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.yeshi.fanli.entity.accept.AcceptData;
+import com.yeshi.fanli.entity.push.DeviceActive;
 import com.yeshi.fanli.entity.system.CustomerContent;
 import com.yeshi.fanli.entity.system.System;
 import com.yeshi.fanli.entity.system.SystemClientParams;
 import com.yeshi.fanli.service.inter.config.ConfigService;
 import com.yeshi.fanli.service.inter.config.SystemClientParamsService;
 import com.yeshi.fanli.service.inter.config.SystemService;
+import com.yeshi.fanli.service.inter.push.DeviceActiveService;
 import com.yeshi.fanli.service.inter.push.IOSPushService;
-import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.ThreadUtil;
-import org.yeshi.utils.JsonUtil;
 
 import net.sf.json.JSONObject;
 
@@ -40,6 +41,9 @@
 
 	@Resource
 	private ConfigService configService;
+
+	@Resource
+	private DeviceActiveService deviceActiveService;
 
 	@RequestMapping("getsystemclientparams")
 	public void getSystemClientParams(AcceptData acceptData, PrintWriter out) {
@@ -76,7 +80,15 @@
 			@Override
 			public void run() {
 				try {
-					iosPushService.addDeviceToken(null, null, acceptData.getDevice());
+					// 瀹夊崜骞冲彴娣诲姞璁惧娲昏穬璁板綍
+					if ("android".equalsIgnoreCase(acceptData.getPlatform())) {
+						DeviceActive da = new DeviceActive();
+						da.setDevice(acceptData.getDevice());
+						da.setPlatform(DeviceActive.PLATFORM_ANDROID);
+						da.setVersionCode(Integer.parseInt(acceptData.getVersion()));
+						deviceActiveService.addDeviceActive(da);
+					}
+
 				} catch (Exception e) {
 				}
 			}

--
Gitblit v1.8.0