From 37c31d750c05c6afb18036c99e513eaae5dfa50e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=87=95=E9=B9=8F?= Date: Tue, 22 Jun 2021 13:40:39 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E5=8A=A8=E6=80=81=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=AD=98=E5=82=A8=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../console/designer/DesignerServletAction.java | 10 ++++++++++ .../bstek/ureport/provider/report/ReportProvider.java | 2 ++ .../report/classpath/ClasspathReportProvider.java | 6 ++++++ .../provider/report/file/FileReportProvider.java | 7 ++++++- ureport2-core/target/maven-archiver/pom.properties | 2 +- 5 files changed, 25 insertions(+), 2 deletions(-) diff --git a/ureport2-console/src/main/java/com/bstek/ureport/console/designer/DesignerServletAction.java b/ureport2-console/src/main/java/com/bstek/ureport/console/designer/DesignerServletAction.java index d8effaf..765217a 100644 --- a/ureport2-console/src/main/java/com/bstek/ureport/console/designer/DesignerServletAction.java +++ b/ureport2-console/src/main/java/com/bstek/ureport/console/designer/DesignerServletAction.java @@ -31,6 +31,7 @@ import javax.servlet.http.HttpServletResponse; import org.antlr.v4.runtime.ANTLRInputStream; import org.antlr.v4.runtime.CommonTokenStream; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.springframework.beans.BeansException; @@ -186,6 +187,15 @@ public class DesignerServletAction extends RenderPageServletAction { } public void loadReportProviders(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + reportProviders.clear(); + Collection providers=applicationContext.getBeansOfType(ReportProvider.class).values(); + for(ReportProvider provider:providers){ + provider.refresh(); + if(provider.disabled() || provider.getName()==null){ + continue; + } + reportProviders.add(provider); + } writeObjectToJson(resp, reportProviders); } diff --git a/ureport2-core/src/main/java/com/bstek/ureport/provider/report/ReportProvider.java b/ureport2-core/src/main/java/com/bstek/ureport/provider/report/ReportProvider.java index c1be12b..ff57453 100644 --- a/ureport2-core/src/main/java/com/bstek/ureport/provider/report/ReportProvider.java +++ b/ureport2-core/src/main/java/com/bstek/ureport/provider/report/ReportProvider.java @@ -45,6 +45,8 @@ public interface ReportProvider { * @param content 报表的XML内容 */ void saveReport(String file,String content); + + void refresh(); /** * @return 返回存储器名称 */ diff --git a/ureport2-core/src/main/java/com/bstek/ureport/provider/report/classpath/ClasspathReportProvider.java b/ureport2-core/src/main/java/com/bstek/ureport/provider/report/classpath/ClasspathReportProvider.java index ec23880..1a4d72e 100644 --- a/ureport2-core/src/main/java/com/bstek/ureport/provider/report/classpath/ClasspathReportProvider.java +++ b/ureport2-core/src/main/java/com/bstek/ureport/provider/report/classpath/ClasspathReportProvider.java @@ -69,6 +69,12 @@ public class ClasspathReportProvider implements ReportProvider,ApplicationContex @Override public void saveReport(String file,String content) { } + + @Override + public void refresh() { + + } + @Override public List getReportFiles() { return null; diff --git a/ureport2-core/src/main/java/com/bstek/ureport/provider/report/file/FileReportProvider.java b/ureport2-core/src/main/java/com/bstek/ureport/provider/report/file/FileReportProvider.java index c90de4a..b79a4ba 100644 --- a/ureport2-core/src/main/java/com/bstek/ureport/provider/report/file/FileReportProvider.java +++ b/ureport2-core/src/main/java/com/bstek/ureport/provider/report/file/FileReportProvider.java @@ -44,7 +44,7 @@ import com.bstek.ureport.provider.report.ReportProvider; * @since 2017年2月11日 */ public class FileReportProvider implements ReportProvider,ApplicationContextAware{ - private String prefix="file:"; + private String prefix="ufile:"; private String fileStoreDir; private boolean disabled; @Override @@ -119,6 +119,11 @@ public class FileReportProvider implements ReportProvider,ApplicationContextAwar } + @Override + public void refresh() { + + } + @Override public boolean disabled() { return disabled; diff --git a/ureport2-core/target/maven-archiver/pom.properties b/ureport2-core/target/maven-archiver/pom.properties index 0faf3c8..408de23 100644 --- a/ureport2-core/target/maven-archiver/pom.properties +++ b/ureport2-core/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Mon May 31 09:30:27 CST 2021 +#Tue Jun 22 11:31:47 CST 2021 version=2.3.1-SNAPSHOT groupId=com.bstek.ureport artifactId=ureport2-core