From 3d3a9b46b56ded968b1803456470b5ec31e43ce7 Mon Sep 17 00:00:00 2001
From: 喻健 <喻健@Admin>
Date: 星期五, 30 十一月 2018 14:10:42 +0800
Subject: [PATCH] 调整推送内容以及队员返回字段
---
fanli/src/main/java/com/yeshi/fanli/controller/client/PushController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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..1589e60 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();
--
Gitblit v1.8.0