yujian
2019-03-15 585a05bef033fa4b6a02b5d3afd3b305b3914abb
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 推送id
    * @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("推送成功"));