Browse Source

Merge pull request #8 in PG/plugin-report-doc-demo from release/10.0 to persist/10.0

* commit '76811bfa84b36bf96b37bcd88e71b1ac10766ceb':
  DEMO-2528 有几个包遗漏了
  DEMO-2528 demo编译失败
persist/10.0
Lanlan 5 years ago
parent
commit
de51123131
  1. BIN
      lib/cas-client-core-3.2.1.jar
  2. BIN
      lib/json-lib-2.1-jdk15.jar
  3. BIN
      lib/org.apache.oltu.oauth2.client-1.0.1.jar
  4. BIN
      lib/swexpl.jar
  5. 2
      src/main/java/com/fr/demo/SaveReportToDatabase.java
  6. 5
      src/main/java/com/fr/function/ReportCheck.java
  7. 3
      src/main/java/com/fr/io/CreateGenericTemplate.java
  8. 14
      src/main/java/com/fr/io/ExcelToCpt.java
  9. 4
      src/main/java/com/fr/io/ExcuteDemo.java
  10. 3
      src/main/java/com/fr/io/ExportApi.java
  11. 10
      src/main/java/com/fr/io/ExportBatch.java
  12. 9
      src/main/java/com/fr/io/ExportExcel.java
  13. 12
      src/main/java/com/fr/io/ExportReports.java
  14. 4
      src/main/java/com/fr/io/JavaPrint.java
  15. 15
      src/main/java/com/fr/io/SaveReportToDatabase.java
  16. 2
      src/main/java/com/fr/io/SetParameterWindow.java
  17. 2
      src/main/java/com/fr/io/SimpleDemo.java

BIN
lib/cas-client-core-3.2.1.jar

Binary file not shown.

BIN
lib/json-lib-2.1-jdk15.jar

Binary file not shown.

BIN
lib/org.apache.oltu.oauth2.client-1.0.1.jar

Binary file not shown.

BIN
lib/swexpl.jar

Binary file not shown.

2
src/main/java/com/fr/demo/SaveReportToDatabase.java

@ -4,11 +4,11 @@ import com.fr.base.operator.common.CommonOperator;
import com.fr.chart.activator.ChartBaseActivator; import com.fr.chart.activator.ChartBaseActivator;
import com.fr.config.activator.BaseDBActivator; import com.fr.config.activator.BaseDBActivator;
import com.fr.config.activator.ConfigurationActivator; import com.fr.config.activator.ConfigurationActivator;
import com.fr.data.impl.config.activator.RestrictionActivator;
import com.fr.env.operator.CommonOperatorImpl; import com.fr.env.operator.CommonOperatorImpl;
import com.fr.module.Module; import com.fr.module.Module;
import com.fr.module.tool.ActivatorToolBox; import com.fr.module.tool.ActivatorToolBox;
import com.fr.report.ReportActivator; import com.fr.report.ReportActivator;
import com.fr.report.RestrictionActivator;
import com.fr.report.module.ReportBaseActivator; import com.fr.report.module.ReportBaseActivator;
import com.fr.store.StateServerActivator; import com.fr.store.StateServerActivator;
import com.fr.workspace.simple.SimpleWork; import com.fr.workspace.simple.SimpleWork;

5
src/main/java/com/fr/function/ReportCheck.java

@ -1,13 +1,11 @@
// 自定义函数实现表间校验 // 自定义函数实现表间校验
package com.fr.function; package com.fr.function;
import java.util.HashMap;
import com.fr.base.ResultFormula; import com.fr.base.ResultFormula;
import com.fr.base.operator.common.CommonOperator; import com.fr.base.operator.common.CommonOperator;
import com.fr.chart.activator.ChartBaseActivator; import com.fr.chart.activator.ChartBaseActivator;
import com.fr.config.activator.BaseDBActivator; import com.fr.config.activator.BaseDBActivator;
import com.fr.config.activator.ConfigurationActivator; import com.fr.config.activator.ConfigurationActivator;
import com.fr.data.impl.config.activator.RestrictionActivator;
import com.fr.env.operator.CommonOperatorImpl; import com.fr.env.operator.CommonOperatorImpl;
import com.fr.io.TemplateWorkBookIO; import com.fr.io.TemplateWorkBookIO;
import com.fr.json.JSONArray; import com.fr.json.JSONArray;
@ -17,6 +15,7 @@ import com.fr.main.workbook.ResultWorkBook;
import com.fr.module.Module; import com.fr.module.Module;
import com.fr.module.tool.ActivatorToolBox; import com.fr.module.tool.ActivatorToolBox;
import com.fr.report.ReportActivator; import com.fr.report.ReportActivator;
import com.fr.report.RestrictionActivator;
import com.fr.report.cell.CellElement; import com.fr.report.cell.CellElement;
import com.fr.report.module.ReportBaseActivator; import com.fr.report.module.ReportBaseActivator;
import com.fr.report.report.ResultReport; import com.fr.report.report.ResultReport;
@ -26,6 +25,8 @@ import com.fr.store.StateServerActivator;
import com.fr.workspace.simple.SimpleWork; import com.fr.workspace.simple.SimpleWork;
import com.fr.write.cal.WB; import com.fr.write.cal.WB;
import java.util.HashMap;
public class ReportCheck extends AbstractFunction { public class ReportCheck extends AbstractFunction {
private static HashMap wMap = new HashMap(); private static HashMap wMap = new HashMap();

3
src/main/java/com/fr/io/CreateGenericTemplate.java

@ -1,4 +1,5 @@
package com.fr.io; package com.fr.io;
import com.fr.base.TableData; import com.fr.base.TableData;
import com.fr.base.operator.common.CommonOperator; import com.fr.base.operator.common.CommonOperator;
import com.fr.chart.activator.ChartBaseActivator; import com.fr.chart.activator.ChartBaseActivator;
@ -6,13 +7,13 @@ import com.fr.config.activator.BaseDBActivator;
import com.fr.config.activator.ConfigurationActivator; import com.fr.config.activator.ConfigurationActivator;
import com.fr.data.impl.DBTableData; import com.fr.data.impl.DBTableData;
import com.fr.data.impl.NameDatabaseConnection; import com.fr.data.impl.NameDatabaseConnection;
import com.fr.data.impl.config.activator.RestrictionActivator;
import com.fr.env.operator.CommonOperatorImpl; import com.fr.env.operator.CommonOperatorImpl;
import com.fr.general.data.TableDataColumn; import com.fr.general.data.TableDataColumn;
import com.fr.main.impl.WorkBook; import com.fr.main.impl.WorkBook;
import com.fr.module.Module; import com.fr.module.Module;
import com.fr.module.tool.ActivatorToolBox; import com.fr.module.tool.ActivatorToolBox;
import com.fr.report.ReportActivator; import com.fr.report.ReportActivator;
import com.fr.report.RestrictionActivator;
import com.fr.report.cell.DefaultTemplateCellElement; import com.fr.report.cell.DefaultTemplateCellElement;
import com.fr.report.cell.TemplateCellElement; import com.fr.report.cell.TemplateCellElement;
import com.fr.report.cell.cellattr.core.group.DSColumn; import com.fr.report.cell.cellattr.core.group.DSColumn;

14
src/main/java/com/fr/io/ExcelToCpt.java

@ -1,24 +1,26 @@
package com.fr.io; package com.fr.io;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.OutputStream;
import com.fr.base.operator.common.CommonOperator; import com.fr.base.operator.common.CommonOperator;
import com.fr.chart.activator.ChartBaseActivator; import com.fr.chart.activator.ChartBaseActivator;
import com.fr.config.activator.BaseDBActivator; import com.fr.config.activator.BaseDBActivator;
import com.fr.config.activator.ConfigurationActivator; import com.fr.config.activator.ConfigurationActivator;
import com.fr.data.impl.config.activator.RestrictionActivator;
import com.fr.env.operator.CommonOperatorImpl; import com.fr.env.operator.CommonOperatorImpl;
import com.fr.main.impl.WorkBook;
import com.fr.io.importer.Excel2007ReportImporter; import com.fr.io.importer.Excel2007ReportImporter;
import com.fr.main.TemplateWorkBook; import com.fr.main.TemplateWorkBook;
import com.fr.main.impl.WorkBook;
import com.fr.module.Module; import com.fr.module.Module;
import com.fr.module.tool.ActivatorToolBox; import com.fr.module.tool.ActivatorToolBox;
import com.fr.report.ReportActivator; import com.fr.report.ReportActivator;
import com.fr.report.RestrictionActivator;
import com.fr.report.module.ReportBaseActivator; import com.fr.report.module.ReportBaseActivator;
import com.fr.store.StateServerActivator; import com.fr.store.StateServerActivator;
import com.fr.workspace.simple.SimpleWork; import com.fr.workspace.simple.SimpleWork;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.OutputStream;
public class ExcelToCpt { public class ExcelToCpt {
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
// 首先需要定义执行所在的环境,这样才能正确读取数据库信息 // 首先需要定义执行所在的环境,这样才能正确读取数据库信息

4
src/main/java/com/fr/io/ExcuteDemo.java

@ -1,9 +1,9 @@
package com.fr.io; package com.fr.io;
import com.fr.base.operator.common.CommonOperator; import com.fr.base.operator.common.CommonOperator;
import com.fr.chart.activator.ChartBaseActivator; import com.fr.chart.activator.ChartBaseActivator;
import com.fr.config.activator.BaseDBActivator; import com.fr.config.activator.BaseDBActivator;
import com.fr.config.activator.ConfigurationActivator; import com.fr.config.activator.ConfigurationActivator;
import com.fr.data.impl.config.activator.RestrictionActivator;
import com.fr.env.operator.CommonOperatorImpl; import com.fr.env.operator.CommonOperatorImpl;
import com.fr.io.exporter.ExcelExporter; import com.fr.io.exporter.ExcelExporter;
import com.fr.main.TemplateWorkBook; import com.fr.main.TemplateWorkBook;
@ -11,10 +11,12 @@ import com.fr.main.workbook.ResultWorkBook;
import com.fr.module.Module; import com.fr.module.Module;
import com.fr.module.tool.ActivatorToolBox; import com.fr.module.tool.ActivatorToolBox;
import com.fr.report.ReportActivator; import com.fr.report.ReportActivator;
import com.fr.report.RestrictionActivator;
import com.fr.report.module.ReportBaseActivator; import com.fr.report.module.ReportBaseActivator;
import com.fr.stable.WriteActor; import com.fr.stable.WriteActor;
import com.fr.store.StateServerActivator; import com.fr.store.StateServerActivator;
import com.fr.workspace.simple.SimpleWork; import com.fr.workspace.simple.SimpleWork;
import java.io.File; import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;

3
src/main/java/com/fr/io/ExportApi.java

@ -5,9 +5,7 @@ import com.fr.base.operator.common.CommonOperator;
import com.fr.chart.activator.ChartBaseActivator; import com.fr.chart.activator.ChartBaseActivator;
import com.fr.config.activator.BaseDBActivator; import com.fr.config.activator.BaseDBActivator;
import com.fr.config.activator.ConfigurationActivator; import com.fr.config.activator.ConfigurationActivator;
import com.fr.data.impl.config.activator.RestrictionActivator;
import com.fr.env.operator.CommonOperatorImpl; import com.fr.env.operator.CommonOperatorImpl;
import com.fr.general.ModuleContext;
import com.fr.io.exporter.CSVExporter; import com.fr.io.exporter.CSVExporter;
import com.fr.io.exporter.EmbeddedTableDataExporter; import com.fr.io.exporter.EmbeddedTableDataExporter;
import com.fr.io.exporter.ExcelExporter; import com.fr.io.exporter.ExcelExporter;
@ -22,6 +20,7 @@ import com.fr.main.workbook.ResultWorkBook;
import com.fr.module.Module; import com.fr.module.Module;
import com.fr.module.tool.ActivatorToolBox; import com.fr.module.tool.ActivatorToolBox;
import com.fr.report.ReportActivator; import com.fr.report.ReportActivator;
import com.fr.report.RestrictionActivator;
import com.fr.report.module.ReportBaseActivator; import com.fr.report.module.ReportBaseActivator;
import com.fr.stable.WriteActor; import com.fr.stable.WriteActor;
import com.fr.store.StateServerActivator; import com.fr.store.StateServerActivator;

10
src/main/java/com/fr/io/ExportBatch.java

@ -1,21 +1,23 @@
package com.fr.io; package com.fr.io;
import com.fr.base.operator.common.CommonOperator;
import com.fr.chart.activator.ChartBaseActivator;
import com.fr.config.activator.BaseDBActivator; import com.fr.config.activator.BaseDBActivator;
import com.fr.config.activator.ConfigurationActivator; import com.fr.config.activator.ConfigurationActivator;
import com.fr.data.impl.config.activator.RestrictionActivator; import com.fr.env.operator.CommonOperatorImpl;
import com.fr.io.exporter.ExcelExporter; import com.fr.io.exporter.ExcelExporter;
import com.fr.main.TemplateWorkBook; import com.fr.main.TemplateWorkBook;
import com.fr.main.workbook.ResultWorkBook; import com.fr.main.workbook.ResultWorkBook;
import com.fr.module.Module; import com.fr.module.Module;
import com.fr.module.tool.ActivatorToolBox; import com.fr.module.tool.ActivatorToolBox;
import com.fr.report.ReportActivator; import com.fr.report.ReportActivator;
import com.fr.report.RestrictionActivator;
import com.fr.report.module.ReportBaseActivator; import com.fr.report.module.ReportBaseActivator;
import com.fr.stable.StableUtils; import com.fr.stable.StableUtils;
import com.fr.stable.WriteActor; import com.fr.stable.WriteActor;
import com.fr.store.StateServerActivator; import com.fr.store.StateServerActivator;
import com.fr.workspace.simple.SimpleWork; import com.fr.workspace.simple.SimpleWork;
import com.fr.chart.activator.ChartBaseActivator;
import com.fr.base.operator.common.CommonOperator;
import com.fr.env.operator.CommonOperatorImpl;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;

9
src/main/java/com/fr/io/ExportExcel.java

@ -1,14 +1,11 @@
package com.fr.io; package com.fr.io;
import java.io.File; import com.fr.base.Parameter;
import java.io.FileOutputStream;
import com.fr.base.operator.common.CommonOperator; import com.fr.base.operator.common.CommonOperator;
import com.fr.chart.activator.ChartBaseActivator; import com.fr.chart.activator.ChartBaseActivator;
import com.fr.config.activator.BaseDBActivator; import com.fr.config.activator.BaseDBActivator;
import com.fr.config.activator.ConfigurationActivator; import com.fr.config.activator.ConfigurationActivator;
import com.fr.data.impl.config.activator.RestrictionActivator;
import com.fr.env.operator.CommonOperatorImpl; import com.fr.env.operator.CommonOperatorImpl;
import com.fr.base.Parameter;
import com.fr.io.exporter.ExcelExporter; import com.fr.io.exporter.ExcelExporter;
import com.fr.io.exporter.LargeDataPageExcelExporter; import com.fr.io.exporter.LargeDataPageExcelExporter;
import com.fr.io.exporter.PageExcel2007Exporter; import com.fr.io.exporter.PageExcel2007Exporter;
@ -21,12 +18,16 @@ import com.fr.main.workbook.ResultWorkBook;
import com.fr.module.Module; import com.fr.module.Module;
import com.fr.module.tool.ActivatorToolBox; import com.fr.module.tool.ActivatorToolBox;
import com.fr.report.ReportActivator; import com.fr.report.ReportActivator;
import com.fr.report.RestrictionActivator;
import com.fr.report.core.ReportUtils; import com.fr.report.core.ReportUtils;
import com.fr.report.module.ReportBaseActivator; import com.fr.report.module.ReportBaseActivator;
import com.fr.stable.WriteActor; import com.fr.stable.WriteActor;
import com.fr.store.StateServerActivator; import com.fr.store.StateServerActivator;
import com.fr.workspace.simple.SimpleWork; import com.fr.workspace.simple.SimpleWork;
import java.io.File;
import java.io.FileOutputStream;
public class ExportExcel { public class ExportExcel {
public static void main(String[] args) { public static void main(String[] args) {

12
src/main/java/com/fr/io/ExportReports.java

@ -1,20 +1,18 @@
package com.fr.io; package com.fr.io;
import java.io.File;
import java.io.FileOutputStream; import com.fr.base.Parameter;
import java.io.OutputStream;
import com.fr.base.operator.common.CommonOperator; import com.fr.base.operator.common.CommonOperator;
import com.fr.chart.activator.ChartBaseActivator; import com.fr.chart.activator.ChartBaseActivator;
import com.fr.config.activator.BaseDBActivator; import com.fr.config.activator.BaseDBActivator;
import com.fr.config.activator.ConfigurationActivator; import com.fr.config.activator.ConfigurationActivator;
import com.fr.data.impl.config.activator.RestrictionActivator;
import com.fr.env.operator.CommonOperatorImpl; import com.fr.env.operator.CommonOperatorImpl;
import com.fr.base.Parameter;
import com.fr.io.exporter.PageExcelExporter; import com.fr.io.exporter.PageExcelExporter;
import com.fr.main.TemplateWorkBook; import com.fr.main.TemplateWorkBook;
import com.fr.main.workbook.PageWorkBook; import com.fr.main.workbook.PageWorkBook;
import com.fr.module.Module; import com.fr.module.Module;
import com.fr.module.tool.ActivatorToolBox; import com.fr.module.tool.ActivatorToolBox;
import com.fr.report.ReportActivator; import com.fr.report.ReportActivator;
import com.fr.report.RestrictionActivator;
import com.fr.report.core.ReportUtils; import com.fr.report.core.ReportUtils;
import com.fr.report.module.ReportBaseActivator; import com.fr.report.module.ReportBaseActivator;
import com.fr.report.report.PageReport; import com.fr.report.report.PageReport;
@ -22,6 +20,10 @@ import com.fr.stable.PageActor;
import com.fr.store.StateServerActivator; import com.fr.store.StateServerActivator;
import com.fr.workspace.simple.SimpleWork; import com.fr.workspace.simple.SimpleWork;
import java.io.File;
import java.io.FileOutputStream;
import java.io.OutputStream;
public class ExportReports { public class ExportReports {
public static void main(String[] args) { public static void main(String[] args) {
// 首先需要定义执行所在的环境,这样才能正确读取数据库信息 // 首先需要定义执行所在的环境,这样才能正确读取数据库信息

4
src/main/java/com/fr/io/JavaPrint.java

@ -1,16 +1,18 @@
package com.fr.io; package com.fr.io;
import com.fr.base.Parameter; import com.fr.base.Parameter;
import com.fr.config.activator.BaseDBActivator; import com.fr.config.activator.BaseDBActivator;
import com.fr.config.activator.ConfigurationActivator; import com.fr.config.activator.ConfigurationActivator;
import com.fr.data.impl.config.activator.RestrictionActivator;
import com.fr.main.TemplateWorkBook; import com.fr.main.TemplateWorkBook;
import com.fr.module.Module; import com.fr.module.Module;
import com.fr.module.tool.ActivatorToolBox; import com.fr.module.tool.ActivatorToolBox;
import com.fr.print.PrintUtils; import com.fr.print.PrintUtils;
import com.fr.report.ReportActivator; import com.fr.report.ReportActivator;
import com.fr.report.RestrictionActivator;
import com.fr.report.module.ReportBaseActivator; import com.fr.report.module.ReportBaseActivator;
import com.fr.store.StateServerActivator; import com.fr.store.StateServerActivator;
import com.fr.workspace.simple.SimpleWork; import com.fr.workspace.simple.SimpleWork;
import java.util.HashMap; import java.util.HashMap;
public class JavaPrint { public class JavaPrint {

15
src/main/java/com/fr/io/SaveReportToDatabase.java

@ -1,24 +1,25 @@
package com.fr.io; package com.fr.io;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.PreparedStatement;
import com.fr.base.operator.common.CommonOperator; import com.fr.base.operator.common.CommonOperator;
import com.fr.chart.activator.ChartBaseActivator; import com.fr.chart.activator.ChartBaseActivator;
import com.fr.config.activator.BaseDBActivator; import com.fr.config.activator.BaseDBActivator;
import com.fr.config.activator.ConfigurationActivator; import com.fr.config.activator.ConfigurationActivator;
import com.fr.data.impl.config.activator.RestrictionActivator;
import com.fr.env.operator.CommonOperatorImpl; import com.fr.env.operator.CommonOperatorImpl;
import com.fr.module.Module; import com.fr.module.Module;
import com.fr.module.tool.ActivatorToolBox; import com.fr.module.tool.ActivatorToolBox;
import com.fr.report.ReportActivator; import com.fr.report.ReportActivator;
import com.fr.report.RestrictionActivator;
import com.fr.report.module.ReportBaseActivator; import com.fr.report.module.ReportBaseActivator;
import com.fr.store.StateServerActivator; import com.fr.store.StateServerActivator;
import com.fr.workspace.simple.SimpleWork; import com.fr.workspace.simple.SimpleWork;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.PreparedStatement;
public class SaveReportToDatabase { public class SaveReportToDatabase {
public static void main(String[] args) { public static void main(String[] args) {
SaveReport(); SaveReport();

2
src/main/java/com/fr/io/SetParameterWindow.java

@ -5,7 +5,6 @@ import com.fr.base.operator.common.CommonOperator;
import com.fr.chart.activator.ChartBaseActivator; import com.fr.chart.activator.ChartBaseActivator;
import com.fr.config.activator.BaseDBActivator; import com.fr.config.activator.BaseDBActivator;
import com.fr.config.activator.ConfigurationActivator; import com.fr.config.activator.ConfigurationActivator;
import com.fr.data.impl.config.activator.RestrictionActivator;
import com.fr.env.operator.CommonOperatorImpl; import com.fr.env.operator.CommonOperatorImpl;
import com.fr.general.Background; import com.fr.general.Background;
import com.fr.io.exporter.EmbeddedTableDataExporter; import com.fr.io.exporter.EmbeddedTableDataExporter;
@ -14,6 +13,7 @@ import com.fr.main.parameter.ReportParameterAttr;
import com.fr.module.Module; import com.fr.module.Module;
import com.fr.module.tool.ActivatorToolBox; import com.fr.module.tool.ActivatorToolBox;
import com.fr.report.ReportActivator; import com.fr.report.ReportActivator;
import com.fr.report.RestrictionActivator;
import com.fr.report.module.ReportBaseActivator; import com.fr.report.module.ReportBaseActivator;
import com.fr.store.StateServerActivator; import com.fr.store.StateServerActivator;
import com.fr.workspace.simple.SimpleWork; import com.fr.workspace.simple.SimpleWork;

2
src/main/java/com/fr/io/SimpleDemo.java

@ -5,13 +5,13 @@ import com.fr.base.operator.common.CommonOperator;
import com.fr.chart.activator.ChartBaseActivator; import com.fr.chart.activator.ChartBaseActivator;
import com.fr.config.activator.BaseDBActivator; import com.fr.config.activator.BaseDBActivator;
import com.fr.config.activator.ConfigurationActivator; import com.fr.config.activator.ConfigurationActivator;
import com.fr.data.impl.config.activator.RestrictionActivator;
import com.fr.env.operator.CommonOperatorImpl; import com.fr.env.operator.CommonOperatorImpl;
import com.fr.general.FRFont; import com.fr.general.FRFont;
import com.fr.main.impl.WorkBook; import com.fr.main.impl.WorkBook;
import com.fr.module.Module; import com.fr.module.Module;
import com.fr.module.tool.ActivatorToolBox; import com.fr.module.tool.ActivatorToolBox;
import com.fr.report.ReportActivator; import com.fr.report.ReportActivator;
import com.fr.report.RestrictionActivator;
import com.fr.report.cell.CellElement; import com.fr.report.cell.CellElement;
import com.fr.report.elementcase.TemplateElementCase; import com.fr.report.elementcase.TemplateElementCase;
import com.fr.report.module.ReportBaseActivator; import com.fr.report.module.ReportBaseActivator;

Loading…
Cancel
Save