From eec7e789a87863c25d92c10ad5dfc22ad80c448d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 七月 2020 12:36:48 +0800
Subject: [PATCH] 系统区分BUG修复
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/PushInfoController.java | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 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..84c13ab 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;
-
-
/**
* 鏂板/淇敼
*
@@ -40,7 +38,7 @@
* @param out
*/
@RequestMapping(value = "save")
- public void save(String callback, PushInfo pushInfo,PrintWriter out) {
+ public void save(AdminAcceptData acceptData,String callback, PushInfo pushInfo,PrintWriter out) {
try {
pushInfoService.save(pushInfo);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
@@ -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);
@@ -112,7 +110,7 @@
* @param out
*/
@RequestMapping(value = "delete")
- public void delete(String callback, String idArray, PrintWriter out) {
+ public void delete(AdminAcceptData acceptData,String callback, String idArray, PrintWriter out) {
try {
if (StringUtil.isNullOrEmpty(idArray)) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨鎿嶄綔鐨勬暟鎹�"));
@@ -139,12 +137,11 @@
/**
* 鎺ㄩ��
- * @param id 鎺ㄩ�乮d
* @param out
* @throws Exception
*/
@RequestMapping(value = "push")
- public void push(String callback, String idArray, PrintWriter out) throws Exception {
+ public void push(AdminAcceptData acceptData,String callback, String idArray, PrintWriter out) throws Exception {
if (idArray == null || idArray.trim().length() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("浼犻�掑弬鏁颁笉鑳戒负绌�"));
--
Gitblit v1.8.0