添加SQL数据集最终计算后SQL控制台输出功能，同时添加ureport.debug参数，用于控制是否向控制台输出SQL以及计算计算时间信息

ureport2-console/src/main/java/com/bstek/ureport/console/designer/DatasourceServletAction.java

@@ -30,6 +30,8 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -275,22 +277,41 @@ public class DatasourceServletAction extends RenderPageServletAction {
 	
 	private String parseSql(String sql,Map<String,Object> parameters){
 		sql=sql.trim();
+		Context context=new Context(applicationContext, parameters);
 		if(sql.startsWith(ExpressionUtils.EXPR_PREFIX) && sql.endsWith(ExpressionUtils.EXPR_SUFFIX)){
 			sql=sql.substring(2, sql.length()-1);
 			Expression expr=ExpressionUtils.parseExpression(sql);
-			Context context=new Context(applicationContext, parameters);
-			ExpressionData<?> exprData=expr.execute(null,null, context);
-			if(exprData instanceof ObjectExpressionData){
-				ObjectExpressionData objExprData=(ObjectExpressionData)exprData;
-				Object obj=objExprData.getData();
-				if(obj!=null){
-					sql=obj.toString();
-					sql=sql.replaceAll("\\\\", "");
-					return sql;
-				}
+			sql=executeSqlExpr(expr,context);
+			return sql;
+		}else{
+			String sqlForUse=sql;
+			Pattern pattern=Pattern.compile("\\$\\{.*?\\}");
+			Matcher matcher=pattern.matcher(sqlForUse);
+			while(matcher.find()){
+				String substr=matcher.group();
+				String sqlExpr=substr.substring(2,substr.length()-1);
+				Expression expr=ExpressionUtils.parseExpression(sqlExpr);
+				String result=executeSqlExpr(expr, context);
+				sqlForUse=sqlForUse.replace(substr, result);
+			}
+			Utils.logToConsole("DESIGN SQL:"+sqlForUse);
+			return sqlForUse;
+		}
+	}
+	
+	private String executeSqlExpr(Expression sqlExpr,Context context){
+		String sqlForUse=null;
+		ExpressionData<?> exprData=sqlExpr.execute(null, null, context);
+		if(exprData instanceof ObjectExpressionData){
+			ObjectExpressionData data=(ObjectExpressionData)exprData;
+			Object obj=data.getData();
+			if(obj!=null){
+				String s=obj.toString();
+				s=s.replaceAll("\\\\", "");
+				sqlForUse=s;
 			}
 		}
-		return sql;
+		return sqlForUse;
 	}
 	
 	public void testConnection(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {

ureport2-core/src/main/java/com/bstek/ureport/Utils.java

@@ -46,6 +46,18 @@ public class Utils implements ApplicationContextAware{
 	private static ApplicationContext applicationContext;
 	private static Collection<BuildinDatasource> buildinDatasources;
 	private static Collection<ImageProvider> imageProviders;
+	private static boolean debug;
+	
+	public static boolean isDebug() {
+		return Utils.debug;
+	}
+	
+	public static void logToConsole(String msg){
+		if(Utils.debug){
+			System.out.println(msg);
+		}
+	}
+	
 	public static ApplicationContext getApplicationContext() {
 		return applicationContext;
 	}
@@ -198,6 +210,10 @@ public class Utils implements ApplicationContextAware{
 		throw new ConvertException("Can not convert "+obj+" to BigDecimal.");
 	}
 	
+	public void setDebug(boolean debug) {
+		Utils.debug = debug;
+	}
+	
 	@Override
 	public void setApplicationContext(ApplicationContext applicationContext)throws BeansException {
 		Utils.applicationContext=applicationContext;

ureport2-core/src/main/java/com/bstek/ureport/build/ReportBuilder.java

@@ -22,7 +22,6 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.logging.Logger;
 
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
@@ -60,7 +59,6 @@ import com.bstek.ureport.model.Row;
  */
 public class ReportBuilder extends BasePagination implements ApplicationContextAware{
 	public static final String BEAN_ID="ureport.reportBuilder";
-	private static final Logger log=Logger.getGlobal();
 	private ApplicationContext applicationContext;
 	private Map<String,DatasourceProvider> datasourceProviderMap=new HashMap<String,DatasourceProvider>();
 	private Map<Expand,CellBuilder> cellBuildersMap=new HashMap<Expand,CellBuilder>();
@@ -85,7 +83,8 @@ public class ReportBuilder extends BasePagination implements ApplicationContextA
 		doFillBlankRows(report,context);
 		recomputeCells(report,context);
 		long end=System.currentTimeMillis();
-		log.info("Report compute completed:"+(end-start)+"ms");
+		String msg="~~~ Report compute completed:"+(end-start)+"ms";
+		Utils.logToConsole(msg);
 		return report;
 	}
 	

ureport2-core/src/main/java/com/bstek/ureport/definition/dataset/SqlDatasetDefinition.java

@@ -25,6 +25,7 @@ import java.util.regex.Pattern;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.jdbc.datasource.SingleConnectionDataSource;
 
+import com.bstek.ureport.Utils;
 import com.bstek.ureport.build.Context;
 import com.bstek.ureport.build.Dataset;
 import com.bstek.ureport.definition.datasource.DataType;
@@ -61,6 +62,7 @@ public class SqlDatasetDefinition implements DatasetDefinition {
 				sqlForUse=sqlForUse.replace(substr, result);
 			}
 		}
+		Utils.logToConsole("RUNTIME SQL:"+sqlForUse);
 		Map<String, Object> pmap = buildParameters(parameterMap);
 		SingleConnectionDataSource datasource=new SingleConnectionDataSource(conn,false);
 		NamedParameterJdbcTemplate jdbcTemplate=new NamedParameterJdbcTemplate(datasource);

ureport2-core/src/main/resources/ureport-core-context.xml

@@ -55,7 +55,9 @@
 	<bean id="ureport.fontBuilder" class="com.bstek.ureport.export.pdf.font.FontBuilder"></bean>
 	
 	<bean id="ureport.expressionUtils" class="com.bstek.ureport.expression.ExpressionUtils"></bean>
-	<bean id="ureport.utils" class="com.bstek.ureport.Utils"></bean>
+	<bean id="ureport.utils" class="com.bstek.ureport.Utils">
+		<property name="debug" value="${ureport.debug}"></property>
+	</bean>
 	<bean id="ureport.cacheUtils" class="com.bstek.ureport.cache.CacheUtils"></bean>
 	
 	<bean id="ureport.countFunction" class="com.bstek.ureport.expression.function.CountFunction"></bean>

ureport2-core/src/main/resources/ureport.properties

@@ -1,4 +1,4 @@
 ureport.disableHttpSessionReportCache=false
 ureport.disableFileProvider=false
 ureport.fileStoreDir=/WEB-INF/ureportfiles
-urule.consoleLoggerLevel=INFO
+ureport.debug=true