Server:新增支持自定义主键名getIdKey和用户主键名getUserIdKey

Author: TommyLemon

APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/demo/server/DemoSQLConfig.java

@@ -14,6 +14,9 @@
 
 package apijson.demo.server;
 
+import static zuo.biao.apijson.JSONObject.KEY_ID;
+import static zuo.biao.apijson.JSONObject.KEY_USER_ID;
+
 import java.util.List;
 
 import com.alibaba.fastjson.JSONObject;
@@ -33,19 +36,42 @@
  */
 public class DemoSQLConfig extends AbstractSQLConfig {
 
-	
+
+	public static final Callback SIMPLE_CALLBACK;
+
 	//表名映射，隐藏真实表名，对安全要求很高的表可以这么做
 	static {
 		TABLE_KEY_MAP.put(User.class.getSimpleName(), "apijson_user");
 		TABLE_KEY_MAP.put(Privacy.class.getSimpleName(), "apijson_privacy");
+
+		SIMPLE_CALLBACK = new SimpleCallback() {
+
+			@Override
+			public DemoSQLConfig getSQLConfig(RequestMethod method, String table) {
+				return new DemoSQLConfig(method, table);
+			}
+
+			//			@Override
+			//			public String getIdKey(String schema, String table) {
+			//				return StringUtil.firstCase(table + "Id");  // userId, comemntId ...
+			//				//		return StringUtil.toLowerCase(t) + "_id";  // user_id, comemnt_id ...
+			//				//		return StringUtil.toUpperCase(t) + "_ID";  // USER_ID, COMMENT_ID ...
+			//			}
+
+			@Override
+			public String getUserIdKey(String schema, String table) {
+				return Controller.USER_.equals(table) || Controller.PRIVACY_.equals(table) ? KEY_ID : KEY_USER_ID; // id / userId
+			}
+
+		};
 	}
-	
+
 	//取消注释后，默认的数据库类型会由 MySQL 改为 PostgreSQL
-//	@Override
-//	public String getDatabase() {
-//		String db = super.getDatabase();
-//		return db == null ? DATABASE_POSTGRESQL : db;
-//	}
+	//	@Override
+	//	public String getDatabase() {
+	//		String db = super.getDatabase();
+	//		return db == null ? DATABASE_POSTGRESQL : db;
+	//	}
 
 	@Override
 	public String getDBUri() {
@@ -66,6 +92,18 @@ public String getSchema() {
 		return StringUtil.isEmpty(s, true) ? "sys" : s; //TODO 改成你自己的
 	}
 
+
+	@Override
+	public String getIdKey() {
+		return SIMPLE_CALLBACK.getIdKey(getSchema(), getTable());
+	}
+
+	@Override
+	public String getUserIdKey() {
+		return SIMPLE_CALLBACK.getUserIdKey(getSchema(), getTable());
+	}
+
+
 	public DemoSQLConfig() {
 		this(RequestMethod.GET);
 	}
@@ -88,18 +126,7 @@ public DemoSQLConfig(RequestMethod method, int count, int page) {
 	 * @throws Exception 
 	 */
 	public static SQLConfig newSQLConfig(RequestMethod method, String table, JSONObject request, List<Join> joinList) throws Exception {
-		return newSQLConfig(method, table, request, joinList, new Callback() {
-
-			@Override
-			public DemoSQLConfig getSQLConfig(RequestMethod method, String table) {
-				return new DemoSQLConfig(method, table);
-			}
-			
-			@Override
-			public Object newId(RequestMethod method, String table) {
-				return System.currentTimeMillis(); //为 post 请求提供 id， 只能是 Long 或 String
-			}
-		});
+		return newSQLConfig(method, table, request, joinList, SIMPLE_CALLBACK);
 	}
 
 

APIJSON-Java-Server/APIJSONBoot/src/main/java/apijson/demo/server/DemoVerifier.java

@@ -56,21 +56,6 @@ public DemoParser createParser() {
 		return parser;
 	}
 
-	@Override
-	public String getVisitorKey() {
-		return Controller.USER_;
-	}
-
-	@Override
-	public String getVisitorIdKey() {
-		return Controller.USER_ID;
-	}
-
-	@Override
-	public String getVisitorIdKey(String table) {
-		return Controller.USER_.equals(table) || Controller.PRIVACY_.equals(table) ? Controller.ID : getVisitorIdKey();
-	}
-
 	/**登录校验
 	 * @author 
 	 * @modifier Lemon

APIJSON-Java-Server/APIJSONFinal/src/main/java/apijson/demo/server/DemoVerifier.java

@@ -26,6 +26,7 @@
 import zuo.biao.apijson.MethodAccess;
 import zuo.biao.apijson.NotNull;
 import zuo.biao.apijson.server.AbstractVerifier;
+import zuo.biao.apijson.server.SQLConfig;
 import zuo.biao.apijson.server.Visitor;
 
 
@@ -57,18 +58,13 @@ public DemoParser createParser() {
 	}
 
 	@Override
-	public String getVisitorKey() {
+	public String getVisitorKey(SQLConfig config) {
 		return Controller.USER_;
 	}
 
 	@Override
-	public String getVisitorIdKey() {
-		return Controller.USER_ID;
-	}
-
-	@Override
-	public String getVisitorIdKey(String table) {
-		return Controller.USER_.equals(table) || Controller.PRIVACY_.equals(table) ? Controller.ID : getVisitorIdKey();
+	public String getVisitorIdKey(SQLConfig config) {
+		return Controller.USER_.equals(config.getTable()) || Controller.PRIVACY_.equals(config.getTable()) ? Controller.ID : Controller.USER_ID;
 	}
 
 	/**登录校验

APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractParser.java

@@ -695,6 +695,10 @@ public JSONArray onArrayParse(JSONObject request, String parentPath, String name
 			query2 = JSONRequest.QUERY_TABLE;
 		}
 		else {
+//			if (isSubquery) {
+//				throw new IllegalArgumentException("子查询内不支持传 " + JSONRequest.KEY_QUERY + "!");
+//			}
+			
 			switch (query) {
 			case "0":
 			case "TABLE":

APIJSON-Java-Server/APIJSONORM/src/main/java/zuo/biao/apijson/server/AbstractSQLConfig.java

@@ -21,12 +21,10 @@
 import static zuo.biao.apijson.JSONObject.KEY_GROUP;
 import static zuo.biao.apijson.JSONObject.KEY_HAVING;
 import static zuo.biao.apijson.JSONObject.KEY_ID;
-import static zuo.biao.apijson.JSONObject.KEY_ID_IN;
 import static zuo.biao.apijson.JSONObject.KEY_ORDER;
 import static zuo.biao.apijson.JSONObject.KEY_ROLE;
 import static zuo.biao.apijson.JSONObject.KEY_SCHEMA;
 import static zuo.biao.apijson.JSONObject.KEY_USER_ID;
-import static zuo.biao.apijson.JSONObject.KEY_USER_ID_IN;
 import static zuo.biao.apijson.RequestMethod.DELETE;
 import static zuo.biao.apijson.RequestMethod.GET;
 import static zuo.biao.apijson.RequestMethod.GETS;
@@ -80,6 +78,16 @@ public abstract class AbstractSQLConfig implements SQLConfig {
 		TABLE_KEY_MAP.put(Column.class.getSimpleName(), Column.TAG);
 	}
 
+	@NotNull
+	@Override
+	public String getIdKey() {
+		return KEY_ID;
+	}
+	@NotNull
+	@Override
+	public String getUserIdKey() {
+		return KEY_USER_ID;
+	}
 
 
 	private Object id; //Table的id
@@ -914,16 +922,22 @@ else if (andList == null || andList.contains(key) == false) {
 					andList = new ArrayList<>();
 				}
 				else if (prior && andList.isEmpty() == false) {
-					if (andList.contains(KEY_ID)) {
+					
+					String idKey = getIdKey();
+					String idInKey = idKey + "{}";
+					String userIdKey = getUserIdKey();
+					String userIdInKey = userIdKey + "{}";
+					
+					if (andList.contains(idKey)) {
 						i ++;
 					}
-					if (andList.contains(KEY_ID_IN)) {
+					if (andList.contains(idInKey)) {
 						i ++;
 					}
-					if (andList.contains(KEY_USER_ID)) {
+					if (andList.contains(userIdKey)) {
 						i ++;
 					}
-					if (andList.contains(KEY_USER_ID_IN)) {
+					if (andList.contains(userIdInKey)) {
 						i ++;
 					}
 				}
@@ -1689,9 +1703,10 @@ public String getSetString(RequestMethod method, Map<String, Object> content, bo
 			int keyType = 0;// 0 - =; 1 - +, 2 - -
 			Object value;
 
+			String idKey = getIdKey();
 			for (String key : set) {
 				//避免筛选到全部	value = key == null ? null : content.get(key);
-				if (key == null || KEY_ID.equals(key)) {
+				if (key == null || idKey.equals(key)) {
 					continue;
 				}
 
@@ -1951,21 +1966,28 @@ public static AbstractSQLConfig newSQLConfig(RequestMethod method, String table,
 		if (request.isEmpty()) { // User:{} 这种空内容在查询时也有效
 			return config; //request.remove(key); 前都可以直接return，之后必须保证 put 回去
 		}
+		
+		String schema = request.getString(KEY_SCHEMA);
+		
+		String idKey = callback.getIdKey(schema, table);
+		String idInKey = idKey + "{}";
+		String userIdKey = callback.getUserIdKey(schema, table);
+		String userIdInKey = userIdKey + "{}";
 
-		Object idIn = request.get(KEY_ID_IN); //可能是 id{}:">0"
+		Object idIn = request.get(idInKey); //可能是 id{}:">0"
 
 		if (method == POST) {
 			if (idIn != null) { //不能在这里确定[]的长度，只能在外面传进来
 				if ((idIn instanceof List == false) || ((List<?>)idIn).isEmpty()) { // id{}:[] 表示同时插入多条记录
 					throw new IllegalArgumentException("POST请求，生成多条记录请用 id{}:[] ！ [] 类型为JSONArray且不能为空！");
 				}
-			} else if (request.get(KEY_ID) == null) {
-				request.put(KEY_ID, callback.newId(method, table));
+			} else if (request.get(idKey) == null) {
+				request.put(idKey, callback.newId(method, table));
 			}
 		}
 
 		//对id和id{}处理，这两个一定会作为条件
-		Object id = request.get(KEY_ID);
+		Object id = request.get(idKey);
 		if (id != null) { //null无效
 			if (id instanceof Number) { 
 				if (((Number) id).longValue() <= 0) { //一定没有值
@@ -1979,7 +2001,7 @@ else if (id instanceof String) {
 			}
 			else if (id instanceof Subquery) {}
 			else {
-				throw new IllegalArgumentException(KEY_ID + ":value 中 value 的类型只能是 Long , String 或 Subquery ！");
+				throw new IllegalArgumentException(idKey + ":value 中 value 的类型只能是 Long , String 或 Subquery ！");
 			}
 
 			if (idIn instanceof List) { //共用idIn场景少性能差
@@ -1992,7 +2014,6 @@ else if (id instanceof Subquery) {}
 
 		String role = request.getString(KEY_ROLE);
 		String database = request.getString(KEY_DATABASE);
-		String schema = request.getString(KEY_SCHEMA);
 		String combine = request.getString(KEY_COMBINE);
 		Subquery from = (Subquery) request.get(KEY_FROM);
 		String column = request.getString(KEY_COLUMN);
@@ -2001,8 +2022,8 @@ else if (id instanceof Subquery) {}
 		String order = request.getString(KEY_ORDER);
 
 		//强制作为条件且放在最前面优化性能
-		request.remove(KEY_ID);
-		request.remove(KEY_ID_IN);
+		request.remove(idKey);
+		request.remove(idInKey);
 		//关键词
 		request.remove(KEY_ROLE);
 		request.remove(KEY_DATABASE);
@@ -2043,7 +2064,7 @@ else if (id instanceof Subquery) {}
 					throw new Exception("服务器内部错误:\n" + TAG
 							+ " newSQLConfig  values == null || values.length != columns.length !");
 				}
-				column = KEY_ID + "," + StringUtil.getString(columns); //set已经判断过不为空
+				column = idKey + "," + StringUtil.getString(columns); //set已经判断过不为空
 				final int size = columns.length + 1; //以key数量为准
 
 				List<List<Object>> valuess = new ArrayList<>(idList.size()); // [idList.size()][]
@@ -2072,12 +2093,12 @@ else if (id instanceof Subquery) {}
 
 			//强制作为条件且放在最前面优化性能
 			if (id != null) {
-				tableWhere.put(KEY_ID, id);
-				andList.add(KEY_ID);
+				tableWhere.put(idKey, id);
+				andList.add(idKey);
 			}
 			if (idIn != null) {
-				tableWhere.put(KEY_ID_IN, idIn);
-				andList.add(KEY_ID_IN);
+				tableWhere.put(idInKey, idIn);
+				andList.add(idInKey);
 			}
 
 			String[] ws = StringUtil.split(combine);
@@ -2119,9 +2140,9 @@ else if (w.startsWith("!")) {
 							throw new IllegalArgumentException(table + ":{} 里的 @combine:value 中的value里条件 " + ws[i] + " 不合法！不允许为空值！");
 						}
 						else {
-							if (KEY_ID.equals(w) || KEY_ID_IN.equals(w) || KEY_USER_ID.equals(w) || KEY_USER_ID_IN.equals(w)) {
+							if (idKey.equals(w) || idInKey.equals(w) || userIdKey.equals(w) || userIdInKey.equals(w)) {
 								throw new UnsupportedOperationException(table + ":{} 里的 @combine:value 中的value里 " + ws[i] + " 不合法！"
-										+ "不允许传 [" + KEY_ID + ", " + KEY_ID_IN + ", " + KEY_USER_ID + ", " + KEY_USER_ID_IN + "] 其中任何一个！");
+										+ "不允许传 [" + idKey + ", " + idInKey + ", " + userIdKey + ", " + userIdInKey + "] 其中任何一个！");
 							}
 						}
 
@@ -2203,8 +2224,8 @@ else if (whereList != null && whereList.contains(key)) {
 
 		//后面还可能用到，要还原
 		//id或id{}条件
-		request.put(KEY_ID, id);
-		request.put(KEY_ID_IN, idIn);
+		request.put(idKey, id);
+		request.put(idInKey, idIn);
 		//关键词
 		request.put(KEY_ROLE, role);
 		request.put(KEY_DATABASE, database);
@@ -2385,20 +2406,55 @@ else if (key.endsWith("-")) {//缩减，PUT查询时处理
 	}
 
 
-	public interface Callback {
+	public static interface Callback {
 		/**获取 SQLConfig 的实例
 		 * @param method
 		 * @param table
 		 * @return
 		 */
 		AbstractSQLConfig getSQLConfig(RequestMethod method, String table);
 
+
 		/**为 post 请求新建 id， 只能是 Long 或 String
 		 * @param method
 		 * @param table
 		 * @return
 		 */
 		Object newId(RequestMethod method, String table);
+		
+		/**获取主键名
+		 * @param schema
+		 * @param table
+		 * @return
+		 */
+		String getIdKey(String schema, String table);
+		
+		/**获取 User 的主键名
+		 * @param schema
+		 * @param table
+		 * @return
+		 */
+		String getUserIdKey(String schema, String table);
+	}
+	
+	public static abstract class SimpleCallback implements Callback {
+
+
+		@Override
+		public Object newId(RequestMethod method, String table) {
+			return System.currentTimeMillis();
+		}
+
+		@Override
+		public String getIdKey(String schema, String table) {
+			return KEY_ID;
+		}
+
+		@Override
+		public String getUserIdKey(String schema, String table) {
+			return KEY_USER_ID;
+		}
+		
 	}
 
 }