From be67478cae6bf9308f15949a21e7d0a57a3f0ecb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 16 七月 2020 15:37:31 +0800
Subject: [PATCH] dubbo集成修改
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/PushRecordAdminController.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushRecordAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushRecordAdminController.java
index 60b0dc0..5d5d89c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushRecordAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushRecordAdminController.java
@@ -5,16 +5,15 @@
import javax.annotation.Resource;
+import com.yeshi.fanli.entity.accept.AdminAcceptData;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
+import org.yeshi.utils.JsonUtil;
import com.yeshi.fanli.entity.xinge.PushRecord;
import com.yeshi.fanli.service.inter.push.PushRecordService;
-import com.yeshi.fanli.tag.PageEntity;
+import com.yeshi.common.entity.PageEntity;
import com.yeshi.fanli.util.Constant;
-
-import org.yeshi.utils.JsonUtil;
import net.sf.json.JSONObject;
@@ -36,7 +35,7 @@
* @param out
*/
@RequestMapping(value = "getNewPushRecordList")
- public void getNewPushRecordList(String callback, String key, Integer type, Integer pageIndex, PrintWriter out){
+ public void getNewPushRecordList(AdminAcceptData acceptData, String callback, String key, Integer type, Integer pageIndex, PrintWriter out){
try {
if (pageIndex == null || pageIndex < 0){
@@ -47,15 +46,15 @@
type = 0;
}
- List<PushRecord> list = pushRecordService.getPushRecordList(key, type, pageIndex);
+ int pageSize = Constant.PAGE_SIZE;
+
+ List<PushRecord> list = pushRecordService.getPushRecordList((pageIndex-1) * pageSize, pageSize, key, type);
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏇村鏁版嵁"));
return;
}
- int pageSize = Constant.PAGE_SIZE;
-
- int count = pushRecordService.getCount(key, type, pageIndex);
+ long count = pushRecordService.getCount(key, type);
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
--
Gitblit v1.8.0