mirrors/APIJSON
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

全能 CRUD: "@gets": { "User":"" // 空字符串转为与 key 同名值 User }，"@put": { "Moment":{} // 自动加 "tag":"Moment" }，@post:"Comment[]" 自动转为 "@post":{ "Comment[]":"Comment:[]" }

Browse Source
This commit is contained in:
TommyLemon 2023-10-22 22:14:48 +08:00
parent 2b0d612770
commit 790f8c5c1a
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
APIJSONORM/src/main/java/apijson/orm/AbstractParser.java
View File

@ -2190,9 +2190,10 @@ public abstract class AbstractParser<T extends Object> implements Parser<T>, Par
throw new IllegalArgumentException("对象名重复,请添加别名区分 ! 重复对象名为: " + key); throw new IllegalArgumentException("对象名重复,请添加别名区分 ! 重复对象名为: " + key);
} }
boolean isPost = apijson.orm.JSONRequest.KEY_POST.equals(key);
// @post、@get 等 RequestMethod // @post、@get 等 RequestMethod
try { try {
RequestMethod keyMethod = apijson.orm.JSONRequest.KEY_METHOD_ENUM_MAP.get(key); RequestMethod keyMethod = isPost ? RequestMethod.POST : JSONRequest.KEY_METHOD_ENUM_MAP.get(key);
if (keyMethod != null) { if (keyMethod != null) {
// 如果不匹配,异常不处理即可 // 如果不匹配,异常不处理即可
removeTmpKeys.add(key); removeTmpKeys.add(key);
@ -2209,7 +2210,9 @@ public abstract class AbstractParser<T extends Object> implements Parser<T>, Par
if (obj.containsKey(tbl)) { if (obj.containsKey(tbl)) {
throw new ConflictException(key + ": value 中 " + tbl + " 已经存在，不能重复！"); throw new ConflictException(key + ": value 中 " + tbl + " 已经存在，不能重复！");
} }
obj.put(tbl, new JSONObject(true));
obj.put(tbl, isPost && JSONRequest.isTableArray(tbl)
? tbl.substring(0, tbl.length() - 2) + ":[]" : "");
} }
} }
} }
@ -2234,15 +2237,16 @@ public abstract class AbstractParser<T extends Object> implements Parser<T>, Par
JSONObject objAttrJson = objVal instanceof JSONObject ? obj.getJSONObject(objKey) : null; JSONObject objAttrJson = objVal instanceof JSONObject ? obj.getJSONObject(objKey) : null;
if (objAttrJson == null) { if (objAttrJson == null) {
if (objVal instanceof String) { if (objVal instanceof String) {
objAttrMap.put(JSONRequest.KEY_TAG, objVal); objAttrMap.put(JSONRequest.KEY_TAG, "".equals(objVal) ? objKey : objVal);
} }
else { else {
throw new IllegalArgumentException(key + ": { " + objKey + ": value 中 value 类型错误，只能是 String 或 JSONObject {} ！"); throw new IllegalArgumentException(key + ": { " + objKey + ": value 中 value 类型错误，只能是 String 或 JSONObject {} ！");
} }
} }
else { else {
Set<Entry<String, Object>> objSet = objAttrJson == null ? new HashSet<>() : objAttrJson.entrySet(); Set<Entry<String, Object>> objSet = objAttrJson.entrySet();
boolean hasTag = false;
for (Entry<String, Object> entry : objSet) { for (Entry<String, Object> entry : objSet) {
String objAttrKey = entry == null ? null : entry.getKey(); String objAttrKey = entry == null ? null : entry.getKey();
if (objAttrKey == null) { if (objAttrKey == null) {
@ -2255,13 +2259,21 @@ public abstract class AbstractParser<T extends Object> implements Parser<T>, Par
case apijson.JSONObject.KEY_DATABASE: case apijson.JSONObject.KEY_DATABASE:
case JSONRequest.KEY_VERSION: case JSONRequest.KEY_VERSION:
case apijson.JSONObject.KEY_ROLE: case apijson.JSONObject.KEY_ROLE:
objAttrMap.put(objAttrKey, entry.getValue());
break;
case JSONRequest.KEY_TAG: case JSONRequest.KEY_TAG:
hasTag = true;
objAttrMap.put(objAttrKey, entry.getValue()); objAttrMap.put(objAttrKey, entry.getValue());
break; break;
default: default:
break; break;
} }
} }
if (hasTag == false) {
objAttrMap.put(JSONRequest.KEY_TAG, isPost && JSONRequest.isTableArray(objKey)
? objKey.substring(0, objKey.length() - 2) + ":[]" : objKey);
}
} }
} }
continue; continue;
@ -2376,7 +2388,7 @@ public abstract class AbstractParser<T extends Object> implements Parser<T>, Par
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
throw new Exception(e); throw new Exception(e); // 包装一层只是为了打印日志？看起来没必要
} }
} }