Visitar URL original
Update AbstractObjectParser.java by 330233789 · Pull Request #119 · APIJSON/APIJSON · GitHub
Skip to content

Update AbstractObjectParser.java #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TommyLemon merged 2 commits into from
Feb 27, 2020
Merged

Update AbstractObjectParser.java #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8bd133f
Update AbstractObjectParser.java
330233789 Feb 26, 2020
692c9fc
解决批量新增打包编译问题，完善git忽略文件
330233789 Feb 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 32 additions & 4 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/
30 changes: 28 additions & 2 deletions ...ON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractObjectParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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 &&

@TommyLemon TommyLemon Feb 26, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

POST 未被 import 进来直接使用，编译报错

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"));

@TommyLemon TommyLemon Feb 26, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"count" 已有 JSONRequst.KEY_COUNT 常量，建议替换

response.put(key, before);
}else{
response.put(key, result);
}
} else {
//只要有一条失败，则抛出异常，全部失败
throw new RuntimeException(key + "," + valueArray.getJSONObject(i) +",新增失败!");

@TommyLemon TommyLemon Feb 26, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

建议根据 JSONResponse.KEY_CODE 及 JSONResponse.KEY_MSG 改为更准确的 Exeption，方便排查错误

}
}
}
index ++;
} else if (method == PUT && value instanceof JSONArray
&& (whereList == null || whereList.contains(key) == false)) {//PUT JSONArray
onPUTArrayParse(key, (JSONArray) value);
}
Expand Down