新增db.page(countSql,sql)方法

ssssssss-team · Oct 10, 2021 · aacecc7 · aacecc7
1 parent cec9bfb
commit aacecc7
Showing 1 changed file with 25 additions and 7 deletions.
diff --git a/magic-api/src/main/java/org/ssssssss/magicapi/modules/SQLModule.java b/magic-api/src/main/java/org/ssssssss/magicapi/modules/SQLModule.java
@@ -430,21 +430,39 @@ public String getDataSourceName() {
 		return this.dataSourceNode == null ? "unknown" : dataSourceNode.getName();
 	}
 
-	@UnableCall
-	public Object page(BoundSql boundSql, Page page) {
-		assertDatasourceNotNull();
-		Dialect dialect = dataSourceNode.getDialect(dialectAdapter);
-		BoundSql countBoundSql = boundSql.copy(dialect.getCountSql(boundSql.getSql()));
-		int count = countBoundSql.getCacheValue(this.sqlInterceptors, () -> dataSourceNode.getJdbcTemplate().query(countBoundSql.getSql(), new SingleRowResultSetExtractor<>(Integer.class), countBoundSql.getParameters()));
+	/**
+	 * 分页查询（手动传入分页SQL语句）
+	 */
+	@Comment("执行分页查询，分页`SQL`语句手动传入")
+	public Object page(String countSql, String sql){
+		int count = selectInt(new BoundSql(countSql, this));
+		Page page = pageProvider.getPage(MagicScriptContext.get());
+		BoundSql boundSql = new BoundSql(sql, this);
+		return page(count, boundSql, page, null);
+	}
+
+	private Object page(int count, BoundSql boundSql, Page page, Dialect dialect) {
 		List<Map<String, Object>> list = null;
-		if (count > 0) {
+		if(count > 0){
+			if(dialect == null){
+				dialect = dataSourceNode.getDialect(dialectAdapter);
+			}
 			BoundSql pageBoundSql = buildPageBoundSql(dialect, boundSql, page.getOffset(), page.getLimit());
 			list = pageBoundSql.getCacheValue(this.sqlInterceptors, () -> queryForList(pageBoundSql));
 		}
 		RequestEntity requestEntity = RequestContext.getRequestEntity();
 		return resultProvider.buildPageResult(requestEntity, page, count, list);
 	}
 
+	@UnableCall
+	public Object page(BoundSql boundSql, Page page) {
+		assertDatasourceNotNull();
+		Dialect dialect = dataSourceNode.getDialect(dialectAdapter);
+		BoundSql countBoundSql = boundSql.copy(dialect.getCountSql(boundSql.getSql()));
+		int count = countBoundSql.getCacheValue(this.sqlInterceptors, () -> selectInt(countBoundSql));
+		return page(count, boundSql, page, dialect);
+	}
+
 	/**
 	 * 查询int值
 	 */