Pull request #69: REPORT-113769 修改WebService程序数据集帮助文档中的示例代码

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

* commit '4c97624bdcd15c897c2348173b0d33a156f39d5d':
  修复代码问题
  REPORT-113769 修改WebService程序数据集帮助文档中的示例代码

build.xml

@@ -84,8 +84,8 @@
             <param name="resources_from" value="${basedir}"/>
         </antcall>
         <antcall target="compile_javas">
-            <param name="source_jdk_version" value="1.6"/>
-            <param name="target_jdk_version" value="1.6"/>
+            <param name="source_jdk_version" value="1.8"/>
+            <param name="target_jdk_version" value="1.8"/>
             <param name="compile_jdk_version" value="${jdk.home}"/>
             <param name="compile_files" value="${basedir}/src"/>
         </antcall>

src/main/java/com/fr/data/ParamTableDataDemo.java

@@ -2,11 +2,14 @@ package com.fr.data;
 
 import com.fr.base.FRContext;
 import com.fr.file.DatasourceManager;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.ParameterProvider;
+
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.ArrayList;
 
@@ -92,10 +95,11 @@ public class ParamTableDataDemo extends AbstractTableData {
         // 保存得到的结果集
         valueList = new ArrayList();
         // 下面开始建立数据库连接，按照刚才的SQL语句进行查询
+        // 根据连接名获取FR数据连接定义的数据连接，如果没有定义，也可以参考getConnection方法自己创建连接
         com.fr.data.impl.Connection conn = DatasourceManager.getInstance().getConnection("FRDemo");
-
+        Connection con = null;
         try {
-            Connection con = conn.createConnection();
+            con = conn.createConnection();
             Statement stmt = con.createStatement();
             ResultSet rs = stmt.executeQuery(sql);
             // 获得记录的详细信息，然后获得总列数
@@ -118,7 +122,15 @@ public class ParamTableDataDemo extends AbstractTableData {
             // 打印一共取到的数据行数量
 
         } catch (Exception e) {
-            e.printStackTrace();
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+        } finally {
+            if (con != null) {
+                try {
+                    con.close();
+                } catch (SQLException e) {
+                    FineLoggerFactory.getLogger().error(e.getMessage(), e);
+                }
+            }
         }
     }
 
@@ -133,14 +145,13 @@ public class ParamTableDataDemo extends AbstractTableData {
         String url = "jdbc:sqlite:////Applications//FineReport10_325//webapps//webroot//help//FRDemo.db";
         String username = "";
         String password = "";
-        Connection con;
+        Connection con = null;
         try {
             Class.forName(driverName);
             con = DriverManager.getConnection(url, username, password);
 
         } catch (Exception e) {
-            e.printStackTrace();
-            return null;
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
         return con;
     }

src/main/java/com/fr/data/SimpleArrayTableDataDemo.java

@@ -0,0 +1,29 @@
+package com.fr.data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SimpleArrayTableDataDemo extends SimpleTableData {
+
+    /**
+     * 初始化列头
+     * @return
+     */
+    @Override
+    public String[] initColumnNames() {
+        return new String[]{"Name", "Score"};
+    }
+
+    /**
+     * 加载行列数据
+     * @return
+     */
+    @Override
+    public List<Object[]> loadData() {
+        ArrayList<Object[]> valueList = new ArrayList();
+        valueList.add(new Object[]{"Alex", 15});
+        valueList.add(new Object[]{"Helly", 22});
+        valueList.add(new Object[]{"Bobby", 99});
+        return valueList;
+    }
+}

src/main/java/com/fr/data/SimpleParamTableDataDemo.java

@@ -0,0 +1,100 @@
+package com.fr.data;
+
+import com.fr.file.ConnectionConfig;
+import com.fr.log.FineLoggerFactory;
+import com.fr.stable.ParameterProvider;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 带参数的程序数据集Demo 跟ParamTableDataDemo功能一样，但实现更简单
+ *
+ * @author fanruan
+ */
+public class SimpleParamTableDataDemo extends SimpleTableData {
+
+    @Override
+    public String[] initColumnNames() {
+        String[] columnNames = new String[10];
+        for (int i = 0; i < 10; i++) {
+            columnNames[i] = "column#" + i;
+        }
+        return columnNames;
+    }
+
+    @Override
+    public List<Object[]> loadData() {
+        // 保存得到的数据库表名
+        String tableName = ((ParameterProvider) (parameters.get().toArray())[0]).getValue().toString();
+
+        // 构造SQL语句,并打印出来
+        String sql = "select * from " + tableName;
+        FineLoggerFactory.getLogger().info("Query SQL of ParamTableDataDemo: \n" + sql);
+        // 保存得到的结果集
+        ArrayList<Object[]> valueList = new ArrayList();
+        // 下面开始建立数据库连接，按照刚才的SQL语句进行查询
+        // 根据连接名获取FR数据连接定义的数据连接，如果没有定义，也可以参考getConnection方法自己创建连接
+        com.fr.data.impl.Connection conn = ConnectionConfig.getInstance().getConnection("FRDemo");
+        Connection con = null;
+        try {
+            con = conn.createConnection();
+            Statement stmt = con.createStatement();
+            ResultSet rs = stmt.executeQuery(sql);
+            // 获得记录的详细信息，然后获得总列数
+            ResultSetMetaData rsmd = rs.getMetaData();
+            int colNum = rsmd.getColumnCount();
+            // 用对象保存数据
+            Object[] objArray = null;
+            while (rs.next()) {
+                objArray = new Object[colNum];
+                for (int i = 0; i < colNum; i++) {
+                    objArray[i] = rs.getObject(i + 1);
+                }
+                // 在valueList中加入这一行数据
+                valueList.add(objArray);
+            }
+            // 释放数据库资源
+            rs.close();
+            stmt.close();
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+        } finally {
+            try {
+                if (con != null) {
+                    con.close();
+                }
+            } catch (SQLException e) {
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            }
+        }
+        return valueList;
+    }
+    /**
+     * 获取数据库连接 driverName和 url 可以换成您需要的
+     *
+     * @return Connection
+     */
+    private Connection getConnection() {
+
+        String driverName = "org.sqlite.JDBC";
+        String url = "jdbc:sqlite:////Applications//FineReport10_325//webapps//webroot//help//FRDemo.db";
+        String username = "";
+        String password = "";
+        Connection con = null;
+        try {
+            Class.forName(driverName);
+            con = DriverManager.getConnection(url, username, password);
+
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+        }
+        return con;
+    }
+}

src/main/java/com/fr/data/WebServiceTableData.java

@@ -1,38 +1,87 @@
 package com.fr.data;
 
-import javax.xml.namespace.QName;
+import com.fr.general.data.TableDataException;
+import com.fr.log.FineLoggerFactory;
+import com.fr.stable.ParameterProvider;
 import org.apache.axis.client.Call;
 import org.apache.axis.client.Service;
-import com.fr.data.AbstractTableData;
-import com.fr.general.data.TableDataException;
 
-public class WebServiceTableData extends AbstractTableData{
-    private String[][] data;
+import javax.xml.namespace.QName;
+import java.util.ArrayList;
+import java.util.List;
 
-    public WebServiceTableData() {
-        this.data = this.createData();
-    }
+/**
+ * WebService程序数据集
+ *
+ * @author Roger
+ * @since 11.0
+ * Created on 2024/1/8
+ */
+public class WebServiceTableData extends SimpleTableData {
 
-    //获取列数
-    public int getColumnCount() throws TableDataException {
-        return data[0].length;
-    }
+    private static final int COLUMN_COUNT = 10;
 
-    //获取列的名称为数组中第一行的值
-    public String getColumnName(int columnIndex) throws TableDataException {
-        return data[0][columnIndex];
+    /**
+     * 初始化列名数组
+     *
+     * @return {col1,col2,col3...}
+     * @throws TableDataException
+     */
+    @Override
+    public String[] initColumnNames() {
+        String[] columnNames = new String[COLUMN_COUNT];
+        for (int i = 0; i < COLUMN_COUNT; i++) {
+            columnNames[i] = "column#" + i;
+        }
+        return columnNames;
     }
 
-    //获取行数为数据的长度-1
-    public int getRowCount() throws TableDataException {
-        return data.length - 1;
-    }
+    /**
+     * 加载数据
+     *
+     * @return 行列数据
+     */
+    @Override
+    public List<Object[]> loadData() {
+        String tableName = ((ParameterProvider) (parameters.get().toArray())[0]).getValue().toString();
+        FineLoggerFactory.getLogger().info("Query SQL of ParamTableDataDemo: {}", tableName);
 
-    //获取值
-    public Object getValueAt(int rowIndex, int columnIndex) {
-        return data[rowIndex + 1][columnIndex];
+        // 保存得到的结果集
+        ArrayList<Object[]> valueList = new ArrayList();
+
+        try {
+            // 调用 Web 服务获取数据
+            String[][] data = createData();
+
+            // 如果数据为空，直接返回空列表
+            if (data == null || data.length == 0) {
+                return valueList;
+            }
+
+            // 获得总列数
+            int colNum = data[0].length;
+
+            // 用对象保存数据
+            Object[] objArray = null;
+            for (int rowIndex = 1; rowIndex < data.length; rowIndex++) {
+                objArray = new Object[colNum];
+                for (int i = 0; i < colNum; i++) {
+                    objArray[i] = data[rowIndex][i];
+                }
+                // 在valueList中加入这一行数据
+                valueList.add(objArray);
+            }
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+        }
+        return valueList;
     }
 
+    /**
+     * 调用 Web 服务获取数据
+     *
+     * @return
+     */
     public String[][] createData() {
         try {
             String endpoint = "http://localhost:8080/axis/TestWS2TDClient.jws";

src/main/java/com/fr/data/XMLDemoTableData.java

@@ -77,6 +77,8 @@ public class XMLDemoTableData extends AbstractParameterTableData {
         try {
             in = new BufferedInputStream(new FileInputStream(new File(filePath)));
             XMLEventReader reader = inputFactory.createXMLEventReader(in);
+            deep=0;
+            flag=false;
             readCol(reader,list);
             in.close();
         } catch (Exception e) {
@@ -195,4 +197,4 @@ public class XMLDemoTableData extends AbstractParameterTableData {
             e.printStackTrace();
         }
     }
-}
+}

src/main/java/com/fr/demo/NewReadFrmFromDatabase.java

@@ -0,0 +1,72 @@
+package com.fr.demo;
+
+import com.fr.data.core.db.DBUtils;
+import com.fr.form.main.Form;
+import com.fr.log.FineLoggerFactory;
+import com.fr.web.session.SessionLocalManager;
+import com.fr.web.weblet.DBFormlet;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.InputStream;
+import java.sql.Blob;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Map;
+
+
+
+public class NewReadFrmFromDatabase extends DBFormlet {
+
+    @Override
+    public Form createForm(HttpServletRequest reportletRequest) {
+        String name = reportletRequest.getParameter("reportname");
+        return createForm(name);
+    }
+
+    @Override
+    public Form createForm(String reportName) {
+        Form form = new Form();
+        Connection connection = null;
+        try {
+            connection = getConnection();
+            // 从数据库中读模板
+            String sql = "select frm from report where frmname = '" + reportName
+                    + "'";
+            Statement smt = connection.createStatement();
+            ResultSet rs = smt.executeQuery(sql);
+            while (rs.next()) {
+                Blob blob = rs.getBlob(1);
+                FineLoggerFactory.getLogger().info(blob.toString());
+                InputStream ins = blob.getBinaryStream();
+                form.readStream(ins);
+                return form;
+            }
+        } catch (Exception e) {
+            throw SessionLocalManager.createLogPackedException(e);
+        }finally {
+            DBUtils.closeConnection(connection);
+        }
+
+        return form;
+    }
+
+    private static Connection getConnection() throws ClassNotFoundException, SQLException {
+        // 定义数据连接(根据你实际数据库信息进行修改)
+        String driver = "com.mysql.jdbc.Driver";
+        String url = "jdbc:mysql://localhost:3306/test";
+        String user = "root";
+        String pass = "123456";
+        Class.forName(driver);
+        Connection conn = DriverManager.getConnection(url, user, pass);
+        return conn;
+    }
+
+    @Override
+    public void setParameterMap(Map<String, Object> arg0) {
+        // TODO Auto-generated method stub
+
+    }
+}

src/main/java/com/fr/demo/ReadFromDatabase.java

@@ -5,6 +5,8 @@ import com.fr.main.impl.WorkBook;
 import com.fr.web.core.Reportlet;
 import com.fr.web.request.ReportletRequest;
 import com.fr.log.FineLoggerFactory;
+import com.fr.web.session.SessionLocalManager;
+
 import java.io.InputStream;
 import java.sql.Blob;
 import java.sql.Connection;
@@ -40,7 +42,7 @@ public class ReadFromDatabase extends Reportlet {
                 workbook.readStream(ins);
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            throw SessionLocalManager.createLogPackedException(e);
         }
         return workbook;
     }

src/main/java/com/fr/demo/ReadfrmFromDatabase.java

@@ -1,10 +1,12 @@
 package com.fr.demo;
  
+import com.fr.form.main.Form;
 import com.fr.io.utils.ResourceIOUtils;
+import com.fr.log.FineLoggerFactory;
+import com.fr.web.session.SessionLocalManager;
 import com.fr.web.weblet.Formlet;
-import com.fr.form.main.Form;
+
 import javax.servlet.http.HttpServletRequest;
-import com.fr.log.FineLoggerFactory;
 import java.io.InputStream;
 import java.sql.Blob;
 import java.sql.Connection;
@@ -31,7 +33,7 @@ public class ReadfrmFromDatabase extends Formlet {
             Class.forName(driver);
             Connection conn = DriverManager.getConnection(url, user, pass);
             // 从数据库中读模板
-            String sql = "select B from report where A = '" + name
+            String sql = "select frm from report where frmname = '" + name
                     + "'";
             Statement smt = conn.createStatement();
             ResultSet rs = smt.executeQuery(sql);
@@ -42,7 +44,7 @@ public class ReadfrmFromDatabase extends Formlet {
                 form.readStream(ins);
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            throw SessionLocalManager.createLogPackedException(e);
         }
         System.out.println(ResourceIOUtils.getRealPath("assets"));
         return form;

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

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

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

@@ -7,8 +7,6 @@ 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.general.log.Log4jConfig;
-import com.fr.general.log.parser.ExtraPatternParserManager;
 import com.fr.health.activator.ModuleHealActivator;
 import com.fr.io.exporter.CSVExporter;
 import com.fr.io.exporter.EmbeddedTableDataExporter;
@@ -20,53 +18,52 @@ 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.ModuleRole;
 import com.fr.module.tool.ActivatorToolBox;
 import com.fr.report.ReportActivator;
 import com.fr.report.RestrictionActivator;
 import com.fr.report.module.ReportBaseActivator;
-import com.fr.report.write.WriteActivator;
-import com.fr.scheduler.SchedulerActivator;
 import com.fr.stable.WriteActor;
-import com.fr.stable.resource.ResourceLoader;
 import com.fr.store.StateServiceActivator;
-import com.fr.third.apache.log4j.Level;
-import com.fr.third.apache.log4j.PropertyConfigurator;
 import com.fr.workspace.simple.SimpleWork;
 
 import java.io.FileOutputStream;
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Properties;
-
 
 public class ExportApi {
 
     public static void main(String[] args) {
-
-        initLog4j();
-
-        /**定义报表运行环境,用于执行报表*/
-        com.fr.module.Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
-                new ConfigurationActivator(),
-                new ResourceRepositoryActivator(),
-                new StandaloneModeActivator(),
-                new ModuleHealActivator(),
-                //2020.4.26jar包之前的版本，替换成StateServerActivator()
-                new StateServiceActivator(),
-                new SchedulerActivator(),
-                new ReportBaseActivator(),
-                new RestrictionActivator(),
-                new ReportActivator(),
-                new WriteActivator(),
-                new ChartBaseActivator());
-        SimpleWork.supply(CommonOperator.class, new CommonOperatorImpl());
-        //定义工程路径
-        String envpath = "D:\\javatools\\FineReport_10.0\\webapps\\webroot\\WEB-INF\\";
-        SimpleWork.checkIn(envpath);
-        I18nResource.getInstance();
-        module.start();
-
+        /**
+         * 以下这段if判断仅在main函数测试时使用，
+         * 实际生产环境中一般使用web容器，集成帆软后帆软服务会自动启动，不再需要下面的if判断，直接写导出的业务逻辑即可。
+         * web集成注意事项：
+         * 1、集成环境需要依赖【当前使用jdk对应版本的】tools.jar，一般从jdk中直接复制即可;
+         * 2、帆软服务自动启动成功后，使用的工作目录自动识别为集成应用下的WEB-INF目录，所以需要把下面代码中envpath指向的工作目录拷贝到集成环境下web应用的WEB-INF目录
+         *   （正式发布时需要拷贝生产环境的帆软WEB-INF，如果有的话），这样才能沿用原先帆软的配置及模板。如果是集群环境，会自动使用文件服务器的模板。本地测试时envpath需要指向【单机非集群】的帆软工程
+         * 3、可以访问集成环境的地址： ip:port/应用名/decision 。如果能成功访问且不需要初始化配置则代表帆软服务启动成功
+         */
+        if (!ModuleRole.Root.isPresent()) {
+            /**定义报表运行环境,用于执行报表*/
+            com.fr.module.Module module = ActivatorToolBox.simpleLink(
+                    new BaseDBActivator(),
+                    new ConfigurationActivator(),
+                    new ResourceRepositoryActivator(),
+                    new StandaloneModeActivator(),
+                    new ModuleHealActivator(),
+                    //2020.4.26jar包之前的版本，替换成StateServerActivator()
+                    new StateServiceActivator(),
+                    new ReportBaseActivator(),
+                    new RestrictionActivator(),
+                    new ReportActivator(),
+                    new ChartBaseActivator());
+            SimpleWork.supply(CommonOperator.class, new CommonOperatorImpl());
+            //定义工程路径
+            String envpath = "D:\\FineReport_11.0\\webapps\\webroot\\WEB-INF\\";
+            SimpleWork.checkIn(envpath);
+            I18nResource.getInstance();
+            module.start();
+        }
         /**输出模板*/
         try {
             // 定义输出的模板路径，以reportlets为根目录
@@ -91,6 +88,7 @@ public class ExportApi {
             /**将结果工作薄导出为2003Excel文件*/
             outputStream = new FileOutputStream(new java.io.File(outputUrl+"ExcelExport2003.xls"));
             ExcelExporter ExcelExport = new ExcelExporter();
+            ExcelExport.setVersion(true);
             ExcelExport.export(outputStream, workbook.execute(parameterMap, new WriteActor()));
 
             /**将结果工作薄导出为2007Excel文件*/
@@ -129,32 +127,9 @@ public class ExportApi {
             ImageExport.export(outputStream, workbook.execute(parameterMap, new WriteActor()));
 
             outputStream.close();
-            module.stop();
         } catch (Exception e) {
             e.printStackTrace();
-        } finally {
-            SimpleWork.checkOut();
         }
     }
 
-    private static void initLog4j() {
-
-        PropertyConfigurator.configure(loadLog4jPropertiesFromJar(Level.toLevel("INFO")));
-    }
-
-    private static Properties loadLog4jPropertiesFromJar(Level level) {
-
-        Properties properties = new Properties();
-
-        System.setProperty("LOG_HOME", System.getProperty("user.dir"));
-        System.setProperty("LOG_ROOT_LEVEL", level.toString());
-        ExtraPatternParserManager.setSystemProperty();
-        try {
-            properties.load(ResourceLoader.getResourceAsStream("/com/fr/general/log/log4j.properties", Log4jConfig.class));
-        } catch (IOException ignore) {
-            //do nothing
-        }
-
-        return properties;
-    }
 }

src/main/java/com/fr/io/ExportApi_frm.java

@@ -13,39 +13,50 @@ import com.fr.io.exporter.ImageExporter;
 import com.fr.io.exporter.PDFExporter;
 import com.fr.io.exporter.excel.stream.StreamExcel2007Exporter;
 import com.fr.main.workbook.ResultWorkBook;
-import com.fr.module.Module;
+import com.fr.module.ModuleRole;
 import com.fr.module.tool.ActivatorToolBox;
 import com.fr.report.ReportActivator;
 import com.fr.report.RestrictionActivator;
 import com.fr.report.module.ReportBaseActivator;
-import com.fr.report.write.WriteActivator;
-import com.fr.scheduler.SchedulerActivator;
 import com.fr.store.StateServiceActivator;
 import com.fr.workspace.simple.SimpleWork;
 
 import java.io.File;
 import java.io.FileOutputStream;
 
-public class ExportApi_frm { 
+public class ExportApi_frm {
+
     public static void main(String[] args) {
-        // 定义报表运行环境,用于执行报表
-        Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
-                new ConfigurationActivator(),
-                new ResourceRepositoryActivator(),
-                new StandaloneModeActivator(),
-                new ModuleHealActivator(),
-                new StateServiceActivator(),
-                new SchedulerActivator(),
-                new ReportBaseActivator(),
-                new RestrictionActivator(),
-                new ReportActivator(),
-                new WriteActivator(),
-                new ChartBaseActivator());
-        SimpleWork.supply(CommonOperator.class, new CommonOperatorImpl());
-        String envpath = "C:\\Users\\hipsh\\Desktop\\apache-tomcat-8.5.38-10.0\\webapps\\webroot\\WEB-INF\\";//工程路径
-        SimpleWork.checkIn(envpath);
-        I18nResource.getInstance();
-        module.start();
+        /**
+         * 以下这段if判断仅在main函数测试时使用，
+         * 实际生产环境中一般使用web容器，集成帆软后帆软服务会自动启动，不再需要下面的if判断，直接写导出的业务逻辑即可。
+         * web集成注意事项：
+         * 1、集成环境需要依赖【当前使用jdk对应版本的】tools.jar，一般从jdk中直接复制即可;
+         * 2、帆软服务自动启动成功后，使用的工作目录自动识别为集成应用下的WEB-INF目录，所以需要把下面代码中envpath指向的工作目录拷贝到集成环境下web应用的WEB-INF目录
+         *   （正式发布时需要拷贝生产环境的帆软WEB-INF，如果有的话），这样才能沿用原先帆软的配置及模板。如果是集群环境，会自动使用文件服务器的模板。本地测试时envpath需要指向【单机非集群】的帆软工程
+         * 3、可以访问集成环境的地址： ip:port/应用名/decision 。如果能成功访问且不需要初始化配置则代表帆软服务启动成功
+         */
+        if (!ModuleRole.Root.isPresent()) {
+            /**定义报表运行环境,用于执行报表*/
+            com.fr.module.Module module = ActivatorToolBox.simpleLink(
+                    new BaseDBActivator(),
+                    new ConfigurationActivator(),
+                    new ResourceRepositoryActivator(),
+                    new StandaloneModeActivator(),
+                    new ModuleHealActivator(),
+                    //2020.4.26jar包之前的版本，替换成StateServerActivator()
+                    new StateServiceActivator(),
+                    new ReportBaseActivator(),
+                    new RestrictionActivator(),
+                    new ReportActivator(),
+                    new ChartBaseActivator());
+            SimpleWork.supply(CommonOperator.class, new CommonOperatorImpl());
+            //定义工程路径
+            String envpath = "D:\\FineReport_11.0\\webapps\\webroot\\WEB-INF\\";
+            SimpleWork.checkIn(envpath);
+            I18nResource.getInstance();
+            module.start();
+        }
         try {
   
             java.util.Map parameterMap = new java.util.HashMap();
@@ -66,11 +77,8 @@ public class ExportApi_frm {
             ImageExporter ImageExport = new ImageExporter();
             ImageExport.export(outputStream, re);
             outputStream.close();
-            module.stop();
         } catch (Exception e) {
             e.printStackTrace();
-        } finally {
-            SimpleWork.checkOut();
         }
     }
 }

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

@@ -1,78 +0,0 @@
-package com.fr.io;
-
-import com.fr.base.operator.common.CommonOperator;
-import com.fr.chart.activator.ChartBaseActivator;
-import com.fr.cluster.engine.activator.standalone.StandaloneModeActivator;
-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;
-import com.fr.report.RestrictionActivator;
-import com.fr.report.module.ReportBaseActivator;
-import com.fr.report.write.WriteActivator;
-import com.fr.scheduler.SchedulerActivator;
-import com.fr.store.StateServiceActivator;
-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 static void main(String[] args) {
-        SaveReport();
-    }
-    private static void SaveReport() {
-        try {
-            // 连接数据库
-            String driver = "com.mysql.jdbc.Driver";
-            String url = "jdbc:mysql://review.finedevelop.com:3306/susie";
-            String user = "root";
-            String pass = "ilovejava";
-            Class.forName(driver);
-            Connection conn = DriverManager.getConnection(url, user, pass);
-            PreparedStatement presmt = conn
-                    .prepareStatement("insert into report values(?,?)");
-            // 读进需要保存入库的模板文件
-            // 首先需要定义执行所在的环境，这样才能正确读取数据库信息
-            // 定义报表运行环境,用于执行报表
-            Module module = ActivatorToolBox.simpleLink(new BaseDBActivator(),
-                    new ConfigurationActivator(),
-                    new ResourceRepositoryActivator(),
-                    new StandaloneModeActivator(),
-                    new ModuleHealActivator(),
-                    new StateServiceActivator(),
-                    new ChartBaseActivator(),
-                    new SchedulerActivator(),
-                    new ReportBaseActivator(),
-                    new RestrictionActivator(),
-                    new ReportActivator(),
-                    new WriteActivator());
-            SimpleWork.supply(CommonOperator.class, new CommonOperatorImpl());
-            String envpath = "//Applications//FineReport10_325//webapps//webroot//WEB-INF";//工程路径
-            SimpleWork.checkIn(envpath);
-            I18nResource.getInstance();
-            module.start();
-
-            File cptfile = new File("//doc//Primary//Parameter//Parameter.cpt");
-            int lens = (int) cptfile.length();
-            InputStream ins = new FileInputStream(cptfile);
-            // 将模板保存入库
-            presmt.setString(1, "Parameter.cpt"); // 第一个字段存放模板相对路径
-            presmt.setBinaryStream(2, ins, lens); // 第二个字段存放模板文件的二进制流
-            presmt.execute();
-            conn.commit();
-            presmt.close();
-            conn.close();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-}

src/test/main/java/com/fr/demo/ExportApiTest.java

@@ -7,6 +7,8 @@ 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.ResourceRepositoryActivator;
 import com.fr.io.TemplateWorkBookIO;
 import com.fr.io.exporter.excel.stream.StreamExcel2007Exporter;
 import com.fr.log.FineLoggerFactory;

src/test/main/java/com/fr/demo/ModuleStartTest.java

@@ -8,6 +8,8 @@ import com.fr.config.activator.ConfigurationActivator;
 import com.fr.env.operator.CommonOperatorImpl;
 import com.fr.general.FRLogger;
 import com.fr.general.I18nResource;
+import com.fr.health.activator.ModuleHealActivator;
+import com.fr.io.ResourceRepositoryActivator;
 import com.fr.io.TemplateWorkBookIO;
 import com.fr.log.FineLoggerFactory;
 import com.fr.log.LogHandler;