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/SystemClientController.java | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 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 044e7b5..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
@@ -13,12 +13,14 @@
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.ThreadUtil;
@@ -39,6 +41,9 @@
@Resource
private ConfigService configService;
+
+ @Resource
+ private DeviceActiveService deviceActiveService;
@RequestMapping("getsystemclientparams")
public void getSystemClientParams(AcceptData acceptData, PrintWriter out) {
@@ -71,17 +76,23 @@
data.put("count", list.size());
data.put("systemClientParamsList", gson.toJson(list));
out.print(JsonUtil.loadTrueResult(data));
-// ThreadUtil.run(new Runnable() {
-// @Override
-// public void run() {
-// try {
-// if ("ios".equalsIgnoreCase(acceptData.getPlatform()))
-// iosPushService.addDeviceToken(null, Integer.parseInt(acceptData.getVersion()), null,
-// acceptData.getDevice());
-// } catch (Exception e) {
-// }
-// }
-// });
+ ThreadUtil.run(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ // 瀹夊崜骞冲彴娣诲姞璁惧娲昏穬璁板綍
+ 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) {
+ }
+ }
+ });
return;
}
--
Gitblit v1.8.0