Server:完善子查询的关键词

TommyLemon · TommyLemon · commit d567d7b49115 · 2019-02-17T23:29:55.000+08:00
diff --git a/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/JSONRequest.java b/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/JSONRequest.java
@@ -88,17 +88,25 @@ public JSONRequest setFormat(Boolean format) {
 	public static final int QUERY_TOTAL = 1;
 	public static final int QUERY_ALL = 2;
 
+	public static final String SUBQUERY_RANGE_ALL = "ALL";
+	public static final String SUBQUERY_RANGE_ANY = "ANY";
+	
 	public static final String KEY_QUERY = "query";
 	public static final String KEY_COUNT = "count";
 	public static final String KEY_PAGE = "page";
 	public static final String KEY_JOIN = "join";
+	public static final String KEY_SUBQUERY_RANGE = "range";
+	public static final String KEY_SUBQUERY_FROM = "from";
 
 	public static final List<String> ARRAY_KEY_LIST;
 	static {
 		ARRAY_KEY_LIST = new ArrayList<String>();
 		ARRAY_KEY_LIST.add(KEY_QUERY);
 		ARRAY_KEY_LIST.add(KEY_COUNT);
 		ARRAY_KEY_LIST.add(KEY_PAGE);
+		ARRAY_KEY_LIST.add(KEY_JOIN);
+		ARRAY_KEY_LIST.add(KEY_SUBQUERY_RANGE);
+		ARRAY_KEY_LIST.add(KEY_SUBQUERY_FROM);
 	}
 
 	/**set what to query in Array layer
@@ -125,6 +133,33 @@ public JSONRequest setCount(int count) {
 	public JSONRequest setPage(int page) {
 		return puts(KEY_PAGE, page);
 	}
+	
+	/**set joins of Main Table and it's Vice Tables in Array layer
+	 * @param joins "@/User/id@", "&/User/id@,>/Comment/momentId@" ...
+	 * @return
+	 */
+	public JSONRequest setJoin(String... joins) {
+		return puts(KEY_JOIN, StringUtil.getString(joins));
+	}
+	
+	/**set range for Subquery
+	 * @param range
+	 * @return
+	 * @see {@link #SUBQUERY_RANGE_ALL}
+	 * @see {@link #SUBQUERY_RANGE_ANY}
+	 */
+	public JSONRequest setSubqueryRange(String range) {
+		return puts(KEY_SUBQUERY_RANGE, range);
+	}
+	
+	/**set from for Subquery
+	 * @param range
+	 * @return
+	 */
+	public JSONRequest setSubqueryFrom(String from) {
+		return puts(KEY_SUBQUERY_FROM, from);
+	}
+	
 	//array object >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
 
diff --git a/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractObjectParser.java b/APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractObjectParser.java
@@ -333,20 +333,23 @@ public boolean onParse(@NotNull String key, @NotNull Object value) throws Except
 				String replaceKey = key.substring(0, key.length() - 1);//key{}@ getRealKey
 				
 				JSONObject subquery = (JSONObject) value;
-				String range = subquery.getString("range");
-				if (range != null && "ANY".equals(range) == false && "ALL".equals(range) == false) {
-					throw new IllegalArgumentException("子查询 " + path + "/" + key + ":{ range:value } 中 value 只能为 [ANY, ALL] 中的一个！");
+				String range = subquery.getString(JSONRequest.KEY_SUBQUERY_RANGE);
+				if (range != null && JSONRequest.SUBQUERY_RANGE_ALL.equals(range) == false && JSONRequest.SUBQUERY_RANGE_ANY.equals(range) == false) {
+					throw new IllegalArgumentException("子查询 " + path + "/" + key + ":{ range:value } 中 value 只能为 [" + JSONRequest.SUBQUERY_RANGE_ALL + ", " + JSONRequest.SUBQUERY_RANGE_ANY + "] 中的一个！");
 				}
 
 				
 				JSONArray arr = parser.onArrayParse(subquery, AbstractParser.getAbsPath(path, replaceKey), "[]", true);
 				
 				JSONObject obj = arr == null || arr.isEmpty() ? null : arr.getJSONObject(0);
+				if (obj == null) {
+					throw new Exception("服务器内部错误，解析子查询 " + path + "/" + key + ":{ } 为 Subquery 对象失败！");
+				}
 
-				String from = subquery.getString("from");
-				JSONObject arrObj = obj.getJSONObject(from);
+				String from = subquery.getString(JSONRequest.KEY_SUBQUERY_FROM);
+				JSONObject arrObj = from == null ? null : obj.getJSONObject(from);
 				if (arrObj == null) {
-					throw new IllegalArgumentException("子查询 " + path + "/" + key + ":{ from:value } 中 value 对应的主表对象不存在！");
+					throw new IllegalArgumentException("子查询 " + path + "/" + key + ":{ from:value } 中 value 对应的主表对象 " + from + ":{} 不存在！");
 				}
 //				
 				SQLConfig cfg = (SQLConfig) arrObj.get(AbstractParser.KEY_CONFIG);
