From b99f5f5ac42b8346fade48ba7cd119ca85bfdab1 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期一, 03 十二月 2018 17:51:55 +0800
Subject: [PATCH] 推送 改为 推荐
---
fanli/src/main/java/com/yeshi/fanli/controller/client/PushController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 e24ab05..0454fef 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
@@ -210,8 +210,8 @@
* @param acceptData
* @param out
*/
- @RequestMapping(value = "/gethistory"/*, method = RequestMethod.POST*/)
- public void getHistory(AcceptData acceptData, String deviceToken, int page, PrintWriter out) {
+ @RequestMapping(value = "/gethistory", method = RequestMethod.POST)
+ public void getHistory(AcceptData acceptData, Long uid, String deviceToken, int page, PrintWriter out) {
long count = 0;
List<PushGoods> list = null;
@@ -224,11 +224,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();
@@ -277,7 +277,7 @@
JSONObject contentJson1 = new JSONObject();
contentJson1.put("color", fontColor1);
- contentJson1.put("content", "鏈鎺ㄩ�佸叡");
+ contentJson1.put("content", "鏈鎺ㄨ崘鍏�");
JSONObject contentJson2 = new JSONObject();
contentJson2.put("color", fontColor2);
--
Gitblit v1.8.0