mpz
/
example
forked from demo/example
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Pull request #28: REPORT-35537 调用导出api，控制台报错NPE:fine module health clinic is null 

Merge in PG/plugin-report-doc-demo from ~BRUCE.DENG/plugin-report-doc-demo:release/10.0 to release/10.0

* commit '81ff64e7042e7a3bd883d4648068766139db3846':
  无jira任务，模块启动加上ModuleHealActivator避免NPE
  REPORT-35537 调用导出api，控制台报错NPE:fine module health clinic is null
release/10.0
Bruce.Deng 4 years ago
parent
fb782a47e3 81ff64e704
commit
35d5088d7b
16 changed files with 30 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/main/java/com/fr/demo/SaveReportToDatabase.java
  2. 2
      src/main/java/com/fr/function/ReportCheck.java
  3. 2
      src/main/java/com/fr/io/CreateGenericTemplate.java
  4. 2
      src/main/java/com/fr/io/ExcelToCpt.java
  5. 2
      src/main/java/com/fr/io/ExcuteDemo.java
  6. 2
      src/main/java/com/fr/io/ExportApi.java
  7. 2
      src/main/java/com/fr/io/ExportApi_frm.java
  8. 2
      src/main/java/com/fr/io/ExportBatch.java
  9. 2
      src/main/java/com/fr/io/ExportExcel.java
  10. 2
      src/main/java/com/fr/io/ExportReports.java
  11. 2
      src/main/java/com/fr/io/JavaPrint.java
  12. 2
      src/main/java/com/fr/io/SaveReportToDatabase.java
  13. 2
      src/main/java/com/fr/io/SetParameterWindow.java
  14. 2
      src/main/java/com/fr/io/SimpleDemo.java
  15. 1
      src/test/main/java/com/fr/demo/ExportApiTest.java
  16. 1
      src/test/main/java/com/fr/demo/ModuleStartTest.java

2
src/main/java/com/fr/demo/SaveReportToDatabase.java
Unescape View File

@ -7,6 +7,7 @@ import com.fr.config.activator.BaseDBActivator;
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.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 StandaloneModeActivator(),
new ModuleHealActivator(),
new StateServiceActivator(),
new ChartBaseActivator(),
new SchedulerActivator(),

2
src/main/java/com/fr/function/ReportCheck.java
Unescape View File

@ -9,6 +9,7 @@ import com.fr.config.activator.BaseDBActivator;
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.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 StandaloneModeActivator(),
new ModuleHealActivator(),
new StateServiceActivator(),
new ChartBaseActivator(),
new SchedulerActivator(),

2
src/main/java/com/fr/io/CreateGenericTemplate.java
Unescape View File

@ -11,6 +11,7 @@ import com.fr.data.impl.NameDatabaseConnection;
import com.fr.env.operator.CommonOperatorImpl;
import com.fr.general.I18nResource;
import com.fr.general.data.TableDataColumn;
import com.fr.health.activator.ModuleHealActivator;
import com.fr.main.impl.WorkBook;
import com.fr.module.Module;
import com.fr.module.tool.ActivatorToolBox;
@ -37,6 +38,7 @@ public class CreateGenericTemplate {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(),
new StandaloneModeActivator(),
new ModuleHealActivator(),
new StateServiceActivator(),
new ChartBaseActivator(),
new SchedulerActivator(),

2
src/main/java/com/fr/io/ExcelToCpt.java
Unescape View File

@ -7,6 +7,7 @@ import com.fr.config.activator.BaseDBActivator;
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.importer.Excel2007ReportImporter;
import com.fr.main.TemplateWorkBook;
import com.fr.main.impl.WorkBook;
@ -32,6 +33,7 @@ public class ExcelToCpt {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(),
new StandaloneModeActivator(),
new ModuleHealActivator(),
new StateServiceActivator(),
new ChartBaseActivator(),
new SchedulerActivator(),

2
src/main/java/com/fr/io/ExcuteDemo.java
Unescape View File

@ -7,6 +7,7 @@ import com.fr.config.activator.BaseDBActivator;
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.exporter.ExcelExporter;
import com.fr.main.TemplateWorkBook;
import com.fr.main.workbook.ResultWorkBook;
@ -33,6 +34,7 @@ public class ExcuteDemo {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(),
new StandaloneModeActivator(),
new ModuleHealActivator(),
new StateServiceActivator(),
new ChartBaseActivator(),
new SchedulerActivator(),

2
src/main/java/com/fr/io/ExportApi.java
Unescape View File

@ -7,6 +7,7 @@ import com.fr.config.activator.BaseDBActivator;
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.exporter.excel.stream.StreamExcel2007Exporter;
import com.fr.main.impl.WorkBook;
import com.fr.main.workbook.ResultWorkBook;
@ -31,6 +32,7 @@ public class ExportApi {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(),
new StandaloneModeActivator(),
new ModuleHealActivator(),
new StateServiceActivator(),
new SchedulerActivator(),
new ReportBaseActivator(),

2
src/main/java/com/fr/io/ExportApi_frm.java
Unescape View File

@ -8,6 +8,7 @@ import com.fr.config.activator.ConfigurationActivator;
import com.fr.env.operator.CommonOperatorImpl;
import com.fr.form.export.FormToWBExecutor;
import com.fr.general.I18nResource;
import com.fr.health.activator.ModuleHealActivator;
import com.fr.io.exporter.ImageExporter;
import com.fr.io.exporter.PDFExporter;
import com.fr.io.exporter.excel.stream.StreamExcel2007Exporter;
@ -31,6 +32,7 @@ public class ExportApi_frm {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(),
new StandaloneModeActivator(),
new ModuleHealActivator(),
new StateServiceActivator(),
new SchedulerActivator(),
new ReportBaseActivator(),

2
src/main/java/com/fr/io/ExportBatch.java
Unescape View File

@ -7,6 +7,7 @@ import com.fr.config.activator.BaseDBActivator;
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.exporter.ExcelExporter;
import com.fr.main.TemplateWorkBook;
import com.fr.main.workbook.ResultWorkBook;
@ -38,6 +39,7 @@ public class ExportBatch {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(),
new StandaloneModeActivator(),
new ModuleHealActivator(),
new StateServiceActivator(),
new ChartBaseActivator(),
new SchedulerActivator(),

2
src/main/java/com/fr/io/ExportExcel.java
Unescape View File

@ -8,6 +8,7 @@ import com.fr.config.activator.BaseDBActivator;
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.exporter.ExcelExporter;
import com.fr.io.exporter.LargeDataPageExcelExporter;
import com.fr.io.exporter.PageExcel2007Exporter;
@ -40,6 +41,7 @@ public class ExportExcel {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(),
new StandaloneModeActivator(),
new ModuleHealActivator(),
new StateServiceActivator(),
new ChartBaseActivator(),
new SchedulerActivator(),

2
src/main/java/com/fr/io/ExportReports.java
Unescape View File

@ -8,6 +8,7 @@ import com.fr.config.activator.BaseDBActivator;
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.exporter.PageExcelExporter;
import com.fr.main.TemplateWorkBook;
import com.fr.main.workbook.PageWorkBook;
@ -35,6 +36,7 @@ public class ExportReports {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(),
new StandaloneModeActivator(),
new ModuleHealActivator(),
new StateServiceActivator(),
new ChartBaseActivator(),
new SchedulerActivator(),

2
src/main/java/com/fr/io/JavaPrint.java
Unescape View File

@ -8,6 +8,7 @@ import com.fr.config.activator.BaseDBActivator;
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.main.TemplateWorkBook;
import com.fr.module.Module;
import com.fr.module.tool.ActivatorToolBox;
@ -29,6 +30,7 @@ public class JavaPrint {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(),
new StandaloneModeActivator(),
new ModuleHealActivator(),
new StateServiceActivator(),
new ChartBaseActivator(),
new SchedulerActivator(),

2
src/main/java/com/fr/io/SaveReportToDatabase.java
Unescape View File

@ -7,6 +7,7 @@ import com.fr.config.activator.BaseDBActivator;
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.module.Module;
import com.fr.module.tool.ActivatorToolBox;
import com.fr.report.ReportActivator;
@ -45,6 +46,7 @@ public class SaveReportToDatabase {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(),
new StandaloneModeActivator(),
new ModuleHealActivator(),
new StateServiceActivator(),
new ChartBaseActivator(),
new SchedulerActivator(),

2
src/main/java/com/fr/io/SetParameterWindow.java
Unescape View File

@ -9,6 +9,7 @@ import com.fr.config.activator.ConfigurationActivator;
import com.fr.env.operator.CommonOperatorImpl;
import com.fr.general.Background;
import com.fr.general.I18nResource;
import com.fr.health.activator.ModuleHealActivator;
import com.fr.io.exporter.EmbeddedTableDataExporter;
import com.fr.main.impl.WorkBook;
import com.fr.main.parameter.ReportParameterAttr;
@ -33,6 +34,7 @@ public class SetParameterWindow {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(),
new StandaloneModeActivator(),
new ModuleHealActivator(),
new StateServiceActivator(),
new ChartBaseActivator(),
new SchedulerActivator(),

2
src/main/java/com/fr/io/SimpleDemo.java
Unescape View File

@ -9,6 +9,7 @@ import com.fr.config.activator.ConfigurationActivator;
import com.fr.env.operator.CommonOperatorImpl;
import com.fr.general.FRFont;
import com.fr.general.I18nResource;
import com.fr.health.activator.ModuleHealActivator;
import com.fr.main.impl.WorkBook;
import com.fr.module.Module;
import com.fr.module.tool.ActivatorToolBox;
@ -33,6 +34,7 @@ public class SimpleDemo {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(),
new StandaloneModeActivator(),
new ModuleHealActivator(),
new StateServiceActivator(),
new ChartBaseActivator(),
new SchedulerActivator(),

1
src/test/main/java/com/fr/demo/ExportApiTest.java
Unescape View File

@ -43,6 +43,7 @@ public class ExportApiTest extends TestCase {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(),
new StandaloneModeActivator(),
new ModuleHealActivator(),
new StateServiceActivator(),
new ChartBaseActivator(),
new SchedulerActivator(),

1
src/test/main/java/com/fr/demo/ModuleStartTest.java
Unescape View File

@ -65,6 +65,7 @@ public class ModuleStartTest extends TestCase {
Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
new ConfigurationActivator(),
new StandaloneModeActivator(),
new ModuleHealActivator(),
new StateServiceActivator(),
new ChartBaseActivator(),
new SchedulerActivator(),

Write Preview
Loading…
Cancel
Save