From 3ebbc15764ff0574f1024eb485e23d2df3e8730b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 17 四月 2019 11:58:40 +0800
Subject: [PATCH] 阿里云短信优化，分享信息优化

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/PushCouponController.java |  109 +++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 103 insertions(+), 6 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushCouponController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushCouponController.java
index f2db9b9..169b300 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushCouponController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushCouponController.java
@@ -2,6 +2,7 @@
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import javax.annotation.Resource;
@@ -44,10 +45,13 @@
 	 * @param out
 	 */
 	@RequestMapping(value = "save")
-	public void save(String callback, PushCoupon pushCoupon, PrintWriter out) {
+	public void save(String callback, PushCoupon pushCoupon, String arrayIOS, String arrayAndroid, PrintWriter out) {
 		
 		try {
+			convertVersion(pushCoupon, arrayIOS, arrayAndroid);
+			
 			pushCouponService.save(pushCoupon);
+			
 			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
 		} catch (PushCouponException e) {
 			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
@@ -169,6 +173,9 @@
 				long receivedCount = pushCouponRecordService.countByPushId(pushCoupon.getId());
 				pushCouponVO.setReceivedCount(receivedCount);
 				
+				convertVersionList(pushCouponVO);
+				
+				
 				listVO.add(pushCouponVO);
 			}
 
@@ -179,7 +186,7 @@
 
 			GsonBuilder gsonBuilder = new GsonBuilder();
 			gsonBuilder.serializeNulls();
-			Gson gson = gsonBuilder.setDateFormat("yyyy/MM/dd HH:mm:ss").create();
+			Gson gson = gsonBuilder.setDateFormat("yyyy-MM-dd").create();
 
 			JSONObject data = new JSONObject();
 			data.put("pe", pe);
@@ -201,15 +208,25 @@
 	 * @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 {
-			
-			pushCouponService.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) {
+				pushCouponService.executePush(id);
+			}
 			
 			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎺ㄩ�佹垚鍔�"));
 			
@@ -223,4 +240,84 @@
 		}
 	}
 
+	/**
+	 * 鐗堟湰杞崲涓簂ist
+	 * @param pushGoods
+	 */
+	public void convertVersionList(PushCouponVO pushCouponVO) {
+	  String versions = pushCouponVO.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.getString("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(","));
+			}
+	  }
+	  pushCouponVO.setListIOS(listIOS);
+	  pushCouponVO.setListAndroid(listAndroid);
+	}
+
+	/**
+	 * 杞崲json
+	 * @param pushGoods
+	 */
+	public void convertVersion(PushCoupon pushCoupon, 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);
+		}
+		
+		pushCoupon.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;
+	}
+	
 }

--
Gitblit v1.8.0