From 2019c99e41c1d5a58afb00c4291f7e8451004ddd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 19 三月 2019 16:23:47 +0800
Subject: [PATCH] 删除SpreadUserImgDao
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/PushGoodsController.java | 39 ++++++++++++++++++---------------------
1 files changed, 18 insertions(+), 21 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 82b4996..ae5d46d 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
@@ -5,7 +5,6 @@
import java.util.List;
import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
import net.sf.json.JSONObject;
@@ -16,20 +15,18 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
-import com.yeshi.fanli.entity.common.AdminUser;
+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.fanli.exception.PushException;
import com.yeshi.fanli.exception.push.PushGoodsException;
-import com.yeshi.fanli.goods.CommonGoods;
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.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.annotation.RequestNoLogin;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
@Controller
@@ -52,20 +49,9 @@
* @param special
* @param out
*/
- @RequestNoLogin()
@RequestMapping(value = "save")
- public void save(String callback, PushGoods pushGoods, Long editorUid, String idArray, HttpServletResponse response,
- PrintWriter out) {
-
- response.setHeader("Access-Control-Allow-Origin", "*");
- response.setHeader("Access-Control-Allow-Methods", "*");
-
- AdminUser admin = adminUserService.selectByPrimaryKey(editorUid);
- if (admin == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔鐢ㄦ埛楠岃瘉澶辫触"));
- return;
- }
-
+ public void save(String callback, PushGoods pushGoods, String idArray, PrintWriter out) {
+
try {
String alertTitle = pushGoods.getAlertTitle();
@@ -240,22 +226,33 @@
/**
- * 缃戦〉鎺ㄩ��
+ * 鍟嗗搧鎺ㄩ��
*
* @param id 鎺ㄩ�乮d
* @param out
* @throws Exception
*/
@RequestMapping(value = "push")
- public void push(String callback, Long id, PrintWriter out) throws Exception {
+ public void push(String callback, String idArray, PrintWriter out) throws Exception {
- if (id == null) {
+ if (idArray == null || idArray.trim().length() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("浼犻�掑弬鏁颁笉鑳戒负绌�"));
return;
}
try {
- pushGoodsService.executePush(id);
+
+ 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;
+ }
+
+ for (Long id: list) {
+ pushGoodsService.executePush(id);
+ }
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎺ㄩ�佹垚鍔�"));
--
Gitblit v1.8.0