From 9d35ba657fa5e3add766405d76e3ff8c4dcd4ad4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 04 七月 2020 15:38:00 +0800
Subject: [PATCH] 多系统兼容优化
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/PushInfoController.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushInfoController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushInfoController.java
index f277277..9e74716 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushInfoController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushInfoController.java
@@ -6,6 +6,7 @@
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.yeshi.utils.JsonUtil;
@@ -27,12 +28,9 @@
@RequestMapping("admin/new/api/v1/pushInfo")
public class PushInfoController {
-
@Resource
private PushInfoService pushInfoService;
-
-
/**
* 鏂板/淇敼
*
@@ -63,8 +61,8 @@
* @param out
*/
@RequestMapping(value = "query")
- public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer keyType,
- Integer state, String type, PrintWriter out) {
+ public void query(AdminAcceptData acceptData, String callback, Integer pageIndex, Integer pageSize, String key, Integer keyType,
+ Integer state, String type, PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
@@ -76,14 +74,14 @@
try {
- List<PushInfo> list = pushInfoService.listQuery((pageIndex-1) * pageSize, pageSize, key, keyType, state, type);
+ List<PushInfo> list = pushInfoService.listQuery((pageIndex-1) * pageSize, pageSize, key, keyType, state, type,acceptData.getSystem());
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
}
- long count = pushInfoService.countQuery(key, keyType, state, type);
+ long count = pushInfoService.countQuery(key, keyType, state, type,acceptData.getSystem());
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
@@ -139,7 +137,6 @@
/**
* 鎺ㄩ��
- * @param id 鎺ㄩ�乮d
* @param out
* @throws Exception
*/
--
Gitblit v1.8.0