Java: 所有 Demo 升级 APIJSON 6.2, apijson-framework 6.2, apijson-column 1… · APIJSON/APIJSON-Demo@23b5c20

@@ -43,7 +43,7 @@

4343

* https://github.com/Tencent/APIJSON/blob/master/%E8%AF%A6%E7%BB%86%E7%9A%84%E8%AF%B4%E6%98%8E%E6%96%87%E6%A1%A3.md#c-1-1%E4%BF%AE%E6%94%B9%E6%95%B0%E6%8D%AE%E5%BA%93%E9%93%BE%E6%8E%A5

4444

* @author Lemon

4545

*/

46-

public class DemoSQLConfig extends APIJSONSQLConfig {

46+

public class DemoSQLConfig extends APIJSONSQLConfig<Long> {

47474848

public DemoSQLConfig() {

4949

super();

@@ -119,7 +119,7 @@ public String getUserIdKey(String database, String schema, String datasource, St

119119

tableColumnMap.put("User", Arrays.asList(StringUtil.split("id,sex,name,tag,head,contactIdList,pictureList,date")));

120120

// 需要对应方法传参也是这样拼接才行,例如 ColumnUtil.compatInputColumn(column, getSQLDatabase() + "-" + getSQLSchema() + "-" + getTable(), getMethod());

121121

tableColumnMap.put("MYSQL-sys-Privacy", Arrays.asList(StringUtil.split("id,certified,phone,balance,_password,_payPassword")));

122-

ColumnUtil.VERSIONED_TABLE_COLUMN_MAP.put(null, tableColumnMap);

122+

ColumnUtil.VERSIONED_TABLE_COLUMN_MAP.put(0, tableColumnMap); // SortedMap 不允许 key = null

123123124124

// 字段名映射配置 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<

125125

Map<String, Map<String, String>> tableKeyColumnMap = new HashMap<>();

@@ -134,7 +134,7 @@ public String getUserIdKey(String database, String schema, String datasource, St

134134

// 需要对应方法传参也是这样拼接才行,例如 ColumnUtil.compatInputKey(super.getKey(key), getSQLDatabase() + "-" + getSQLSchema() + "-" + getTable(), getMethod());

135135

tableKeyColumnMap.put("MYSQL-sys-Privacy", privacyKeyColumnMap);

136136137-

ColumnUtil.VERSIONED_KEY_COLUMN_MAP.put(null, tableKeyColumnMap);

137+

ColumnUtil.VERSIONED_KEY_COLUMN_MAP.put(0, tableKeyColumnMap); // SortedMap 不允许 key = null

138138

// 字段名映射配置 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

139139140140

ColumnUtil.init();

@@ -302,10 +302,12 @@ public String getDBPassword() {

302302

protected void onGetCrossJoinString(Join j) throws UnsupportedOperationException {

303303

// 开启 CROSS JOIN 笛卡尔积联表 super.onGetCrossJoinString(j);

304304

}

305+305306

@Override

306-

protected void onJoinNotRelation(String sql, String quote, Join j, String jt, List<On> onList, On on) {

307-

// 开启 JOIN ON t1.c1 != t2.c2 等不等式关联 super.onJoinNotRelation(sql, quote, j, jt, onList, on);

307+

protected void onJoinNotRelation(String sql, String quote, Join join, String table, List<On> onList, On on) {

308+

// 开启 JOIN ON t1.c1 != t2.c2 等不等式关联 super.onJoinNotRelation(sql, quote, join, table, onList, on);

308309

}

310+309311

@Override

310312

protected void onJoinComplextRelation(String sql, String quote, Join j, String jt, List<On> onList, On on) {

311313

// 开启 JOIN ON t1.c1 LIKE concat('%', t2.c2, '%') 等复杂关联 super.onJoinComplextRelation(sql, quote, j, jt, onList, on);