From 30d8e227e8d823b6c38c3b9c90ac2df03b63befe Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 25 二月 2025 16:41:22 +0800
Subject: [PATCH] 淘宝转链接口更新

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/PushGoodsController.java |  655 ++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 396 insertions(+), 259 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 67e6360..1c6841f 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
@@ -1,259 +1,396 @@
-package com.yeshi.fanli.controller.admin;
-
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-
-import net.sf.json.JSONObject;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.yeshi.utils.JsonUtil;
-
-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.push.PushGoods;
-import com.yeshi.fanli.entity.push.PushGoodsGroup;
-import com.yeshi.fanli.exception.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.fanli.util.Constant;
-import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.annotation.RequestNoLogin;
-
-@Controller
-@RequestMapping("admin/new/api/v1/pushgoods")
-public class PushGoodsController {
-
-	@Resource
-	private AdminUserService adminUserService;
-
-	@Resource
-	private PushGoodsService pushGoodsService;
-
-	@Resource
-	private PushGoodsGroupService pushGoodsGroupService;
-
-	/**
-	 * 鏂板/淇敼
-	 * 
-	 * @param callback
-	 * @param special
-	 * @param out
-	 */
-	@RequestNoLogin()
-	@RequestMapping(value = "save")
-	public void save(String callback, PushGoods pushGoods, Long uid, String idArray, HttpServletResponse response,
-			PrintWriter out) {
-
-		response.setHeader("Access-Control-Allow-Origin", "*");
-		response.setHeader("Access-Control-Allow-Methods", "*");
-
-		AdminUser admin = adminUserService.selectByPrimaryKey(uid);
-		if (admin == null) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔鐢ㄦ埛楠岃瘉澶辫触"));
-			return;
-		}
-
-		try {
-
-			String alertTitle = pushGoods.getAlertTitle();
-			if (StringUtil.isNullOrEmpty(alertTitle)) {
-				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏄剧ず鏍囬涓嶈兘涓虹┖"));
-				return;
-			}
-
-			// 椤甸潰鍐呭鏍囬涓虹┖鏃� 鏄剧ず閫氱煡鏍忎笂鐨勬爣棰�
-			String title = pushGoods.getTitle();
-			if (StringUtil.isNullOrEmpty(title)) {
-				pushGoods.setTitle(pushGoods.getAlertTitle());
-			}
-
-			Gson gson = new Gson();
-			List<Long> list = gson.fromJson(idArray, new TypeToken<ArrayList<Long>>() {
-			}.getType());
-
-			pushGoodsService.save(pushGoods, list);
-
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("娣诲姞鎴愬姛"));
-
-		} catch (Exception e) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * 鍒犻櫎
-	 * 
-	 * @param callback
-	 * @param idArray
-	 * @param out
-	 */
-	@RequestMapping(value = "delete")
-	public void delete(String callback, String idArray, PrintWriter out) {
-
-		try {
-			if (StringUtil.isNullOrEmpty(idArray)) {
-				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨鎿嶄綔鐨勬暟鎹�"));
-				return;
-			}
-
-			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;
-			}
-
-			int count = pushGoodsService.deleteBatchByPrimaryKey(list);
-
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎴愬姛鍒犻櫎[" + count + "]鏉℃暟鎹�"));
-
-		} catch (Exception e) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * 鏌ヨ
-	 * 
-	 * @param callback
-	 * @param pageIndex
-	 * @param pageSize
-	 * @param key
-	 *            妯$硦鏌ヨ锛氳鏄庛�佹爣璇�
-	 * @param out
-	 */
-	@RequestMapping(value = "getPushInfo")
-	public void getPushInfo(String callback, Long id, PrintWriter out) {
-
-		if (id == null) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍙傛暟涓嶈兘涓虹┖"));
-			return;
-		}
-
-		try {
-
-			PushGoods pushGoods = pushGoodsService.selectByPrimaryKey(id);
-			if (pushGoods == null) {
-				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏁版嵁淇℃伅宸蹭笉瀛樺湪"));
-				return;
-			}
-
-			List<PushGoodsGroup> listGroup = pushGoodsGroupService.getAllInfoByPushId(pushGoods.getId());
-			
-			JSONObject data = new JSONObject();
-			data.put("pushGoods", pushGoods);
-			data.put("listGroup", listGroup);
-
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
-		} catch (Exception e) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * 鏌ヨ
-	 * 
-	 * @param callback
-	 * @param pageIndex
-	 * @param pageSize
-	 * @param key
-	 *            妯$硦鏌ヨ锛氳鏄庛�佹爣璇�
-	 * @param out
-	 */
-	@RequestMapping(value = "query")
-	public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer state, PrintWriter out) {
-
-		if (pageIndex == null || pageIndex < 1) {
-			pageIndex = 1;
-		}
-
-		if (pageSize == null || pageSize < 1) {
-			pageSize = Constant.PAGE_SIZE;
-		}
-
-		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;
-			}
-
-			for (PushGoods pushGoods : list) {
-				long countGoods = pushGoodsGroupService.countByPushId(pushGoods.getId());
-				pushGoods.setCountGoods(countGoods);
-			}
-
-			long count = pushGoodsService.countQuery(key, state);
-
-			int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
-			PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
-
-			GsonBuilder gsonBuilder = new GsonBuilder();
-			gsonBuilder.serializeNulls();
-			Gson gson = gsonBuilder.setDateFormat("yyyy/MM/dd HH:mm:ss").create();
-
-			JSONObject data = new JSONObject();
-			data.put("pe", pe);
-			data.put("result_list", gson.toJson(list));
-
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
-		} catch (Exception e) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
-			e.printStackTrace();
-		}
-	}
-	
-	
-	/**
-	 * 缃戦〉鎺ㄩ��
-	 * 
-	 * @param id 鎺ㄩ�乮d
-	 * @param out
-	 * @throws Exception
-	 */
-	@RequestMapping(value = "push")
-	public void push(String callback, Long id, PrintWriter out) throws Exception {
-
-		if (id == null) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("浼犻�掑弬鏁颁笉鑳戒负绌�"));
-			return;
-		}
-		
-		try {
-			pushGoodsService.executePush(id);
-			
-			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎺ㄩ�佹垚鍔�"));
-			
-		} catch (PushException e) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
-		} catch (PushGoodsException e) {
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
-		} catch (Exception e) {
-			e.printStackTrace();
-			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎺ㄩ�佸け璐�"));
-		}
-
-	}
-
-
-
-}
+package com.yeshi.fanli.controller.admin;
+
+import java.io.PrintWriter;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+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;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.reflect.TypeToken;
+import com.yeshi.fanli.entity.goods.CommonGoods;
+import com.yeshi.fanli.entity.push.PushGoods;
+import com.yeshi.fanli.entity.push.PushGoodsGroup;
+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.common.entity.PageEntity;
+import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.taobao.TaoBaoUtil;
+
+import net.sf.json.JSONObject;
+
+@Controller
+@RequestMapping("admin/new/api/v1/pushgoods")
+public class PushGoodsController {
+
+	@Resource
+	private AdminUserService adminUserService;
+
+	@Resource
+	private PushGoodsService pushGoodsService;
+
+	@Resource
+	private PushGoodsGroupService pushGoodsGroupService;
+
+	/**
+	 * 鏂板/淇敼
+	 * 
+	 * @param callback
+	 * @param out
+	 */
+	@RequestMapping(value = "save")
+	public void save(AdminAcceptData acceptData,String callback, PushGoods pushGoods, String idArray, String arrayIOS,
+			String arrayAndroid, PrintWriter out) {
+		
+		try {
+
+			String alertTitle = pushGoods.getAlertTitle();
+			if (StringUtil.isNullOrEmpty(alertTitle)) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏄剧ず鏍囬涓嶈兘涓虹┖"));
+				return;
+			}
+
+			// 椤甸潰鍐呭鏍囬涓虹┖鏃� 鏄剧ず閫氱煡鏍忎笂鐨勬爣棰�
+			String title = pushGoods.getTitle();
+			if (StringUtil.isNullOrEmpty(title)) {
+				pushGoods.setTitle(pushGoods.getAlertTitle());
+			}
+
+			Gson gson = new Gson();
+			List<String> list = gson.fromJson(idArray, new TypeToken<ArrayList<String>>() {}.getType());
+
+			convertVersion(pushGoods, arrayIOS, arrayAndroid);
+			
+			pushGoodsService.save(pushGoods, list);
+
+			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();
+		}
+	}
+
+	
+	/**
+	 * 鏂板/淇敼
+	 * 
+	 * @param callback
+	 * @param out
+	 */
+	@RequestMapping(value = "saveInfo")
+	public void saveInfo(AdminAcceptData acceptData,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();
+		}
+	}
+	
+	/**
+	 * 鍒犻櫎
+	 * 
+	 * @param callback
+	 * @param idArray
+	 * @param out
+	 */
+	@RequestMapping(value = "delete")
+	public void delete(AdminAcceptData acceptData,String callback, String idArray, PrintWriter out) {
+
+		try {
+			if (StringUtil.isNullOrEmpty(idArray)) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨鎿嶄綔鐨勬暟鎹�"));
+				return;
+			}
+
+			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;
+			}
+
+			int count = pushGoodsService.deleteBatchByPrimaryKey(list);
+
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎴愬姛鍒犻櫎[" + count + "]鏉℃暟鎹�"));
+
+		} catch (Exception e) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * 鏌ヨ
+	 * 
+	 * @param callback
+	 *            妯$硦鏌ヨ锛氳鏄庛�佹爣璇�
+	 * @param out
+	 */
+	@RequestMapping(value = "getPushInfo")
+	public void getPushInfo(AdminAcceptData acceptData,String callback, Long id, PrintWriter out) {
+
+		if (id == null) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍙傛暟涓嶈兘涓虹┖"));
+			return;
+		}
+
+		try {
+
+			PushGoods pushGoods = pushGoodsService.selectByPrimaryKey(id);
+			if (pushGoods == null) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏁版嵁淇℃伅宸蹭笉瀛樺湪"));
+				return;
+			}
+			
+			Date controlTime = pushGoods.getControlTime();
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
+			if (controlTime == null) {
+				pushGoods.setControlTime_str("");
+			} else {
+				pushGoods.setControlTime_str(sdf.format(controlTime));
+			}
+			
+
+			// 鐗堟湰澶勭悊
+			convertVersionList(pushGoods);
+			
+			List<TaoBaoGoodsBrief> listgoods = new ArrayList<TaoBaoGoodsBrief>();
+			
+			List<PushGoodsGroup> listGroup = pushGoodsGroupService.getAllInfoByPushId(id);
+			if (listGroup == null) {
+				listGroup = new ArrayList<PushGoodsGroup>();
+			} else {
+				for (PushGoodsGroup pushGoodsGroup: listGroup) {
+					CommonGoods commonGoods = pushGoodsGroup.getCommonGoods();
+					if (commonGoods != null) {
+						TaoBaoGoodsBrief goodsBrief = TaoBaoUtil.convert(commonGoods);
+						listgoods.add(goodsBrief);
+					}
+				}
+			}
+			
+			GsonBuilder gsonBuilder = new GsonBuilder();
+			gsonBuilder.serializeNulls();
+			Gson gson = gsonBuilder.create();
+			
+			JSONObject data = new JSONObject();
+			data.put("pushGoods", gson.toJson(pushGoods));
+			data.put("listGroup", listgoods);
+
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+
+		} catch (Exception e) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * 鏌ヨ
+	 * 
+	 * @param callback
+	 * @param pageIndex
+	 * @param pageSize
+	 * @param key
+	 *            妯$硦鏌ヨ锛氳鏄庛�佹爣璇�
+	 * @param out
+	 */
+	@RequestMapping(value = "query")
+	public void query(AdminAcceptData acceptData, String callback, Integer pageIndex, Integer pageSize, String key, Integer state, PrintWriter out) {
+
+		if (pageIndex == null || pageIndex < 1) {
+			pageIndex = 1;
+		}
+
+		if (pageSize == null || pageSize < 1) {
+			pageSize = Constant.PAGE_SIZE;
+		}
+
+		try {
+
+			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;
+			}
+
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
+			for (PushGoods pushGoods : list) {
+				
+				Date controlTime = pushGoods.getControlTime();
+				if (controlTime == null) {
+					pushGoods.setControlTime_str("");
+				} else {
+					pushGoods.setControlTime_str(sdf.format(controlTime));
+				}
+				
+				long countGoods = pushGoodsGroupService.countByPushId(pushGoods.getId());
+				pushGoods.setCountGoods(countGoods);
+				
+				// 鐗堟湰澶勭悊
+				convertVersionList(pushGoods);
+			}
+
+			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);
+
+			GsonBuilder gsonBuilder = new GsonBuilder();
+			gsonBuilder.serializeNulls();
+			Gson gson = gsonBuilder.setDateFormat("yyyy/MM/dd HH:mm:ss").create();
+
+			JSONObject data = new JSONObject();
+			data.put("pe", pe);
+			data.put("result_list", gson.toJson(list));
+
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+
+		} catch (Exception e) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+			e.printStackTrace();
+		}
+	}
+	
+	
+	/**
+	 *   鍟嗗搧鎺ㄩ��
+	 * 
+	 * @param out
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "push")
+	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;
+			}
+				
+			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) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
+		} catch (Exception e) {
+			e.printStackTrace();
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎺ㄩ�佸け璐�"));
+		}
+	}
+
+	/**
+	 * 杞崲json
+	 * @param pushGoods
+	 */
+	public void convertVersion(PushGoods pushGoods, String arrayIOS, String arrayAndroid) {
+		
+		List<String> listIOS = convertList(arrayIOS);
+		List<String> listAndroid = convertList(arrayAndroid);
+		if ((listIOS == null || listIOS.size() == 0) && (listAndroid == null || listAndroid.size() == 0)) {
+			return;
+		}
+		
+		JSONObject json =  new JSONObject();
+		if (listIOS != null && listIOS.size() > 0) {
+			String versions = "";
+			for (String version: listIOS) {
+				versions += version + ",";
+			}
+			if (versions.endsWith(",")) {
+				versions = versions.substring(0, versions.length() - 1);
+			}
+			
+			json.put("IOS", versions);
+		}
+		if (listAndroid != null && listAndroid.size() > 0) {
+			String versions = "";
+			for (String version: listAndroid) {
+				versions += version + ",";
+			}
+			if (versions.endsWith(",")) {
+				versions = versions.substring(0, versions.length() - 1);
+			}
+			
+			json.put("Android", versions);
+		}
+		pushGoods.setVersions(json.toString());
+	}
+	
+	/**
+	 * 鐗堟湰澶勭悊
+	 * @param array
+	 * @return
+	 */
+	public List<String> convertList (String array) {
+		Gson gson = new Gson();
+		List<String> list = null;
+		if (array != null && array.trim().length() > 0) {
+			list = gson.fromJson(array, new TypeToken<ArrayList<String>>() {}.getType());
+		}
+		return list;
+	}
+	
+	/**
+	 * 鐗堟湰杞崲涓簂ist
+	 * @param pushGoods
+	 */
+	public void convertVersionList(PushGoods pushGoods) {
+	  String versions = pushGoods.getVersions();
+	  List<String> listIOS = null;
+	  List<String> listAndroid = null;
+	  if (versions == null || versions.trim().length() == 0) {
+		  listIOS = new ArrayList<String>();
+		  listAndroid = new ArrayList<String>();
+	  } else {
+		  JSONObject json = JSONObject.fromObject(versions);
+			
+			String versionsIOS = json.optString("IOS");
+			if (versionsIOS != null && versionsIOS.trim().length() > 0) {
+				listIOS = Arrays.asList(versionsIOS.split(","));
+			}
+			
+			String versionsAndroid  = json.getString("Android");
+			if (versionsAndroid != null && versionsAndroid.trim().length() > 0) {
+				listAndroid = Arrays.asList(versionsAndroid.split(","));
+			}
+	  }
+	  pushGoods.setListIOS(listIOS);
+	  pushGoods.setListAndroid(listAndroid);
+	}
+}

--
Gitblit v1.8.0