lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Redkale
2016-10-08 18:42:01 +08:00
parent 65da7118fc
commit fb51997c6b
2 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/org/redkale/source/FilterJoinColumn.java
View File

@@ -34,6 +34,10 @@ public @interface FilterJoinColumn {
* 多个关联字段, 默认使用join表(b)的主键, join表与被join表(a)的字段必须一样 * 多个关联字段, 默认使用join表(b)的主键, join表与被join表(a)的字段必须一样
* 例如: SELECT a.* FROM user a INNER JOIN record b ON a.userid = b.userid AND a.usertype = b.usertype * 例如: SELECT a.* FROM user a INNER JOIN record b ON a.userid = b.userid AND a.usertype = b.usertype
* 那么注解为: @FilterJoinColumn(table = Record.class, columns = {"userid", "usertype"}) * 那么注解为: @FilterJoinColumn(table = Record.class, columns = {"userid", "usertype"})
* <p>
* columns中的字段名如果不一致，可以将两个字段名用短横-连接成一个字段名
* 例如: SELECT a.* FROM user a INNER JOIN record b ON a.userid = b.buyerid AND a.usertype = b.usertype
* 那么注解为: &#64;FilterJoinColumn(table = Record.class, columns = {"userid-buyerid", "usertype"})
* *
* @return 关联字段 * @return 关联字段
*/ */

27
src/org/redkale/source/FilterJoinNode.java
View File

@@ -128,14 +128,23 @@ public class FilterJoinNode extends FilterNode {
if (filter == null && !more.get()) return rs; if (filter == null && !more.get()) return rs;
if (filter != null) { if (filter != null) {
final Predicate<E> inner = filter; final Predicate<E> inner = filter;
final String[][] localJoinColumns = new String[joinColumns.length][2];
for (int i = 0; i < joinColumns.length; i++) {
int pos = joinColumns[i].indexOf('-');
if (pos > 0) {
localJoinColumns[i] = new String[]{joinColumns[i].substring(0, pos), joinColumns[i].substring(pos + 1)};
} else {
localJoinColumns[i] = new String[]{joinColumns[i], joinColumns[i]};
}
}
rs = new Predicate<T>() { rs = new Predicate<T>() {
@Override @Override
public boolean test(final T t) { public boolean test(final T t) {
Predicate<E> joinPredicate = null; Predicate<E> joinPredicate = null;
for (String joinColumn : joinColumns) { for (String[] localJoinColumn : localJoinColumns) {
final Serializable key = cache.getAttribute(joinColumn).get(t); final Serializable key = cache.getAttribute(localJoinColumn[0]).get(t);
final Attribute<E, Serializable> joinAttr = joinCache.getAttribute(joinColumn); final Attribute<E, Serializable> joinAttr = joinCache.getAttribute(localJoinColumn[1]);
Predicate<E> p = (E e) -> key.equals(joinAttr.get(e)); Predicate<E> p = (E e) -> key.equals(joinAttr.get(e));
joinPredicate = joinPredicate == null ? p : joinPredicate.and(p); joinPredicate = joinPredicate == null ? p : joinPredicate.and(p);
} }
@@ -145,9 +154,9 @@ public class FilterJoinNode extends FilterNode {
@Override @Override
public String toString() { public String toString() {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append(" #-- ON ").append(joinColumns[0]).append("=").append(joinClass == null ? "null" : joinClass.getSimpleName()).append(".").append(joinColumns[0]); sb.append(" #-- ON ").append(localJoinColumns[0][0]).append("=").append(joinClass == null ? "null" : joinClass.getSimpleName()).append(".").append(localJoinColumns[0][1]);
for (int i = 1; i < joinColumns.length; i++) { for (int i = 1; i < localJoinColumns.length; i++) {
sb.append(" AND ").append(joinColumns[i]).append("=").append(joinClass == null ? "null" : joinClass.getSimpleName()).append(".").append(joinColumns[i]); sb.append(" AND ").append(localJoinColumns[i][0]).append("=").append(joinClass == null ? "null" : joinClass.getSimpleName()).append(".").append(localJoinColumns[i][1]);
} }
sb.append(" --# ").append(inner.toString()); sb.append(" --# ").append(inner.toString());
return sb.toString(); return sb.toString();
@@ -277,10 +286,12 @@ public class FilterJoinNode extends FilterNode {
if (node.joinClass == null) return null; if (node.joinClass == null) return null;
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
String[] joinColumns = node.joinColumns; String[] joinColumns = node.joinColumns;
int pos = joinColumns[0].indexOf('-');
sb.append(" INNER JOIN ").append(node.joinEntity.getTable(node)).append(" ").append(joinTabalis.get(node.joinClass)) sb.append(" INNER JOIN ").append(node.joinEntity.getTable(node)).append(" ").append(joinTabalis.get(node.joinClass))
.append(" ON ").append(info.getSQLColumn("a", joinColumns[0])).append(" = ").append(node.joinEntity.getSQLColumn(joinTabalis.get(node.joinClass), joinColumns[0])); .append(" ON ").append(info.getSQLColumn("a", pos > 0 ? joinColumns[0].substring(0, pos) : joinColumns[0])).append(" = ").append(node.joinEntity.getSQLColumn(joinTabalis.get(node.joinClass), pos > 0 ? joinColumns[0].substring(pos + 1) : joinColumns[0]));
for (int i = 1; i < joinColumns.length; i++) { for (int i = 1; i < joinColumns.length; i++) {
sb.append(" AND ").append(info.getSQLColumn("a", joinColumns[i])).append(" = ").append(node.joinEntity.getSQLColumn(joinTabalis.get(node.joinClass), joinColumns[i])); pos = joinColumns[i].indexOf('-');
sb.append(" AND ").append(info.getSQLColumn("a", pos > 0 ? joinColumns[i].substring(0, pos) : joinColumns[i])).append(" = ").append(node.joinEntity.getSQLColumn(joinTabalis.get(node.joinClass), pos > 0 ? joinColumns[i].substring(pos + 1) : joinColumns[i]));
} }
return sb; return sb;
} }