Update AbstractObjectParser.java #119
+60
−6
| @@ -1,8 +1,36 @@ | ||
| .DS_Store | ||
| .idea | ||
| .gradle | ||
| yarn.lock | ||
| *.project | ||
|
|
||
| HELP.md | ||
| target/ | ||
| !.mvn/wrapper/maven-wrapper.jar | ||
| !**/src/main/** | ||
| !**/src/test/** | ||
|
|
||
| ### STS ### | ||
| .apt_generated | ||
| .classpath | ||
| .factorypath | ||
| .project | ||
| .settings | ||
| .springBeans | ||
| .sts4-cache | ||
|
|
||
| yarn.lock | ||
| *.classpath | ||
| *.project | ||
| ### IntelliJ IDEA ### | ||
| .idea | ||
| *.iws | ||
| *.iml | ||
| *.ipr | ||
|
|
||
| ### NetBeans ### | ||
| /nbproject/private/ | ||
| /nbbuild/ | ||
| /dist/ | ||
| /nbdist/ | ||
| /.nb-gradle/ | ||
| build/ | ||
|
|
||
| ### VS Code ### | ||
| .vscode/ |
| @@ -17,6 +17,7 @@ | ||
| import static zuo.biao.apijson.JSONObject.KEY_COMBINE; | ||
| import static zuo.biao.apijson.JSONObject.KEY_DROP; | ||
| import static zuo.biao.apijson.JSONObject.KEY_TRY; | ||
| import static zuo.biao.apijson.RequestMethod.POST; | ||
| import static zuo.biao.apijson.RequestMethod.PUT; | ||
| import static zuo.biao.apijson.server.SQLConfig.TYPE_ITEM; | ||
|
|
||
| @@ -240,8 +241,33 @@ public AbstractObjectParser parse() throws Exception { | ||
| response.put(key, onChildParse(index, key, (JSONObject)value)); | ||
| index ++; | ||
| } | ||
| } | ||
| else if (method == PUT && value instanceof JSONArray | ||
| } else if (value instanceof JSONArray && method == POST && | ||
|
||
| key.startsWith("@") == false && key.endsWith("@") == false) {//JSONArray，批量新增，往下一级提取 | ||
| JSONArray valueArray = (JSONArray)value; | ||
|
|
||
| for (int i = 0; i < valueArray.size(); i++) { | ||
| if (childMap != null) {//添加到childMap，最后再解析 | ||
| childMap.put(key, valueArray.getJSONObject(i)); | ||
| } | ||
| else {//直接解析并替换原来的，[]:{} 内必须直接解析，否则会因为丢掉count等属性，并且total@:"/[]/total"必须在[]:{} 后！ | ||
| JSONObject result = (JSONObject)onChildParse(index, key, valueArray.getJSONObject(i)); | ||
| //合并结果 | ||
| JSONObject before = (JSONObject)response.get(key); | ||
| if(result.get("code").equals(200)){ | ||
| if(before!=null){ | ||
| before.put("count",before.getInteger("count")+result.getInteger("count")); | ||
|
||
| response.put(key, before); | ||
| }else{ | ||
| response.put(key, result); | ||
| } | ||
| } else { | ||
| //只要有一条失败，则抛出异常，全部失败 | ||
| throw new RuntimeException(key + "," + valueArray.getJSONObject(i) +",新增失败!"); | ||
|
||
| } | ||
| } | ||
| } | ||
| index ++; | ||
| } else if (method == PUT && value instanceof JSONArray | ||
| && (whereList == null || whereList.contains(key) == false)) {//PUT JSONArray | ||
| onPUTArrayParse(key, (JSONArray) value); | ||
| } | ||
ProTip!
Use n and p to navigate between commits in a pull request.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
POST 未被 import 进来直接使用，编译报错