Server：新增是否成功 ok、详细的分页信息 page

TommyLemon · TommyLemon · commit d71bc858981e · 2020-03-08T20:29:49.000+08:00
diff --git a/APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/JSONResponse.java b/APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/JSONResponse.java
@@ -65,10 +65,16 @@ public JSONResponse(JSONObject object) {
 	public static final String MSG_SERVER_ERROR = "Internal Server Error!"; //服务器内部错误
 
 
+	public static final String KEY_OK = "ok";
 	public static final String KEY_CODE = "code";
 	public static final String KEY_MSG = "msg";
 	public static final String KEY_COUNT = "count";
 	public static final String KEY_TOTAL = "total";
+	public static final String KEY_PAGE = "page"; //详细的分页信息
+	public static final String KEY_FIRST = "first"; //是否为首页
+	public static final String KEY_LAST = "last"; //是否为尾页
+	public static final String KEY_MAX = "max"; //最大页码
+	public static final String KEY_MORE = "more"; //是否有更多
 
 	/**获取状态
 	 * @return
diff --git a/APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java b/APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/AbstractObjectParser.java
@@ -357,12 +357,14 @@ else if (value instanceof String) { // 引用赋值路径
 				Log.i(TAG, "onParse targetPath = " + targetPath + "; target = " + target);
 
 				if (target == null) {//String#equals(null)会出错
-					Log.d(TAG, "onParse  target == null  >>  continue;");
+					Log.d(TAG, "onParse  target == null  >>  return true;");
 					return true;
 				}
 				if (target instanceof Map) { //target可能是从requestObject里取出的 {}
-					Log.d(TAG, "onParse  target instanceof Map  >>  continue;");
-					return false;
+					if (isTable || targetPath.endsWith("[]/" + JSONResponse.KEY_PAGE) == false) {
+						Log.d(TAG, "onParse  target instanceof Map  >>  return false;");
+						return false; //FIXME 这个判断现在来看是否还有必要？为啥不允许为 JSONObject ？以前可能因为防止二次遍历再解析，现在只有一次遍历
+					}
 				}
 				if (targetPath.equals(target)) {//必须valuePath和保证getValueByPath传进去的一致！
 					Log.d(TAG, "onParse  targetPath.equals(target)  >>");
@@ -373,7 +375,7 @@ else if (value instanceof String) { // 引用赋值路径
 								+ " || JSONRequest.TABLE_KEY_LIST.contains(key)) >>  return null;");
 						return false;//获取不到就不用再做无效的query了。不考虑 Table:{Table:{}}嵌套
 					} else {
-						Log.d(TAG, "onParse  isTable(table) == false >> continue;");
+						Log.d(TAG, "onParse  isTable(table) == false >> return true;");
 						return true;//舍去，对Table无影响
 					}
 				} 
diff --git a/APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java b/APIJSON-Java-Server/APIJSONORM/src/main/java/apijson/orm/AbstractParser.java
@@ -511,9 +511,13 @@ public static JSONObject extendResult(JSONObject object, int code, String msg) {
 		if (object == null) {
 			object = new JSONObject(true);
 		}
+		if (object.containsKey(JSONResponse.KEY_OK) == false) {
+			object.put(JSONResponse.KEY_OK, JSONResponse.isSuccess(code));
+		}
 		if (object.containsKey(JSONResponse.KEY_CODE) == false) {
 			object.put(JSONResponse.KEY_CODE, code);
 		}
+		
 		String m = StringUtil.getString(object.getString(JSONResponse.KEY_MSG));
 		if (m.isEmpty() == false) {
 			msg = m + " ;\n " + StringUtil.getString(msg);
@@ -738,9 +742,29 @@ public JSONObject onObjectParse(final JSONObject request
 						int index = parentPath.lastIndexOf("]/");
 						if (index >= 0) {
 							int total = rp.getIntValue(JSONResponse.KEY_COUNT);
-							putQueryResult(parentPath.substring(0, index) + "]/" + JSONResponse.KEY_TOTAL, total);
-
-							if (total <= arrayConfig.getCount()*arrayConfig.getPage()) {
+							
+							String pathPrefix = parentPath.substring(0, index) + "]/";
+							putQueryResult(pathPrefix + JSONResponse.KEY_TOTAL, total);
+							
+							//详细的分页信息，主要为 PC 端提供
+							int count = arrayConfig.getCount();
+							int page = arrayConfig.getPage();
+							int max = (int) ((total - 1)/count);
+							if (max < 0) {
+								max = 0;
+							}
+							
+							JSONObject pagination = new JSONObject(true);
+							pagination.put(JSONResponse.KEY_TOTAL, total);
+							pagination.put(JSONResponse.KEY_COUNT, count);
+							pagination.put(JSONResponse.KEY_PAGE, page);
+							pagination.put(JSONResponse.KEY_MAX, max);
+							pagination.put(JSONResponse.KEY_MORE, page < max);
+							pagination.put(JSONResponse.KEY_FIRST, page == 0);
+							pagination.put(JSONResponse.KEY_LAST, page == max);
+							putQueryResult(pathPrefix + JSONResponse.KEY_PAGE, pagination);
+
+							if (total <= count*page) {
 								query = JSONRequest.QUERY_TOTAL;//数量不够了，不再往后查询
 							}
 						}
