From 8a54915d3c39d9d8d7e90c0971d1e19d0eb76622 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 12 六月 2020 14:37:04 +0800
Subject: [PATCH] 券统计

---
 fanli/src/main/java/com/yeshi/fanli/util/aitaoker/AitaokerApiUtil.java |  113 +++++++++++---------------------------------------------
 1 files changed, 22 insertions(+), 91 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/aitaoker/AitaokerApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/aitaoker/AitaokerApiUtil.java
index 1440d75..a4a0841 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/aitaoker/AitaokerApiUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/aitaoker/AitaokerApiUtil.java
@@ -17,21 +17,16 @@
 import com.yeshi.fanli.dto.aitaoker.QrcodeLoginDTO;
 import com.yeshi.fanli.dto.aitaoker.RobotInfoDTO;
 import com.yeshi.fanli.dto.aitaoker.WeiXinGroupDTO;
-import com.yeshi.fanli.dto.suning.SuningGoodsInfo;
 import com.yeshi.fanli.util.StringUtil;
 
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
 public class AitaokerApiUtil {
-	
 	public static String APP_KEY = "1077080250";
 	public static String SECRET_KEY = "7c6118bd-7aa5-65b8-c6d4-058728e9446f";
-	
 	// 璇锋眰杩炴帴
 	private static String SERVER_URL = "http://router.itaoke.org/api";
-	
-	
 	
 	
 	private static String baseRequest(String method, Map<String, String> param) {
@@ -54,9 +49,7 @@
 				baseMap.put(key, param.get(key));
 			}
 		}
-		
 		url+= "sign=" + getSign(baseMap);
-		
 		return HttpUtil.post(url, param);
 	}
 	
@@ -106,12 +99,9 @@
 	 * @return
 	 */
 	public static QrcodeLoginDTO getQrcodeMaclogin(int robotId) {
-		// 璇锋眰鍙傛暟
 		Map<String, String> map = new HashMap<>();
 		map.put("robot_id", robotId +"");
-		// 璇锋眰缁撴灉
 		String result = baseRequest("itaoke.robot.qrcode.maclogin", map);
-		
 		JSONObject resultJson = JSONObject.fromObject(result);
 		resultJson = resultJson.optJSONObject("data");
 		if (resultJson != null) {
@@ -121,30 +111,6 @@
 		return null;
 	}
 	
-	/**
-	 *  妫�鏌ユ槸鍚︽壂鐮�
-	 * @param robotId
-	 * @return
-	 */
-	public static Boolean getQrcodeStatus(int robotId) {
-		// 璇锋眰鍙傛暟
-		Map<String, String> map = new HashMap<>();
-		map.put("robot_id", robotId +"");
-		// 璇锋眰缁撴灉
-		String result = baseRequest("itaoke.robot.qrcode.status", map);
-		JSONObject resultJson = JSONObject.fromObject(result);
-		resultJson = resultJson.optJSONObject("data");
-		if (resultJson != null && !StringUtil.isNullOrEmpty(resultJson.optString("status"))) {
-			int optInt = resultJson.optInt("status");
-			if (optInt == 1) {
-				return true;
-			} else {
-				return false;
-			}
-		}
-		return null;
-	}
-
 	
 	/**
 	 *   妫�鏌ユ槸鍚︾櫥闄嗭紙鐪熸鐨勭櫥褰曟帴鍙o級
@@ -167,7 +133,6 @@
 				return new Gson().fromJson(resultJson.toString(), type);
 			}
 		}
-		
 		return null;
 	}
 	
@@ -177,14 +142,15 @@
 	 * @return
 	 */
 	public static boolean onlineCheck(int robotId) {
-		// 璇锋眰鍙傛暟
 		Map<String, String> map = new HashMap<>();
 		map.put("robot_id", robotId +"");
-		// 璇锋眰缁撴灉
 		String result = baseRequest("itaoke.robot.check.online", map);
 		JSONObject resultJson = JSONObject.fromObject(result);
 		if ("0000".equals(resultJson.optString("status"))) {
-			return true;
+			resultJson = resultJson.optJSONObject("data");
+			if (resultJson != null) {
+				return resultJson.optBoolean("isOnline");
+			}
 		}
 		return false;
 	}
@@ -210,24 +176,6 @@
 	
 	
 	/**
-	 *  鎺夌嚎閲嶈繛
-	 * @param robotId 鏈哄櫒浜篿d
-	 * @return
-	 */
-	public static boolean loseReconnet(int robotId) {
-		// 璇锋眰鍙傛暟
-		Map<String, String> map = new HashMap<>();
-		map.put("robot_id", robotId +"");
-		// 璇锋眰缁撴灉
-		String result = baseRequest("itaoke.robot.lose.reconnet", map);
-		JSONObject resultJson = JSONObject.fromObject(result);
-		if ("0000".equals(resultJson.optString("code"))) {
-			return true;
-		}
-		return false;
-	}
-	
-	/**
 	 * 鍒涘缓鏈哄櫒浜�
 	 * @param month 鏈堟暟
 	 * @param robotType 鏈哄櫒浜虹被鍨� 1 鍙戝崟鏈哄櫒浜� 2杞彂鏈哄櫒浜� 3 杩斿埄鏈哄櫒浜� 4鍏ㄨ兘鏈哄櫒浜� 5灏忓瀷鏈哄櫒浜� 6鍙戝湀鏈哄櫒浜�
@@ -247,7 +195,7 @@
 		// 璇锋眰缁撴灉
 		String result = baseRequest("itaoke.robot.create.get", map);
 		JSONObject resultJson = JSONObject.fromObject(result);
-		if ("0000".equals(resultJson.optString("code"))) {
+		if ("0000".equals(resultJson.optString("status"))) {
 			resultJson = resultJson.optJSONObject("data");
 			Type type = new TypeToken<RobotInfoDTO>() {}.getType();
 			return new Gson().fromJson(resultJson.toString(), type);
@@ -255,29 +203,6 @@
 		return null;
 	}
 	
-	
-	
-	/**
-	 * 鏈哄櫒浜烘洿鎹㈠井淇″彿
-	 * @param robotId 鏈哄櫒浜篿d
-	 * @param wxid 寰俊鍙�
-	 * @return
-	 */
-	public static RobotInfoDTO robotChangeWeiXin(int robotId, String wxid) {
-		// 璇锋眰鍙傛暟
-		Map<String, String> map = new HashMap<>();
-		map.put("robot_id", robotId +"");
-		map.put("wechatrobot", wxid);
-		// 璇锋眰缁撴灉
-		String result = baseRequest("itaoke.robot.change.get", map);
-		JSONObject resultJson = JSONObject.fromObject(result);
-		if ("0000".equals(resultJson.optString("code"))) {
-			resultJson = resultJson.optJSONObject("data");
-			Type type = new TypeToken<RobotInfoDTO>() {}.getType();
-			return new Gson().fromJson(resultJson.toString(), type);
-		}
-		return null;
-	}
 	
 	
 	/**
@@ -294,7 +219,7 @@
 		// 璇锋眰缁撴灉
 		String result = baseRequest("itaoke.robot.change.get", map);
 		JSONObject resultJson = JSONObject.fromObject(result);
-		if ("0000".equals(resultJson.optString("code"))) {
+		if ("0000".equals(resultJson.optString("status"))) {
 			resultJson = resultJson.optJSONObject("data");
 			Type type = new TypeToken<RobotInfoDTO>() {}.getType();
 			return new Gson().fromJson(resultJson.toString(), type);
@@ -315,7 +240,7 @@
 		// 璇锋眰缁撴灉
 		String result = baseRequest("itaoke.robot.delete.get", map);
 		JSONObject resultJson = JSONObject.fromObject(result);
-		if ("0000".equals(resultJson.optString("code"))) {
+		if ("0000".equals(resultJson.optString("status"))) {
 			return true;
 		}
 		return false;
@@ -337,12 +262,9 @@
 		if ("0000".equals(resultJson.optString("status"))) {
 			JSONArray groupArray = resultJson.optJSONArray("data");
 			if (groupArray != null && groupArray.size() > 0) {
-				List<WeiXinGroupDTO> listGroup = new ArrayList<>();
-				 
 				Type type = new TypeToken<ArrayList<WeiXinGroupDTO>>() {
 				}.getType();
 				List<WeiXinGroupDTO> goodsList = new Gson().fromJson(groupArray.toString(), type);
-				
 				return goodsList;
 			}
 		}
@@ -368,8 +290,12 @@
 		JSONObject resultJson = JSONObject.fromObject(result);
 		if ("0000".equals(resultJson.optString("status"))) {
 			resultJson = resultJson.optJSONObject("data");
-			resultJson = resultJson.optJSONObject("object");
-			return resultJson.optString("id");
+			if (resultJson != null) {
+				resultJson = resultJson.optJSONObject("object");
+				if (resultJson != null) {
+					return resultJson.optString("id");
+				}
+			}
 		}
 		return null;
 	}
@@ -391,9 +317,14 @@
 		// 璇锋眰缁撴灉
 		String result = baseRequest("itaoke.robot.macsend.videocircle", map);
 		JSONObject resultJson = JSONObject.fromObject(result);
-		if ("1000".equals(resultJson.optString("code"))) {
+		if ("0000".equals(resultJson.optString("status"))) {
 			resultJson = resultJson.optJSONObject("data");
-			return resultJson.optString("id");
+			if (resultJson != null) {
+				resultJson = resultJson.optJSONObject("object");
+				if (resultJson != null) {
+					return resultJson.optString("id");
+				}
+			}
 		}
 		return null;
 	}
@@ -465,7 +396,7 @@
 		// 璇锋眰缁撴灉
 		String result = baseRequest("itaoke.robot.macsend.base64", map);
 		JSONObject resultJson = JSONObject.fromObject(result);
-		if (resultJson.optInt("code") == 1000) {
+		if ("0000".equals(resultJson.optString("status"))) {
 			return true;
 		}
 		return false;
@@ -494,7 +425,7 @@
 		// 璇锋眰缁撴灉
 		String result = baseRequest("itaoke.robot.macsend.card", map);
 		JSONObject resultJson = JSONObject.fromObject(result);
-		if (resultJson.optInt("code") == 1000) {
+		if ("0000".equals(resultJson.optString("status"))) {
 			return true;
 		}
 		return false;

--
Gitblit v1.8.0