From 3478bd0ac6fd0a5e5dc49825dd96abea4a52c4d7 Mon Sep 17 00:00:00 2001 From: zack Date: Fri, 16 Jul 2021 16:09:54 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=20demo?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E6=89=93=E5=8C=85=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.xml | 4 ++-- src/test/main/java/com/fr/demo/ExportApiTest.java | 2 ++ src/test/main/java/com/fr/demo/ModuleStartTest.java | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml index d046c95..2e1aa50 100644 --- a/build.xml +++ b/build.xml @@ -84,8 +84,8 @@ - - + + diff --git a/src/test/main/java/com/fr/demo/ExportApiTest.java b/src/test/main/java/com/fr/demo/ExportApiTest.java index 061a20f..ff72887 100644 --- a/src/test/main/java/com/fr/demo/ExportApiTest.java +++ b/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; diff --git a/src/test/main/java/com/fr/demo/ModuleStartTest.java b/src/test/main/java/com/fr/demo/ModuleStartTest.java index 63c6f4b..b578cff 100644 --- a/src/test/main/java/com/fr/demo/ModuleStartTest.java +++ b/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; From 5ea33e506823ba170885f756f19f8f08c2de590f Mon Sep 17 00:00:00 2001 From: zack Date: Mon, 27 Dec 2021 10:44:05 +0800 Subject: [PATCH 2/8] =?UTF-8?q?DEMO-20364=20=E5=AF=BC=E5=87=BAexcel2003?= =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=88=8A=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/fr/io/ExportApi.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/fr/io/ExportApi.java b/src/main/java/com/fr/io/ExportApi.java index f6cad8c..5b764d9 100644 --- a/src/main/java/com/fr/io/ExportApi.java +++ b/src/main/java/com/fr/io/ExportApi.java @@ -91,6 +91,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文件*/ From bf88811291be229d291aaf5e564b5ebcaae4a890 Mon Sep 17 00:00:00 2001 From: zack Date: Tue, 28 Dec 2021 17:40:18 +0800 Subject: [PATCH 3/8] =?UTF-8?q?REPORT-65118=20REPORT-64392=20=E8=BF=99?= =?UTF-8?q?=E4=B8=AA=E4=BB=BB=E5=8A=A1=E5=86=8D=E7=9C=8B=E4=B8=8B=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E7=AB=AF=E6=8A=A5=E9=94=99=E4=BE=A7=E6=9C=89=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E8=83=BD=E4=BC=98=E5=8C=96=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/demo/NewReadFrmFromDatabase.java | 18 ++++++++++-------- .../java/com/fr/demo/ReadFromDatabase.java | 4 +++- .../java/com/fr/demo/ReadfrmFromDatabase.java | 8 +++++--- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/fr/demo/NewReadFrmFromDatabase.java b/src/main/java/com/fr/demo/NewReadFrmFromDatabase.java index 8186fe9..8350a6b 100644 --- a/src/main/java/com/fr/demo/NewReadFrmFromDatabase.java +++ b/src/main/java/com/fr/demo/NewReadFrmFromDatabase.java @@ -1,16 +1,18 @@ package com.fr.demo; import com.fr.data.core.db.DBUtils; -import com.fr.web.weblet.DBFormlet; import com.fr.form.main.Form; -import java.sql.SQLException; -import javax.servlet.http.HttpServletRequest; 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; @@ -26,7 +28,7 @@ public class NewReadFrmFromDatabase extends DBFormlet { @Override public Form createForm(String reportName) { - Form form = new Form(); + Form form = null; Connection connection = null; try { connection = getConnection(); @@ -43,20 +45,20 @@ public class NewReadFrmFromDatabase extends DBFormlet { return form; } } catch (Exception e) { - e.printStackTrace(); + throw SessionLocalManager.createLogPackedException(e); }finally { DBUtils.closeConnection(connection); } - return null; + return form; } private static Connection getConnection() throws ClassNotFoundException, SQLException { // 定义数据连接(根据你实际数据库信息进行修改) String driver = "com.mysql.jdbc.Driver"; - String url = "jdbc:mysql://localhost:3306/test"; + String url = "jdbc:mysql://localhost:3306/frtest"; String user = "root"; - String pass = "123456"; + String pass = "root"; Class.forName(driver); Connection conn = DriverManager.getConnection(url, user, pass); return conn; diff --git a/src/main/java/com/fr/demo/ReadFromDatabase.java b/src/main/java/com/fr/demo/ReadFromDatabase.java index c5ad4eb..f78c426 100644 --- a/src/main/java/com/fr/demo/ReadFromDatabase.java +++ b/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; } diff --git a/src/main/java/com/fr/demo/ReadfrmFromDatabase.java b/src/main/java/com/fr/demo/ReadfrmFromDatabase.java index 601fca0..143ea1f 100644 --- a/src/main/java/com/fr/demo/ReadfrmFromDatabase.java +++ b/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; @@ -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; From e79e8f895ea2dd09ce23ee3e202456770743b1a5 Mon Sep 17 00:00:00 2001 From: zack Date: Tue, 28 Dec 2021 17:43:21 +0800 Subject: [PATCH 4/8] 1 --- src/main/java/com/fr/demo/NewReadFrmFromDatabase.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/fr/demo/NewReadFrmFromDatabase.java b/src/main/java/com/fr/demo/NewReadFrmFromDatabase.java index 8350a6b..0895cc7 100644 --- a/src/main/java/com/fr/demo/NewReadFrmFromDatabase.java +++ b/src/main/java/com/fr/demo/NewReadFrmFromDatabase.java @@ -56,9 +56,9 @@ public class NewReadFrmFromDatabase extends DBFormlet { private static Connection getConnection() throws ClassNotFoundException, SQLException { // 定义数据连接(根据你实际数据库信息进行修改) String driver = "com.mysql.jdbc.Driver"; - String url = "jdbc:mysql://localhost:3306/frtest"; + String url = "jdbc:mysql://localhost:3306/test"; String user = "root"; - String pass = "root"; + String pass = "123456"; Class.forName(driver); Connection conn = DriverManager.getConnection(url, user, pass); return conn; From 2d925ee7af05d2a8eb2c8894ca9b4bfa2ed3df1c Mon Sep 17 00:00:00 2001 From: zack Date: Tue, 4 Jan 2022 17:03:56 +0800 Subject: [PATCH 5/8] =?UTF-8?q?REPORT-65380=20=E5=BC=95=E6=93=8EAPI>?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=A8=A1=E6=9D=BF=E8=87=B3=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E4=BB=A3=E7=A0=81=E7=BC=96=E8=AF=91=E5=87=BA=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/io/SaveReportToDatabase.java | 78 ------------------- 1 file changed, 78 deletions(-) delete mode 100644 src/main/java/com/fr/io/SaveReportToDatabase.java diff --git a/src/main/java/com/fr/io/SaveReportToDatabase.java b/src/main/java/com/fr/io/SaveReportToDatabase.java deleted file mode 100644 index 1608a48..0000000 --- a/src/main/java/com/fr/io/SaveReportToDatabase.java +++ /dev/null @@ -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(); - } - } -} \ No newline at end of file From 59aa0ad8be696942a0fc7cfeb61d48c5db2b109b Mon Sep 17 00:00:00 2001 From: zack Date: Thu, 13 Jan 2022 14:13:24 +0800 Subject: [PATCH 6/8] =?UTF-8?q?REPORT-64392=20=E8=BF=99=E4=B8=AA=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=86=8D=E7=9C=8B=E4=B8=8B=E4=BA=A7=E5=93=81=E7=AB=AF?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BE=A7=E6=9C=89=E6=B2=A1=E6=9C=89=E8=83=BD?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/fr/demo/NewReadFrmFromDatabase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/fr/demo/NewReadFrmFromDatabase.java b/src/main/java/com/fr/demo/NewReadFrmFromDatabase.java index 0895cc7..a802f3d 100644 --- a/src/main/java/com/fr/demo/NewReadFrmFromDatabase.java +++ b/src/main/java/com/fr/demo/NewReadFrmFromDatabase.java @@ -28,7 +28,7 @@ public class NewReadFrmFromDatabase extends DBFormlet { @Override public Form createForm(String reportName) { - Form form = null; + Form form = new Form(); Connection connection = null; try { connection = getConnection(); From fb54bae1b013ba81daaa94b7cbfa59825c01498f Mon Sep 17 00:00:00 2001 From: "Rosie.Xu" <3392418386@qq.com> Date: Sun, 16 Jan 2022 18:06:33 +0800 Subject: [PATCH 7/8] =?UTF-8?q?https://work.fineres.com/browse/REPORT-6552?= =?UTF-8?q?4=20=E4=BF=AE=E6=94=B9DEMO=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/fr/data/XMLDemoTableData.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/fr/data/XMLDemoTableData.java b/src/main/java/com/fr/data/XMLDemoTableData.java index f9ed76b..66e9498 100644 --- a/src/main/java/com/fr/data/XMLDemoTableData.java +++ b/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(); } } -} \ No newline at end of file +} From 3f7ff140f8805872e35156a7ce6772d5680410ed Mon Sep 17 00:00:00 2001 From: "Bruce.Deng" Date: Tue, 14 Mar 2023 15:33:22 +0800 Subject: [PATCH 8/8] =?UTF-8?q?REPORT-88257=20=E5=AF=BC=E5=87=BAAPI?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=80=82=E9=85=8D11.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/fr/io/ExportApi.java | 29 -------------------------- 1 file changed, 29 deletions(-) diff --git a/src/main/java/com/fr/io/ExportApi.java b/src/main/java/com/fr/io/ExportApi.java index 5b764d9..1d43079 100644 --- a/src/main/java/com/fr/io/ExportApi.java +++ b/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; @@ -27,25 +25,18 @@ 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(), @@ -138,24 +129,4 @@ public class ExportApi { } } - 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; - } }