Server:新增Table-key1-key2...[]取值

TommyLemon · TommyLemon · commit 3da868473fbd · 2017-10-07T21:37:31.000+08:00
diff --git a/APIJSON-Java-Server/APIJSON-Eclipse/src/main/java/zuo/biao/apijson/StringUtil.java b/APIJSON-Java-Server/APIJSON-Eclipse/src/main/java/zuo/biao/apijson/StringUtil.java
@@ -737,23 +737,35 @@ public static String[] split(String s) {
 		return split(s, null);
 	}
 	/**将s用split分割成String[]
+	 * trim = true;
 	 * @param s
 	 * @param split
 	 * @return
 	 */
 	public static String[] split(String s, String split) {
+		return split(s, split, true);
+	}
+	/**将s用split分割成String[]
+	 * @param s
+	 * @param split
+	 * @param trim 去掉前后两端的split
+	 * @return
+	 */
+	public static String[] split(String s, String split, boolean trim) {
 		s = getString(s);
 		if (s.isEmpty()) {
 			return null;
 		}
 		if (isNotEmpty(split, false) == false) {
 			split = ",";
 		}
-		while (s.startsWith(split)) {
-			s = s.substring(split.length());
-		}
-		while (s.endsWith(split)) {
-			s = s.substring(0, s.length() - split.length());
+		if (trim) {
+			while (s.startsWith(split)) {
+				s = s.substring(split.length());
+			}
+			while (s.endsWith(split)) {
+				s = s.substring(0, s.length() - split.length());
+			}
 		}
 		return s.contains(split) ? s.split(split) : new String[]{s};
 	}
diff --git a/APIJSON-Java-Server/APIJSON-Eclipse/src/main/java/zuo/biao/apijson/server/Parser.java b/APIJSON-Java-Server/APIJSON-Eclipse/src/main/java/zuo/biao/apijson/server/Parser.java
@@ -643,11 +643,13 @@ private JSONArray getArray(String parentPath, String name, final JSONObject requ
 
 
 		//key[]:{Table:{}}中key equals Table时 提取Table
-		boolean isContainer = true;
 		int index = name == null ? -1 : name.lastIndexOf("[]");
-		String table = index <= 0 ? null : Pair.parseEntry(name.substring(0, index), true).getKey();
-		if (JSONRequest.isTableKey(table) && request.containsKey(table)) {
-			isContainer = false;
+		String childPath = index <= 0 ? null : Pair.parseEntry(name.substring(0, index), true).getKey(); // Table-key1-key2...
+
+		//判断第一个key，即Table是否存在，如果存在就提取
+		String[] childKeys = StringUtil.split(childPath, "-", false);
+		if (childKeys == null || childKeys.length <= 0 || request.containsKey(childKeys[0]) == false) {
+			childKeys = null;
 		}
 
 
@@ -662,7 +664,7 @@ private JSONArray getArray(String parentPath, String name, final JSONObject requ
 				break;
 			}
 			//key[]:{Table:{}}中key equals Table时 提取Table
-			response.add(isContainer ? parent : parent.getJSONObject(table) );
+			response.add(getValue(parent, childKeys)); //null有意义
 		}
 		//Table>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
@@ -676,6 +678,29 @@ private JSONArray getArray(String parentPath, String name, final JSONObject requ
 	}
 
 
+	/**根据路径取值
+	 * @param parent
+	 * @param pathKeys
+	 * @return
+	 */
+	private static Object getValue(JSONObject parent, String[] pathKeys) {
+		if (parent == null || pathKeys == null || pathKeys.length <= 0) {
+			Log.w(TAG, "getChild  parent == null || pathKeys == null || pathKeys.length <= 0 >> return parent;");
+			return parent;
+		}
+
+		//逐层到达child的直接容器JSONObject parent
+		final int last = pathKeys.length - 1;
+		for (int i = 0; i < last; i++) {//一步一步到达指定位置
+			if (parent == null) {//不存在或路径错误(中间的key对应value不是JSONObject)
+				break;
+			}
+			parent = getJSONObject(parent, pathKeys[i]);
+		}
+
+		return parent == null ? null : parent.get(pathKeys[last]);
+	}
+
 
 	/**获取被依赖引用的key的路径, 实时替换[] -> []/i
 	 * @param parentPath
