From ff722491446fcb21259c5107afb0552566fa25c7 Mon Sep 17 00:00:00 2001 From: "Bruce.Deng" Date: Fri, 25 Sep 2020 13:41:25 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-39385=20=E5=AF=BC=E5=87=BAAPI=EF=BC=8C?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=8A=A5=E9=94=99=EF=BC=8C=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/fr/demo/SaveReportToDatabase.java | 2 ++ src/main/java/com/fr/function/ReportCheck.java | 2 ++ src/main/java/com/fr/io/CreateGenericTemplate.java | 1 + src/main/java/com/fr/io/ExcelToCpt.java | 1 + src/main/java/com/fr/io/ExcuteDemo.java | 1 + src/main/java/com/fr/io/ExportApi.java | 11 +++++++++-- src/main/java/com/fr/io/ExportApi_frm.java | 1 + src/main/java/com/fr/io/ExportBatch.java | 1 + src/main/java/com/fr/io/ExportExcel.java | 1 + src/main/java/com/fr/io/ExportReports.java | 1 + src/main/java/com/fr/io/JavaPrint.java | 1 + src/main/java/com/fr/io/SaveReportToDatabase.java | 1 + src/main/java/com/fr/io/SetParameterWindow.java | 1 + src/main/java/com/fr/io/SimpleDemo.java | 1 + src/test/main/java/com/fr/demo/ExportApiTest.java | 1 + src/test/main/java/com/fr/demo/ModuleStartTest.java | 1 + 16 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/fr/demo/SaveReportToDatabase.java b/src/main/java/com/fr/demo/SaveReportToDatabase.java index 4905df5..c468aba 100644 --- a/src/main/java/com/fr/demo/SaveReportToDatabase.java +++ b/src/main/java/com/fr/demo/SaveReportToDatabase.java @@ -8,6 +8,7 @@ import com.fr.config.activator.ConfigurationActivator; import com.fr.env.operator.CommonOperatorImpl; import com.fr.general.I18nResource; import com.fr.health.activator.ModuleHealActivator; +import com.fr.io.ResourceRepositoryActivator; import com.fr.module.Module; import com.fr.module.tool.ActivatorToolBox; import com.fr.report.ReportActivator; @@ -35,6 +36,7 @@ public class SaveReportToDatabase { // 定义报表运行环境,用于执行报表 Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), new ConfigurationActivator(), + new ResourceRepositoryActivator(), new StandaloneModeActivator(), new ModuleHealActivator(), new StateServiceActivator(), diff --git a/src/main/java/com/fr/function/ReportCheck.java b/src/main/java/com/fr/function/ReportCheck.java index 907da1b..5035536 100644 --- a/src/main/java/com/fr/function/ReportCheck.java +++ b/src/main/java/com/fr/function/ReportCheck.java @@ -10,6 +10,7 @@ import com.fr.config.activator.ConfigurationActivator; import com.fr.env.operator.CommonOperatorImpl; import com.fr.general.I18nResource; import com.fr.health.activator.ModuleHealActivator; +import com.fr.io.ResourceRepositoryActivator; import com.fr.io.TemplateWorkBookIO; import com.fr.json.JSONArray; import com.fr.json.JSONObject; @@ -45,6 +46,7 @@ public class ReportCheck extends AbstractFunction { // 定义报表运行环境,用于执行报表 Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), new ConfigurationActivator(), + new ResourceRepositoryActivator(), new StandaloneModeActivator(), new ModuleHealActivator(), new StateServiceActivator(), diff --git a/src/main/java/com/fr/io/CreateGenericTemplate.java b/src/main/java/com/fr/io/CreateGenericTemplate.java index 55a8558..fbcbd7c 100644 --- a/src/main/java/com/fr/io/CreateGenericTemplate.java +++ b/src/main/java/com/fr/io/CreateGenericTemplate.java @@ -37,6 +37,7 @@ public class CreateGenericTemplate { // 定义报表运行环境,用于执行报表 Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), new ConfigurationActivator(), + new ResourceRepositoryActivator(), new StandaloneModeActivator(), new ModuleHealActivator(), new StateServiceActivator(), diff --git a/src/main/java/com/fr/io/ExcelToCpt.java b/src/main/java/com/fr/io/ExcelToCpt.java index 0ab1d9b..4c3c570 100644 --- a/src/main/java/com/fr/io/ExcelToCpt.java +++ b/src/main/java/com/fr/io/ExcelToCpt.java @@ -32,6 +32,7 @@ public class ExcelToCpt { // 定义报表运行环境,用于执行报表 Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), new ConfigurationActivator(), + new ResourceRepositoryActivator(), new StandaloneModeActivator(), new ModuleHealActivator(), new StateServiceActivator(), diff --git a/src/main/java/com/fr/io/ExcuteDemo.java b/src/main/java/com/fr/io/ExcuteDemo.java index 91124de..5c4d5c0 100644 --- a/src/main/java/com/fr/io/ExcuteDemo.java +++ b/src/main/java/com/fr/io/ExcuteDemo.java @@ -33,6 +33,7 @@ public class ExcuteDemo { // 定义报表运行环境,用于执行报表 Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), new ConfigurationActivator(), + new ResourceRepositoryActivator(), new StandaloneModeActivator(), new ModuleHealActivator(), new StateServiceActivator(), diff --git a/src/main/java/com/fr/io/ExportApi.java b/src/main/java/com/fr/io/ExportApi.java index 0d70ac1..f6cad8c 100644 --- a/src/main/java/com/fr/io/ExportApi.java +++ b/src/main/java/com/fr/io/ExportApi.java @@ -10,8 +10,14 @@ import com.fr.general.I18nResource; import com.fr.general.log.Log4jConfig; import com.fr.general.log.parser.ExtraPatternParserManager; import com.fr.health.activator.ModuleHealActivator; -import com.fr.io.TemplateWorkBookIO; -import com.fr.io.exporter.*; +import com.fr.io.exporter.CSVExporter; +import com.fr.io.exporter.EmbeddedTableDataExporter; +import com.fr.io.exporter.ExcelExporter; +import com.fr.io.exporter.ImageExporter; +import com.fr.io.exporter.PDFExporter; +import com.fr.io.exporter.SVGExporter; +import com.fr.io.exporter.TextExporter; +import com.fr.io.exporter.WordExporter; import com.fr.io.exporter.excel.stream.StreamExcel2007Exporter; import com.fr.main.impl.WorkBook; import com.fr.module.tool.ActivatorToolBox; @@ -43,6 +49,7 @@ public class ExportApi { /**定义报表运行环境,用于执行报表*/ com.fr.module.Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), new ConfigurationActivator(), + new ResourceRepositoryActivator(), new StandaloneModeActivator(), new ModuleHealActivator(), //2020.4.26jar包之前的版本，替换成StateServerActivator() diff --git a/src/main/java/com/fr/io/ExportApi_frm.java b/src/main/java/com/fr/io/ExportApi_frm.java index 0674938..4a037cf 100644 --- a/src/main/java/com/fr/io/ExportApi_frm.java +++ b/src/main/java/com/fr/io/ExportApi_frm.java @@ -31,6 +31,7 @@ public class ExportApi_frm { // 定义报表运行环境,用于执行报表 Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), new ConfigurationActivator(), + new ResourceRepositoryActivator(), new StandaloneModeActivator(), new ModuleHealActivator(), new StateServiceActivator(), diff --git a/src/main/java/com/fr/io/ExportBatch.java b/src/main/java/com/fr/io/ExportBatch.java index 392bb66..9a97a03 100644 --- a/src/main/java/com/fr/io/ExportBatch.java +++ b/src/main/java/com/fr/io/ExportBatch.java @@ -38,6 +38,7 @@ public class ExportBatch { // 定义报表运行环境,用于执行报表 Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), new ConfigurationActivator(), + new ResourceRepositoryActivator(), new StandaloneModeActivator(), new ModuleHealActivator(), new StateServiceActivator(), diff --git a/src/main/java/com/fr/io/ExportExcel.java b/src/main/java/com/fr/io/ExportExcel.java index 39d6d4e..5d5b949 100644 --- a/src/main/java/com/fr/io/ExportExcel.java +++ b/src/main/java/com/fr/io/ExportExcel.java @@ -40,6 +40,7 @@ public class ExportExcel { // 定义报表运行环境,用于执行报表 Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), new ConfigurationActivator(), + new ResourceRepositoryActivator(), new StandaloneModeActivator(), new ModuleHealActivator(), new StateServiceActivator(), diff --git a/src/main/java/com/fr/io/ExportReports.java b/src/main/java/com/fr/io/ExportReports.java index ded0225..75a40f9 100644 --- a/src/main/java/com/fr/io/ExportReports.java +++ b/src/main/java/com/fr/io/ExportReports.java @@ -35,6 +35,7 @@ public class ExportReports { // 定义报表运行环境,用于执行报表 Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), new ConfigurationActivator(), + new ResourceRepositoryActivator(), new StandaloneModeActivator(), new ModuleHealActivator(), new StateServiceActivator(), diff --git a/src/main/java/com/fr/io/JavaPrint.java b/src/main/java/com/fr/io/JavaPrint.java index f9b65ba..797ebc8 100644 --- a/src/main/java/com/fr/io/JavaPrint.java +++ b/src/main/java/com/fr/io/JavaPrint.java @@ -29,6 +29,7 @@ public class JavaPrint { // 定义报表运行环境,用于执行报表 Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), new ConfigurationActivator(), + new ResourceRepositoryActivator(), new StandaloneModeActivator(), new ModuleHealActivator(), new StateServiceActivator(), diff --git a/src/main/java/com/fr/io/SaveReportToDatabase.java b/src/main/java/com/fr/io/SaveReportToDatabase.java index 161f6ba..1608a48 100644 --- a/src/main/java/com/fr/io/SaveReportToDatabase.java +++ b/src/main/java/com/fr/io/SaveReportToDatabase.java @@ -45,6 +45,7 @@ public class SaveReportToDatabase { // 定义报表运行环境,用于执行报表 Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), new ConfigurationActivator(), + new ResourceRepositoryActivator(), new StandaloneModeActivator(), new ModuleHealActivator(), new StateServiceActivator(), diff --git a/src/main/java/com/fr/io/SetParameterWindow.java b/src/main/java/com/fr/io/SetParameterWindow.java index 5ec569f..4878298 100644 --- a/src/main/java/com/fr/io/SetParameterWindow.java +++ b/src/main/java/com/fr/io/SetParameterWindow.java @@ -33,6 +33,7 @@ public class SetParameterWindow { // 定义报表运行环境,用于执行报表 Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), new ConfigurationActivator(), + new ResourceRepositoryActivator(), new StandaloneModeActivator(), new ModuleHealActivator(), new StateServiceActivator(), diff --git a/src/main/java/com/fr/io/SimpleDemo.java b/src/main/java/com/fr/io/SimpleDemo.java index 669f291..0d9b943 100644 --- a/src/main/java/com/fr/io/SimpleDemo.java +++ b/src/main/java/com/fr/io/SimpleDemo.java @@ -33,6 +33,7 @@ public class SimpleDemo { // 定义报表运行环境,用于执行报表 Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), new ConfigurationActivator(), + new ResourceRepositoryActivator(), new StandaloneModeActivator(), new ModuleHealActivator(), new StateServiceActivator(), diff --git a/src/test/main/java/com/fr/demo/ExportApiTest.java b/src/test/main/java/com/fr/demo/ExportApiTest.java index b73b508..061a20f 100644 --- a/src/test/main/java/com/fr/demo/ExportApiTest.java +++ b/src/test/main/java/com/fr/demo/ExportApiTest.java @@ -42,6 +42,7 @@ public class ExportApiTest extends TestCase { public void testExport() { Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), new ConfigurationActivator(), + new ResourceRepositoryActivator(), new StandaloneModeActivator(), new ModuleHealActivator(), new StateServiceActivator(), diff --git a/src/test/main/java/com/fr/demo/ModuleStartTest.java b/src/test/main/java/com/fr/demo/ModuleStartTest.java index cf376c1..63c6f4b 100644 --- a/src/test/main/java/com/fr/demo/ModuleStartTest.java +++ b/src/test/main/java/com/fr/demo/ModuleStartTest.java @@ -64,6 +64,7 @@ public class ModuleStartTest extends TestCase { private Module initModule() { Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(), new ConfigurationActivator(), + new ResourceRepositoryActivator(), new StandaloneModeActivator(), new ModuleHealActivator(), new StateServiceActivator(),