Server:新增默认的数组查询数量，初始值为10

TommyLemon · TommyLemon · commit fd80bb931f56 · 2019-01-13T18:38:01.000+08:00
diff --git a/APIJSON-Java-Server/APIJSONDemo/src/main/java/apijson/demo/server/DemoSQLConfig.java b/APIJSON-Java-Server/APIJSONDemo/src/main/java/apijson/demo/server/DemoSQLConfig.java
@@ -25,7 +25,6 @@
 import zuo.biao.apijson.server.AbstractSQLConfig;
 import zuo.biao.apijson.server.Join;
 import zuo.biao.apijson.server.SQLConfig;
-import zuo.biao.apijson.server.Subquery;
 
 
 /**SQL配置
diff --git a/APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/server/AbstractParser.java b/APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/server/AbstractParser.java
@@ -682,10 +682,11 @@ public JSONArray onArrayParse(JSONObject request, String parentPath, String name
 			return null;
 		}
 		String path = getAbsPath(parentPath, name);
-
+		
+		
 		//不能改变，因为后面可能继续用到，导致1以上都改变 []:{0:{Comment[]:{0:{Comment:{}},1:{...},...}},1:{...},...}
 		final int query = request.getIntValue(JSONRequest.KEY_QUERY);
-		final int count = request.getIntValue(JSONRequest.KEY_COUNT);
+		final Integer count = request.getInteger(JSONRequest.KEY_COUNT);
 		final int page = request.getIntValue(JSONRequest.KEY_PAGE);
 		final String join = request.getString(JSONRequest.KEY_JOIN);
 		request.remove(JSONRequest.KEY_QUERY);
@@ -701,8 +702,9 @@ public JSONArray onArrayParse(JSONObject request, String parentPath, String name
 
 
 		//不用total限制数量了，只用中断机制，total只在query = 1,2的时候才获取
-		int max = isSubquery ? count : getMaxQueryCount();
-		int size = count <= 0 || count > max ? max : count;//count为每页数量，size为第page页实际数量，max(size) = count
+		int count2 = isSubquery || count != null ? (count == null ? 0 : count) : getDefaultQueryCount();
+		int max = isSubquery ? count2 : getMaxQueryCount();
+		int size = count2 <= 0 || count2 > max ? max : count2;//count为每页数量，size为第page页实际数量，max(size) = count
 		Log.d(TAG, "getArray  size = " + size + "; page = " + page);
 
 
@@ -940,6 +942,10 @@ private JSONObject getJoinObject(String table, JSONObject obj, String key) {
 		return requestObj;
 	}
 
+	@Override
+	public int getDefaultQueryCount() {
+		return DEFAULT_QUERY_COUNT;
+	}
 	@Override
 	public int getMaxQueryCount() {
 		return MAX_QUERY_COUNT;
diff --git a/APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/server/Parser.java b/APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/server/Parser.java
@@ -25,6 +25,7 @@
  */
 public interface Parser<T> {
 
+	int DEFAULT_QUERY_COUNT = 10;
 	int MAX_QUERY_COUNT = 100;
 	int MAX_UPDATE_COUNT = 10;
 	
@@ -96,6 +97,7 @@ public interface Parser<T> {
 	
 	ObjectParser createObjectParser(JSONObject request, String parentPath, String name, SQLConfig arrayConfig, boolean isSubquery) throws Exception;
 
+	int getDefaultQueryCount();
 	int getMaxQueryCount();
 	int getMaxUpdateCount();
 	
