Server:完成 key@:{} 对应的 = 类型子查询

TommyLemon · TommyLemon · commit c8e8d87dd823 · 2019-01-07T01:02:28.000+08:00
diff --git a/APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/server/AbstractObjectParser.java b/APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/server/AbstractObjectParser.java
@@ -349,7 +349,10 @@ public boolean onParse(@NotNull String key, @NotNull Object value) throws Except
 					throw new IllegalArgumentException("子查询 " + path + "/" + key + ":{ from:value } 中 value 对应的主表对象不存在！");
 				}
 //				
-				SQLConfig cfg = arrObj == null ? null : (SQLConfig) arrObj.get(AbstractParser.KEY_CONFIG);
+				SQLConfig cfg = (SQLConfig) arrObj.get(AbstractParser.KEY_CONFIG);
+				if (cfg == null) {
+					throw new NotExistException(TAG + ".onParse  cfg == null");
+				}
 				
 				Subquery s = new Subquery();
 				s.setPath(path);
diff --git a/APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/server/AbstractSQLConfig.java b/APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/server/AbstractSQLConfig.java
@@ -1140,7 +1140,7 @@ else if (key.endsWith("<>")) {
 
 
 	@JSONField(serialize = false)
-	public String getEqualString(String key, Object value) {
+	public String getEqualString(String key, Object value) throws Exception {
 		if (value instanceof Collection<?>) {
 			throw new IllegalArgumentException(key + ":value 中value不合法！非PUT请求只支持 [Boolean, Number, String] 内的类型 ！");
 		}
@@ -1152,7 +1152,8 @@ public String getEqualString(String key, Object value) {
 		if (StringUtil.isName(key) == false) {
 			throw new IllegalArgumentException(key + ":value 中key不合法！不支持 ! 以外的逻辑符 ！");
 		}
-		return getKey(key) + (not ? "!=" : "=") + getValue(value);
+		
+		return getKey(key) + (not ? "!=" : "=") + (value instanceof Subquery ? getSubqueryString((Subquery) value) : getValue(value));
 	}
 
 	public String getKey(String key) {
@@ -1852,13 +1853,13 @@ else if (id instanceof String) {
 					throw new NotExistException(TAG + ": newSQLConfig StringUtil.isEmpty(" + table + ".id, true)");
 				}
 			}
+			else if (id instanceof Subquery) {}
 			else {
-				throw new IllegalArgumentException(KEY_ID + ":value 中 value 的类型只能是 Long 或 String ！");
+				throw new IllegalArgumentException(KEY_ID + ":value 中 value 的类型只能是 Long , String 或 Subquery ！");
 			}
 
-			if (idIn != null && idIn instanceof List) { //共用idIn场景少性能差
-				if (idIn != null && ((List<?>) idIn).contains(id) == false) {//empty有效  BaseModel.isEmpty(idIn) == false) {
-					Log.w(TAG, "newSQLConfig  id > 0 >> idInObj != null && idInObj.contains(id) == false >> return null;");
+			if (idIn instanceof List) { //共用idIn场景少性能差
+				if (((List<?>) idIn).contains(id) == false) {//empty有效  BaseModel.isEmpty(idIn) == false) {
 					throw new NotExistException(TAG + ": newSQLConfig  idIn != null && ((JSONArray) idIn).contains(id) == false");
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -1140,7 +1140,7 @@ else if (key.endsWith("<>")) {`
`1140`	`1140`
`1141`	`1141`
`1142`	`1142`	`@JSONField(serialize = false)`
`1143`		`- public String getEqualString(String key, Object value) {`
	`1143`	`+ public String getEqualString(String key, Object value) throws Exception {`
`1144`	`1144`	`if (value instanceof Collection<?>) {`
`1145`	`1145`	`throw new IllegalArgumentException(key + ":value 中value不合法！非PUT请求只支持 [Boolean, Number, String] 内的类型！");`
`1146`	`1146`	`}`
`@@ -1152,7 +1152,8 @@ public String getEqualString(String key, Object value) {`
`1152`	`1152`	`if (StringUtil.isName(key) == false) {`
`1153`	`1153`	`throw new IllegalArgumentException(key + ":value 中key不合法！不支持 ! 以外的逻辑符！");`
`1154`	`1154`	`}`
`1155`		`- return getKey(key) + (not ? "!=" : "=") + getValue(value);`
	`1155`	`+`
	`1156`	`+ return getKey(key) + (not ? "!=" : "=") + (value instanceof Subquery ? getSubqueryString((Subquery) value) : getValue(value));`
`1156`	`1157`	`}`
`1157`	`1158`
`1158`	`1159`	`public String getKey(String key) {`
`@@ -1852,13 +1853,13 @@ else if (id instanceof String) {`
`1852`	`1853`	`throw new NotExistException(TAG + ": newSQLConfig StringUtil.isEmpty(" + table + ".id, true)");`
`1853`	`1854`	`}`
`1854`	`1855`	`}`
	`1856`	`+ else if (id instanceof Subquery) {}`
`1855`	`1857`	`else {`
`1856`		`- throw new IllegalArgumentException(KEY_ID + ":value 中 value 的类型只能是 Long 或 String ！");`
	`1858`	`+ throw new IllegalArgumentException(KEY_ID + ":value 中 value 的类型只能是 Long , String 或 Subquery ！");`
`1857`	`1859`	`}`
`1858`	`1860`
`1859`		`- if (idIn != null && idIn instanceof List) { //共用idIn场景少性能差`
`1860`		`- if (idIn != null && ((List<?>) idIn).contains(id) == false) {//empty有效 BaseModel.isEmpty(idIn) == false) {`
`1861`		`- Log.w(TAG, "newSQLConfig id > 0 >> idInObj != null && idInObj.contains(id) == false >> return null;");`
	`1861`	`+ if (idIn instanceof List) { //共用idIn场景少性能差`
	`1862`	`+ if (((List<?>) idIn).contains(id) == false) {//empty有效 BaseModel.isEmpty(idIn) == false) {`
`1862`	`1863`	`throw new NotExistException(TAG + ": newSQLConfig idIn != null && ((JSONArray) idIn).contains(id) == false");`
`1863`	`1864`	`}`
`1864`	`1865`	`}`