Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/controller/admin/PushGoodsController.java

@@ -20,7 +20,7 @@
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.PushException;

import com.yeshi.fanli.exception.push.PushGoodsException;

import com.yeshi.fanli.service.AdminUserService;

import com.yeshi.fanli.service.inter.push.PushGoodsGroupService;

@@ -86,6 +86,31 @@
      }

   }



	
   /**

    * 新增/修改

    * 
    * @param callback

    * @param special

    * @param out

    */

   @RequestMapping(value = "saveInfo")

   public void saveInfo(String callback, PushGoods pushGoods, String arrayIOS,   String arrayAndroid, PrintWriter out) {

      try {

         // 版本处理

         convertVersion(pushGoods, arrayIOS, arrayAndroid);

         // 保存

         pushGoodsService.saveInfo(pushGoods);



         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("添加成功"));

      } catch (PushGoodsException e) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));

      } catch (Exception e) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作异常"));

         e.printStackTrace();

      }

   }

	
   /**

    * 删除

    * 

@@ -150,10 +175,8 @@
         Date controlTime = pushGoods.getControlTime();

         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");

         if (controlTime == null) {

            pushGoods.setTimeTask(false);

            pushGoods.setControlTime_str("");

         } else {

            pushGoods.setTimeTask(true);

            pushGoods.setControlTime_str(sdf.format(controlTime));

         }

         

@@ -216,21 +239,18 @@
      try {



         List<PushGoods> list = pushGoodsService.listQuery((pageIndex - 1) * pageSize, pageSize, key, state);



         if (list == null || list.size() == 0) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("暂无数据"));

            return;

         }



         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");

         for (PushGoods pushGoods : list) {

            

            Date controlTime = pushGoods.getControlTime();

            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");

            if (controlTime == null) {

               pushGoods.setTimeTask(false);

               pushGoods.setControlTime_str("");

            } else {

               pushGoods.setTimeTask(true);

               pushGoods.setControlTime_str(sdf.format(controlTime));

            }

            

@@ -272,17 +292,14 @@
    */

   @RequestMapping(value = "push")

   public void push(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;

@@ -291,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) {

@@ -370,7 +385,7 @@
     } else {

        JSONObject json = JSONObject.fromObject(versions);

         

         String versionsIOS = json.getString("IOS");

         String versionsIOS = json.optString("IOS");

         if (versionsIOS != null && versionsIOS.trim().length() > 0) {

            listIOS = Arrays.asList(versionsIOS.split(","));

         }