进一步完善报表的缓存机制

ureport2-console/src/main/java/com/bstek/ureport/console/excel/ExportExcelServletAction.java

@@ -87,7 +87,6 @@ public class ExportExcelServletAction extends BaseServletAction {
 					throw new ReportDesignException("Report data has expired,can not do export excel.");
 				}
 				report=reportBuilder.buildReport(reportDefinition, parameters);	
-				CacheUtils.storeReport(fullName, report);
 			}
 			if(withPage){
 				excelProducer.produceWithPaging(report, outputStream);

ureport2-console/src/main/java/com/bstek/ureport/console/pdf/ExportPdfServletAction.java

@@ -91,7 +91,6 @@ public class ExportPdfServletAction extends BaseServletAction{
 					throw new ReportDesignException("Report data has expired,can not do export pdf.");
 				}
 				report=reportBuilder.buildReport(reportDefinition, parameters);	
-				CacheUtils.storeReport(fullName, report);
 			}
 			pdfProducer.produce(report, outputStream);
 		}else{
@@ -118,14 +117,12 @@ public class ExportPdfServletAction extends BaseServletAction{
 					throw new ReportDesignException("Report data has expired,can not do export pdf.");
 				}
 				report=reportBuilder.buildReport(reportDefinition, parameters);	
-				CacheUtils.storeReport(fullName, report);
 			}
 		}else{
 			report=CacheUtils.getReport(fullName);
 			if(report==null){
 				ReportDefinition reportDefinition=reportRender.getReportDefinition(file);
 				report=reportRender.render(reportDefinition, parameters);
-				CacheUtils.storeReport(fullName, report);
 			}
 		}
 		String paper=req.getParameter("_paper");

ureport2-console/src/main/java/com/bstek/ureport/console/word/ExportWordServletAction.java

@@ -80,7 +80,6 @@ public class ExportWordServletAction extends BaseServletAction {
 					throw new ReportDesignException("Report data has expired,can not do export word.");
 				}
 				report=reportBuilder.buildReport(reportDefinition, parameters);	
-				CacheUtils.storeReport(fullName, report);
 			}
 			wordProducer.produce(report, outputStream);
 		}else{

ureport2-core/src/main/java/com/bstek/ureport/export/ExportManagerImpl.java

@@ -58,7 +58,6 @@ public class ExportManagerImpl implements ExportManager {
 		Report report=CacheUtils.getReport(fullName);
 		if (report == null) {
 			report = reportRender.render(reportDefinition, parameters);
-			CacheUtils.storeReport(fullName, report);
 		}
 		SinglePageData pageData=PageBuilder.buildSinglePageData(pageIndex, report);
 		List<Page> pages=pageData.getPages();
@@ -84,7 +83,6 @@ public class ExportManagerImpl implements ExportManager {
 		if (report == null) {
 			ReportDefinition reportDefinition=reportRender.getReportDefinition(file);
 			report = reportRender.render(reportDefinition, parameters);
-			CacheUtils.storeReport(fullName, report);
 		}
 		pdfProducer.produce(report, config.getOutputStream());
 	}
@@ -97,7 +95,6 @@ public class ExportManagerImpl implements ExportManager {
 		if (report == null) {
 			ReportDefinition reportDefinition=reportRender.getReportDefinition(file);
 			report = reportRender.render(reportDefinition, parameters);
-			CacheUtils.storeReport(fullName, report);
 		}
 		wordProducer.produce(report, config.getOutputStream());
 	}
@@ -110,7 +107,6 @@ public class ExportManagerImpl implements ExportManager {
 		if (report == null) {
 			ReportDefinition reportDefinition=reportRender.getReportDefinition(file);
 			report = reportRender.render(reportDefinition, parameters);
-			CacheUtils.storeReport(fullName, report);
 		}
 		excelProducer.produce(report, config.getOutputStream());
 	}
@@ -124,7 +120,6 @@ public class ExportManagerImpl implements ExportManager {
 		if (report == null) {
 			ReportDefinition reportDefinition=reportRender.getReportDefinition(file);
 			report = reportRender.render(reportDefinition, parameters);
-			CacheUtils.storeReport(fullName, report);
 		}
 		excelProducer.produceWithPaging(report, config.getOutputStream());
 	}
@@ -138,7 +133,6 @@ public class ExportManagerImpl implements ExportManager {
 		if (report == null) {
 			ReportDefinition reportDefinition=reportRender.getReportDefinition(file);
 			report = reportRender.render(reportDefinition, parameters);
-			CacheUtils.storeReport(fullName, report);
 		}
 		excelProducer.produceWithSheet(report, config.getOutputStream());
 	}