Browse Source

修复了日志bug,Excel导出不识别类型的bug,打包上传源码

4.1.3.A
jueyue 10 years ago
parent
commit
14eaf4966f
10 changed files with 55 additions and 21 deletions
  1. +3
    -3
      easypoi-base/src/main/java/org/jeecgframework/poi/cache/ExcelCache.java
  2. +2
    -2
      easypoi-base/src/main/java/org/jeecgframework/poi/cache/WordCache.java
  3. +3
    -3
      easypoi-base/src/main/java/org/jeecgframework/poi/cache/manager/FileLoade.java
  4. +1
    -1
      easypoi-base/src/main/java/org/jeecgframework/poi/cache/manager/POICacheManager.java
  5. +0
    -1
      easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java
  6. +1
    -1
      easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.java
  7. +1
    -1
      easypoi-base/src/main/java/org/jeecgframework/poi/word/parse/ParseWord07.java
  8. +2
    -2
      easypoi-test/.classpath
  9. +16
    -7
      easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/JeecgTemplateExcelView.java
  10. +26
    -0
      pom.xml

+ 3
- 3
easypoi-base/src/main/java/org/jeecgframework/poi/cache/ExcelCache.java View File

@@ -34,14 +34,14 @@ public final class ExcelCache {
}
return wb;
} catch (InvalidFormatException e) {
LOGGER.error(e.getMessage(), e.fillInStackTrace());
LOGGER.error(e.getMessage(),e);
} catch (IOException e) {
LOGGER.error(e.getMessage(), e.fillInStackTrace());
LOGGER.error(e.getMessage(),e);
} finally {
try {
is.close();
} catch (IOException e) {
LOGGER.error(e.getMessage(), e.fillInStackTrace());
LOGGER.error(e.getMessage(),e);
}
}
return null;


+ 2
- 2
easypoi-base/src/main/java/org/jeecgframework/poi/cache/WordCache.java View File

@@ -25,12 +25,12 @@ public class WordCache {
MyXWPFDocument doc = new MyXWPFDocument(is);
return doc;
} catch (Exception e) {
LOGGER.error(e.getMessage(), e.fillInStackTrace());
LOGGER.error(e.getMessage(),e);
} finally {
try {
is.close();
} catch (IOException e) {
LOGGER.error(e.getMessage(), e.fillInStackTrace());
LOGGER.error(e.getMessage(),e);
}
}
return null;


+ 3
- 3
easypoi-base/src/main/java/org/jeecgframework/poi/cache/manager/FileLoade.java View File

@@ -34,9 +34,9 @@ class FileLoade {
baos.flush();
return baos.toByteArray();
} catch (FileNotFoundException e) {
LOGGER.error(e.getMessage(), e.fillInStackTrace());
LOGGER.error(e.getMessage(),e);
} catch (IOException e) {
LOGGER.error(e.getMessage(), e.fillInStackTrace());
LOGGER.error(e.getMessage(),e);
} finally {
try {
if (fileis != null)
@@ -44,7 +44,7 @@ class FileLoade {
if (fileis != null)
baos.close();
} catch (IOException e) {
LOGGER.error(e.getMessage(), e.fillInStackTrace());
LOGGER.error(e.getMessage(),e);
}
}
LOGGER.error(fileis + "这个路径文件没有找到,请查询");


+ 1
- 1
easypoi-base/src/main/java/org/jeecgframework/poi/cache/manager/POICacheManager.java View File

@@ -43,7 +43,7 @@ public final class POICacheManager {
byte[] result = Arrays.copyOf(loadingCache.get(id), loadingCache.get(id).length);
return new ByteArrayInputStream(result);
} catch (ExecutionException e) {
LOGGER.error(e.getMessage(), e.fillInStackTrace());
LOGGER.error(e.getMessage(),e);
}
return null;
}


+ 0
- 1
easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java View File

@@ -219,7 +219,6 @@ public class ExcelExportServer extends ExcelExportBase {
}
} catch (Exception e) {
e.printStackTrace();
logger.error(e.getMessage(),e);
throw new ExcelExportException(ExcelExportEnum.EXPORT_ERROR, e.getCause());
}


+ 1
- 1
easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.java View File

@@ -148,7 +148,7 @@ public final class ExcelExportOfTemplateUtil extends ExcelExportBase {
addDataToSheet(params, pojoClass, dataSet, wb.getSheetAt(0), wb);
}
} catch (Exception e) {
LOGGER.error(e.getMessage(), e.fillInStackTrace());
LOGGER.error(e.getMessage(),e);
return null;
}
return wb;


+ 1
- 1
easypoi-base/src/main/java/org/jeecgframework/poi/word/parse/ParseWord07.java View File

@@ -57,7 +57,7 @@ public class ParseWord07 {
.getNextPicNameNumber((Integer) isAndType[1]), obj.getWidth(), obj.getHeight());
} catch (Exception e) {
LOGGER.error(e.getMessage(), e.fillInStackTrace());
LOGGER.error(e.getMessage(),e);
}
}


+ 2
- 2
easypoi-test/.classpath View File

@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/test-classes" path="src/main/java">
<classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="src/test"/>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/main/resources">
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>


+ 16
- 7
easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/JeecgTemplateExcelView.java View File

@@ -7,6 +7,7 @@ import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Workbook;
import org.jeecgframework.poi.excel.ExcelExportUtil;
import org.jeecgframework.poi.excel.entity.TemplateExportParams;
@@ -25,6 +26,9 @@ public class JeecgTemplateExcelView extends AbstractView {
private static final String CONTENT_TYPE = "application/vnd.ms-excel";
private static final String HSSF = ".xls";
private static final String XSSF = ".xlsx";
public JeecgTemplateExcelView() {
setContentType(CONTENT_TYPE);
}
@@ -37,9 +41,19 @@ public class JeecgTemplateExcelView extends AbstractView {
@Override
protected void renderMergedOutputModel(Map<String, Object> model, HttpServletRequest request,
HttpServletResponse response) throws Exception {
String codedFileName = "临时文件.xls";
String codedFileName = "临时文件";
Workbook workbook = ExcelExportUtil.exportExcel(
(TemplateExportParams) model.get(TemplateExcelConstants.PARAMS),
(Class<?>) model.get(TemplateExcelConstants.CLASS),
(List<?>) model.get(TemplateExcelConstants.LIST_DATA),
(Map<String, Object>) model.get(TemplateExcelConstants.MAP_DATA));
if (model.containsKey(NormalExcelConstants.FILE_NAME)) {
codedFileName = (String) model.get(NormalExcelConstants.FILE_NAME) + ".xls";
codedFileName = (String) model.get(NormalExcelConstants.FILE_NAME);
}
if (workbook instanceof HSSFWorkbook) {
codedFileName += HSSF;
} else {
codedFileName += XSSF;
}
if (isIE(request)) {
codedFileName = java.net.URLEncoder.encode(codedFileName, "UTF8");
@@ -47,11 +61,6 @@ public class JeecgTemplateExcelView extends AbstractView {
codedFileName = new String(codedFileName.getBytes("UTF-8"), "ISO-8859-1");
}
response.setHeader("content-disposition", "attachment;filename=" + codedFileName);
Workbook workbook = ExcelExportUtil.exportExcel(
(TemplateExportParams) model.get(TemplateExcelConstants.PARAMS),
(Class<?>) model.get(TemplateExcelConstants.CLASS),
(List<?>) model.get(TemplateExcelConstants.LIST_DATA),
(Map<String, Object>) model.get(TemplateExcelConstants.MAP_DATA));
ServletOutputStream out = response.getOutputStream();
workbook.write(out);
out.flush();


+ 26
- 0
pom.xml View File

@@ -137,7 +137,33 @@
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<version>2.1</version>
<configuration>
<attach>true</attach>
</configuration>
<executions>
<execution>
<phase>compile</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<distributionManagement>
<repository>
<id>postaop-common-release</id>
<url>http://192.168.1.99:8081/nexus/content/repositories/postaop-common-release/</url>
</repository>
<snapshotRepository>
<id>postaop-common-snapshot</id>
<url>http://192.168.1.99:8081/nexus/content/repositories/postaop-common-snapshot/</url>
</snapshotRepository>
</distributionManagement>
</project>

Loading…
Cancel
Save