Server:支持String类型的id

Author: TommyLemon

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

@@ -81,7 +81,7 @@ public abstract class AbstractSQLConfig implements SQLConfig {
 
 
 
-	private long id; //Table的id
+	private Object id; //Table的id
 	private RequestMethod method; //操作方法
 	private boolean prepared = true; //预编译
 	private boolean main = true;
@@ -161,11 +161,11 @@ public AbstractSQLConfig setMain(boolean main) {
 
 
 	@Override
-	public long getId() {
+	public Object getId() {
 		return id;
 	}
 	@Override
-	public AbstractSQLConfig setId(long id) {
+	public AbstractSQLConfig setId(Object id) {
 		this.id = id;
 		return this;
 	}
@@ -1739,7 +1739,7 @@ public String getJoinString() throws Exception {
 		return joinOns;
 	}
 
-	/**获取查询配置
+	/**新建SQL配置
 	 * @param table
 	 * @param request
 	 * @return
@@ -1772,14 +1772,24 @@ public static AbstractSQLConfig newSQLConfig(RequestMethod method, String table,
 		}
 
 		//对id和id{}处理，这两个一定会作为条件
-		Long id = request.getLong(KEY_ID);
+		Object id = request.get(KEY_ID);
 		if (id != null) { //null无效
-			if (id <= 0) { //一定没有值
-				throw new NotExistException(TAG + ": newSQLConfig " + table + ".id <= 0");
+			if (id instanceof Number) { 
+				if (((Number) id).longValue() <= 0) { //一定没有值
+					throw new NotExistException(TAG + ": newSQLConfig " + table + ".id <= 0");
+				}
+			}
+			else if (id instanceof String) {
+				if (StringUtil.isEmpty(id, true)) { //一定没有值
+					throw new NotExistException(TAG + ": newSQLConfig StringUtil.isEmpty(" + table + ".id, true)");
+				}
+			}
+			else {
+				throw new IllegalArgumentException(KEY_ID + ":value 中 value 的类型只能是 Long 或 String ！");
 			}
 
-			if (idIn != null && idIn instanceof List) { //共用idArr场景少性能差
-				if (idIn != null && ((List<?>) idIn).contains(id) == false) {//empty有效  BaseModel.isEmpty(idArr) == false) {
+			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;");
 					throw new NotExistException(TAG + ": newSQLConfig  idIn != null && ((JSONArray) idIn).contains(id) == false");
 				}
@@ -1983,7 +1993,7 @@ else if (whereList != null && whereList.contains(key)) {
 		config.setColumn(cs);
 		config.setWhere(tableWhere);					
 
-		config.setId(id == null ? 0 : id);
+		config.setId(id);
 		//在	tableWhere 第0个		config.setIdIn(idIn);
 
 		config.setRole(role);

APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/server/AbstractSQLExecutor.java

@@ -161,7 +161,7 @@ public JSONObject execute(SQLConfig config) throws Exception {
 					, updateCount > 0 ? JSONResponse.MSG_SUCCEED : "没权限访问或对象不存在！");
 
 			//id,id{}至少一个会有，一定会返回，不用抛异常来阻止关联写操作时前面错误导致后面无条件执行！
-			if (config.getId() > 0) {
+			if (config.getId() != null) {
 				result.put(JSONResponse.KEY_ID, config.getId());
 			} else {
 				result.put(JSONResponse.KEY_ID + "[]", config.getWhere(JSONResponse.KEY_ID_IN, true));

APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/server/SQLConfig.java

@@ -87,8 +87,8 @@ public interface SQLConfig {
 	RequestMethod getMethod();
 	SQLConfig setMethod(RequestMethod method);
 
-	long getId();
-	SQLConfig setId(long id);
+	Object getId();
+	SQLConfig setId(Object id);
 
 	RequestRole getRole();
 	SQLConfig setRole(RequestRole role);

APIJSON-Java-Server/APIJSONLibrary/src/main/java/zuo/biao/apijson/server/Structure.java

@@ -142,13 +142,12 @@ public JSONObject onParseJSONObject(String key, JSONObject tobj, JSONObject robj
 	private static void verifyId(@NotNull String method, @NotNull String name, @NotNull String key
 			, @NotNull JSONObject robj, @NotNull String idKey, final int maxUpdateCount, boolean atLeastOne) {
 		//单个修改或删除
-		Object id = null;
-		try {
-			id = robj.getLong(idKey); //如果必须传 id ，可在Request表中配置NECESSARY
-		} catch (Exception e) {
+		Object id = robj.get(idKey); //如果必须传 id ，可在Request表中配置NECESSARY
+		if (id != null && id instanceof Number == false && id instanceof String == false) {
 			throw new IllegalArgumentException(method + "请求，" + name + "/" + key
-					+ " 里面的 " + idKey + ":value 中value的类型只能是 Long ！");
+					+ " 里面的 " + idKey + ":value 中value的类型只能是 Long 或 String ！");
 		}
+		
 
 		//批量修改或删除
 		String idInKey = idKey + "{}";
@@ -173,11 +172,10 @@ private static void verifyId(@NotNull String method, @NotNull String name, @NotN
 			//解决 id{}: ["1' OR 1='1'))--"] 绕过id{}限制
 			//new ArrayList<Long>(idIn) 不能检查类型，Java泛型擦除问题，居然能把 ["a"] 赋值进去还不报错
 			for (int i = 0; i < idIn.size(); i++) {
-				try {
-					idIn.getLong(i);
-				} catch (Exception e) {
+				Object o = idIn.get(i);
+				if (o != null && o instanceof Number == false && o instanceof String == false) {
 					throw new IllegalArgumentException(method + "请求，" + name + "/" + key
-							+ " 里面的 " + idInKey + ":[] 中所有项的类型都只能是Long！");
+							+ " 里面的 " + idInKey + ":[] 中所有项的类型都只能是 Long 或 String ！");
 				}
 			}
 		}