From 01955bc3f6e6eec6d82a5a3848efde1fa6cc8137 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 30 九月 2020 17:29:26 +0800
Subject: [PATCH] 云发单优化
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/PushGoodsController.java | 27 +++++++++++----------------
1 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushGoodsController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushGoodsController.java
index dd930ae..dcfca1c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushGoodsController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushGoodsController.java
@@ -9,6 +9,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;
@@ -19,13 +20,13 @@
import com.yeshi.fanli.entity.goods.CommonGoods;
import com.yeshi.fanli.entity.push.PushGoods;
import com.yeshi.fanli.entity.push.PushGoodsGroup;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.exception.push.PushException;
import com.yeshi.fanli.exception.push.PushGoodsException;
import com.yeshi.fanli.service.AdminUserService;
import com.yeshi.fanli.service.inter.push.PushGoodsGroupService;
import com.yeshi.fanli.service.inter.push.PushGoodsService;
-import com.yeshi.fanli.tag.PageEntity;
+import com.yeshi.common.entity.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
@@ -53,7 +54,7 @@
* @param out
*/
@RequestMapping(value = "save")
- public void save(String callback, PushGoods pushGoods, String idArray, String arrayIOS,
+ public void save(AdminAcceptData acceptData,String callback, PushGoods pushGoods, String idArray, String arrayIOS,
String arrayAndroid, PrintWriter out) {
try {
@@ -95,7 +96,7 @@
* @param out
*/
@RequestMapping(value = "saveInfo")
- public void saveInfo(String callback, PushGoods pushGoods, String arrayIOS, String arrayAndroid, PrintWriter out) {
+ public void saveInfo(AdminAcceptData acceptData,String callback, PushGoods pushGoods, String arrayIOS, String arrayAndroid, PrintWriter out) {
try {
// 鐗堟湰澶勭悊
convertVersion(pushGoods, arrayIOS, arrayAndroid);
@@ -119,7 +120,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)) {
@@ -157,7 +158,7 @@
* @param out
*/
@RequestMapping(value = "getPushInfo")
- public void getPushInfo(String callback, Long id, PrintWriter out) {
+ public void getPushInfo(AdminAcceptData acceptData,String callback, Long id, PrintWriter out) {
if (id == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍙傛暟涓嶈兘涓虹┖"));
@@ -226,7 +227,7 @@
* @param out
*/
@RequestMapping(value = "query")
- public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer state, PrintWriter out) {
+ public void query(AdminAcceptData acceptData, String callback, Integer pageIndex, Integer pageSize, String key, Integer state, PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
@@ -238,7 +239,7 @@
try {
- List<PushGoods> list = pushGoodsService.listQuery((pageIndex - 1) * pageSize, pageSize, key, state);
+ List<PushGoods> list = pushGoodsService.listQuery((pageIndex - 1) * pageSize, pageSize, key, state,acceptData.getSystem());
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
@@ -261,7 +262,7 @@
convertVersionList(pushGoods);
}
- long count = pushGoodsService.countQuery(key, state);
+ long count = pushGoodsService.countQuery(key, state,acceptData.getSystem());
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
@@ -286,23 +287,19 @@
/**
* 鍟嗗搧鎺ㄩ��
*
- * @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("浼犻�掑弬鏁颁笉鑳戒负绌�"));
return;
}
try {
-
Gson gson = new Gson();
List<Long> list = gson.fromJson(idArray, new TypeToken<ArrayList<Long>>() {}.getType());
-
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("浼犻�掑弬鏁颁笉鑳戒负绌�"));
return;
@@ -311,9 +308,7 @@
for (Long id: list) {
pushGoodsService.handPush(id);
}
-
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎺ㄩ�佹垚鍔�"));
-
} catch (PushException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
} catch (PushGoodsException e) {
--
Gitblit v1.8.0