Mapper接口和EntityMapper返回List<T>的查询，增加默认的order by支持

abel533 · abel533 · commit a65d90c52b12 · 2015-04-05T11:11:51.000+08:00
diff --git a/src/main/java/com/github/abel533/entity/BaseProvider.java b/src/main/java/com/github/abel533/entity/BaseProvider.java
@@ -121,13 +121,15 @@ protected MetaObject getExample(Map<String, Object> params) {
     /**
      * Example条件
      */
-    protected void applyOrderBy(SQL sql, MetaObject example) {
+    protected void applyOrderBy(SQL sql, MetaObject example, String defaultOrderByClause) {
         if (example == null) {
             return;
         }
         Object orderBy = example.getValue("orderByClause");
         if (orderBy != null) {
             sql.ORDER_BY((String) orderBy);
+        } else if (defaultOrderByClause != null && defaultOrderByClause.length() > 0) {
+            sql.ORDER_BY(defaultOrderByClause);
         }
     }
 
diff --git a/src/main/java/com/github/abel533/entity/CommonProvider.java b/src/main/java/com/github/abel533/entity/CommonProvider.java
@@ -65,14 +65,9 @@ public String select(final Map<String, Object> params) {
                     }
                 }
             }
-            StringBuilder orderBy = new StringBuilder();
-            for (EntityHelper.EntityColumn column : entityTable.getEntityClassColumns()) {
-                if (column.getOrderBy() != null) {
-                    orderBy.append(column.getColumn()).append(" ").append(column.getOrderBy()).append(",");
-                }
-            }
-            if (orderBy.length() > 0) {
-                ORDER_BY(orderBy.substring(0, orderBy.length() - 1));
+            StringBuilder orderByClause = EntityHelper.getOrderByClause(entityClass);
+            if (orderByClause.length() > 0) {
+                ORDER_BY(orderByClause.toString());
             }
         }}.toString();
     }
@@ -338,7 +333,7 @@ public String selectByExample(final Map<String, Object> params) {
             SELECT(EntityHelper.getAllColumns(entityClass));
             FROM(entityTable.getName());
             applyWhere(this, example);
-            applyOrderBy(this, example);
+            applyOrderBy(this, example, EntityHelper.getOrderByClause(entityClass).toString());
         }}.toString();
     }
 
diff --git a/src/main/java/com/github/abel533/mapper/MapperProvider.java b/src/main/java/com/github/abel533/mapper/MapperProvider.java
@@ -87,9 +87,9 @@ public SqlNode select(MappedStatement ms) {
                 + tableName(entityClass)));
         //将if添加到<where>
         sqlNodes.add(new WhereSqlNode(ms.getConfiguration(), getAllIfColumnNode(entityClass)));
-        String orderByClause = EntityHelper.getOrderByClause(entityClass);
+        StringBuilder orderByClause = EntityHelper.getOrderByClause(entityClass);
         if (orderByClause.length() > 0) {
-            sqlNodes.add(new StaticTextSqlNode(orderByClause));
+            sqlNodes.add(new StaticTextSqlNode(orderByClause.insert(0, "ORDER BY ").toString()));
         }
         return new MixedSqlNode(sqlNodes);
     }
@@ -426,6 +426,11 @@ public SqlNode selectByExample(MappedStatement ms) {
         sqlNodes.add(ifNullSqlNode);
         IfSqlNode orderByClauseSqlNode = new IfSqlNode(new TextSqlNode("order by ${orderByClause}"), "orderByClause != null");
         sqlNodes.add(orderByClauseSqlNode);
+        StringBuilder orderByClause = EntityHelper.getOrderByClause(entityClass);
+        if (orderByClause.length() > 0) {
+            IfSqlNode defaultOrderByClauseSqlNode = new IfSqlNode(new StaticTextSqlNode(orderByClause.insert(0, "ORDER BY ").toString()), "orderByClause == null");
+            sqlNodes.add(defaultOrderByClauseSqlNode);
+        }
         return new MixedSqlNode(sqlNodes);
     }
 
diff --git a/src/main/java/com/github/abel533/mapperhelper/EntityHelper.java b/src/main/java/com/github/abel533/mapperhelper/EntityHelper.java
@@ -49,6 +49,7 @@ public static class EntityTable {
         private String name;
         private String catalog;
         private String schema;
+        private StringBuilder orderByClause;
         //实体类 => 全部列属性
         private Set<EntityColumn> entityClassColumns;
         //实体类 => 主键信息
@@ -248,20 +249,22 @@ public static EntityTable getEntityTable(Class<?> entityClass) {
      * @param entityClass
      * @return
      */
-    public static String getOrderByClause(Class<?> entityClass){
+    public static StringBuilder getOrderByClause(Class<?> entityClass) {
+        EntityTable table = getEntityTable(entityClass);
+        if (table.orderByClause != null) {
+            return table.orderByClause;
+        }
         StringBuilder orderBy = new StringBuilder();
-        for (EntityHelper.EntityColumn column : getColumns(entityClass)) {
+        for (EntityHelper.EntityColumn column : table.getEntityClassColumns()) {
             if (column.getOrderBy() != null) {
-                if(orderBy.length()!=0){
+                if (orderBy.length() != 0) {
                     orderBy.append(",");
                 }
                 orderBy.append(column.getColumn()).append(" ").append(column.getOrderBy());
             }
         }
-        if (orderBy.length() > 0) {
-            orderBy.insert(0, "ORDER BY ");
-        }
-        return orderBy.toString();
+        table.orderByClause = orderBy;
+        return table.orderByClause;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -121,13 +121,15 @@ protected MetaObject getExample(Map<String, Object> params) {`
`121`	`121`	`/**`
`122`	`122`	`* Example条件`
`123`	`123`	`*/`
`124`		`- protected void applyOrderBy(SQL sql, MetaObject example) {`
	`124`	`+ protected void applyOrderBy(SQL sql, MetaObject example, String defaultOrderByClause) {`
`125`	`125`	`if (example == null) {`
`126`	`126`	`return;`
`127`	`127`	`}`
`128`	`128`	`Object orderBy = example.getValue("orderByClause");`
`129`	`129`	`if (orderBy != null) {`
`130`	`130`	`sql.ORDER_BY((String) orderBy);`
	`131`	`+ } else if (defaultOrderByClause != null && defaultOrderByClause.length() > 0) {`
	`132`	`+ sql.ORDER_BY(defaultOrderByClause);`
`131`	`133`	`}`
`132`	`134`	`}`
`133`	`135`
Original file line number	Diff line number	Diff line change
`@@ -65,14 +65,9 @@ public String select(final Map<String, Object> params) {`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`	`}`
`68`		`- StringBuilder orderBy = new StringBuilder();`
`69`		`- for (EntityHelper.EntityColumn column : entityTable.getEntityClassColumns()) {`
`70`		`- if (column.getOrderBy() != null) {`
`71`		`- orderBy.append(column.getColumn()).append(" ").append(column.getOrderBy()).append(",");`
`72`		`- }`
`73`		`- }`
`74`		`- if (orderBy.length() > 0) {`
`75`		`- ORDER_BY(orderBy.substring(0, orderBy.length() - 1));`
	`68`	`+ StringBuilder orderByClause = EntityHelper.getOrderByClause(entityClass);`
	`69`	`+ if (orderByClause.length() > 0) {`
	`70`	`+ ORDER_BY(orderByClause.toString());`
`76`	`71`	`}`
`77`	`72`	`}}.toString();`
`78`	`73`	`}`
`@@ -338,7 +333,7 @@ public String selectByExample(final Map<String, Object> params) {`
`338`	`333`	`SELECT(EntityHelper.getAllColumns(entityClass));`
`339`	`334`	`FROM(entityTable.getName());`
`340`	`335`	`applyWhere(this, example);`
`341`		`- applyOrderBy(this, example);`
	`336`	`+ applyOrderBy(this, example, EntityHelper.getOrderByClause(entityClass).toString());`
`342`	`337`	`}}.toString();`
`343`	`338`	`}`
`344`	`339`