From 88b54772dbcf5ecab1e2316e4e4626ac901b8908 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 22 一月 2019 15:58:24 +0800
Subject: [PATCH] 邀请码添加返回状态
---
fanli/src/main/java/com/yeshi/fanli/controller/client/PushController.java | 100 ++++++++++++++++++++------------------------------
1 files changed, 40 insertions(+), 60 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/PushController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/PushController.java
index 32a7c31..dda8ea9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/PushController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/PushController.java
@@ -6,9 +6,6 @@
import javax.annotation.Resource;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -17,14 +14,13 @@
import com.yeshi.fanli.entity.accept.AcceptData;
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.DeviceTokenIOS;
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.System;
import com.yeshi.fanli.exception.push.PushGoodsGroupException;
-import com.yeshi.fanli.goods.CommonGoods;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.config.SystemService;
@@ -39,6 +35,9 @@
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.factory.JumpDetailParamsFactory;
+
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
@Controller
@RequestMapping(value = "api/v1/push")
@@ -58,25 +57,25 @@
@Resource
private DeviceActiveService deviceActiveService;
-
+
@Resource
private PushService pushService;
-
+
@Resource
private PushGoodsService PushGoodsService;
-
+
@Resource
private PushGoodsGroupService pushGoodsGroupService;
-
+
@Resource
private PushGoodsRecordService pushGoodsRecordService;
-
+
@Resource
private JumpDetailV2Service jumpDetailV2Service;
-
+
@Resource
private ConfigService configService;
-
+
@Resource(name = "taskExecutor")
private TaskExecutor executor;
@@ -111,16 +110,10 @@
da.setDeviceToken(deviceToken);
da.setPlatform(DeviceActive.PLATFORM_IOS);
da.setVersionCode(Integer.parseInt(acceptData.getVersion()));
+ da.setDevice(acceptData.getDevice());
deviceActiveService.addDeviceActive(da);
-
- DeviceTokenIOS deviceTokenIOS = iosPushService.getDeviceTokenByDeviceToken(deviceToken);
- if (deviceTokenIOS == null)
- iosPushService.addDeviceToken(null, Integer.parseInt(acceptData.getVersion()), deviceToken,
- acceptData.getDevice());
- else {
- deviceTokenIOS.setDevice(acceptData.getDevice());
- iosPushService.updateDeviceToken(deviceTokenIOS);
- }
+ iosPushService.addDeviceToken(null, Integer.parseInt(acceptData.getVersion()), deviceToken,
+ acceptData.getDevice());
out.print(JsonUtil.loadTrue(0, null, "鎴愬姛"));
}
}
@@ -141,19 +134,11 @@
da.setDeviceToken(deviceToken);
da.setPlatform(DeviceActive.PLATFORM_IOS);
da.setVersionCode(Integer.parseInt(acceptData.getVersion()));
+ da.setDevice(acceptData.getDevice());
deviceActiveService.addDeviceActive(da);
// 娣诲姞token
- DeviceTokenIOS deviceTokenIOS = iosPushService.getDeviceTokenByDeviceToken(deviceToken);
- if (deviceTokenIOS != null) {
- deviceTokenIOS.setUid(uid);
- deviceTokenIOS.setDevice(acceptData.getDevice());
- deviceTokenIOS.setVersion(Integer.parseInt(acceptData.getVersion()));
- iosPushService.updateDeviceToken(deviceTokenIOS);
- } else {
- iosPushService.addDeviceToken(uid, Integer.parseInt(acceptData.getVersion()), deviceToken,
- acceptData.getDevice());
- }
- out.print(JsonUtil.loadTrueResult(""));
+ iosPushService.addDeviceToken(uid, Integer.parseInt(acceptData.getVersion()), deviceToken,
+ acceptData.getDevice());
}
}
@@ -165,12 +150,8 @@
*/
@RequestMapping(value = "/unBind", method = RequestMethod.POST)
public void unBind(AcceptData acceptData, String deviceToken, PrintWriter out) {
- if (!StringUtil.isNullOrEmpty(deviceToken)) {
- DeviceTokenIOS deviceTokenIOS = iosPushService.getDeviceTokenByDeviceToken(deviceToken);
- if (deviceTokenIOS != null) {
- deviceTokenIOS.setUid(null);
- iosPushService.updateDeviceToken(deviceTokenIOS);
- }
+ if (!StringUtil.isNullOrEmpty(acceptData.getDevice())) {
+ iosPushService.unBindUidAndDevice(acceptData.getDevice());
out.print(JsonUtil.loadTrue(0, null, "瑙ｇ粦鎴愬姛"));
}
}
@@ -202,8 +183,7 @@
deviceTokenHWService.unBindDeviceToken(acceptData.getDevice());
out.print(JsonUtil.loadTrueResult("鎴愬姛"));
}
-
-
+
/**
* 瑙ｇ粦鎺ㄩ��
*
@@ -211,7 +191,7 @@
* @param out
*/
@RequestMapping(value = "/gethistory", method = RequestMethod.POST)
- public void getHistory(AcceptData acceptData, String deviceToken, int page, PrintWriter out) {
+ public void getHistory(AcceptData acceptData, Long uid, String deviceToken, int page, PrintWriter out) {
long count = 0;
List<PushGoods> list = null;
@@ -224,11 +204,11 @@
// 璁惧娉ㄥ唽鏃堕棿
Date createTime = deviceActive.getCreateTime();
- count = PushGoodsService.countHistoryByPushTime(createTime);
+ count = PushGoodsService.countHistoryByPushTime(uid, createTime);
int pageSize = Constant.PAGE_SIZE;
- list = PushGoodsService.listHistoryByPushTime((page - 1) * pageSize, pageSize, createTime);
+ list = PushGoodsService.listHistoryByPushTime((page - 1) * pageSize, pageSize, uid, createTime);
if (list != null && list.size() > 0) {
for (PushGoods pushGoods : list) {
JSONObject result = new JSONObject();
@@ -269,25 +249,25 @@
result.put("picture", picture);
- String fontColor1 = "#888888";
- String fontColor2 = "#F14242";
+ String fontColor1 = "#666666";
+ String fontColor2 = "#E5005C";
JSONArray array = new JSONArray();
- JSONArray array1 = new JSONArray();
- array1.add(fontColor1);
- array1.add("鏈鎺ㄩ�佸叡");
+ JSONObject contentJson1 = new JSONObject();
+ contentJson1.put("color", fontColor1);
+ contentJson1.put("content", "鏈鎺ㄨ崘鍏�");
- JSONArray array2 = new JSONArray();
- array2.add(fontColor2);
- array2.add(totalgoods);
+ JSONObject contentJson2 = new JSONObject();
+ contentJson2.put("color", fontColor2);
+ contentJson2.put("content", totalgoods);
- JSONArray array3 = new JSONArray();
- array3.add(fontColor1);
- array3.add("涓晢鍝�");
+ JSONObject contentJson3 = new JSONObject();
+ contentJson3.put("color", fontColor1);
+ contentJson3.put("content", "涓晢鍝�");
- array.add(array1);
- array.add(array2);
- array.add(array3);
+ array.add(contentJson1);
+ array.add(contentJson2);
+ array.add(contentJson3);
result.put("totalwords", array);
@@ -338,8 +318,8 @@
Long deviceId = deviceActive.getId();
for (PushGoods pushGoods : listPush) {
- List<PushGoodsRecord> listRecord = pushGoodsRecordService.listByPushIdAndDeviceId(
- pushGoods.getId(), deviceId);
+ List<PushGoodsRecord> listRecord = pushGoodsRecordService
+ .listByPushIdAndDeviceId(pushGoods.getId(), deviceId);
if (listRecord != null && listRecord.size() > 0) {
continue; // 宸茶璁板綍
}
@@ -360,5 +340,5 @@
});
}
}
-
+
}
--
Gitblit v1.8.0