Bladeren bron

新增了文件校验的说明

4.1.3.A
jueyue 9 jaren geleden
bovenliggende
commit
dd44c7b63a
5 gewijzigde bestanden met toevoegingen van 11 en 15 verwijderingen
  1. BIN
      doc/EasyPoi教程.docx
  2. +1
    -1
      easypoi-annotation/src/main/java/org/jeecgframework/poi/excel/annotation/Excel.java
  3. +0
    -12
      easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExportBase.java
  4. +9
    -2
      easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/ExcelImportServer.java
  5. +1
    -0
      easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/JeecgTemplateExcelView.java

BIN
doc/EasyPoi教程.docx Bestand weergeven


+ 1
- 1
easypoi-annotation/src/main/java/org/jeecgframework/poi/excel/annotation/Excel.java Bestand weergeven

@@ -107,7 +107,7 @@ public @interface Excel {
public String savePath() default "upload";
/**
* 导出类型 1 是文本 2 是图片,3是函数 默认是文本
* 导出类型 1 是文本 2 是图片,3 是函数,10 是数字 默认是文本
*/
public int type() default 1;


+ 0
- 12
easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExportBase.java Bestand weergeven

@@ -268,18 +268,6 @@ public class ExportBase {
return (short) (maxHeight * 50);
}
/**
* 判断字符串是否是整数
*/
public boolean isInteger(String value) {
try {
Integer.parseInt(value);
return true;
} catch (NumberFormatException e) {
return false;
}
}
private Object replaceValue(String[] replace, String value) {
String[] temp;
for (String str : replace) {


+ 9
- 2
easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/ExcelImportServer.java Bestand weergeven

@@ -42,6 +42,7 @@ import org.apache.poi.ss.usermodel.PictureData;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.util.IOUtils;
import org.apache.poi.xssf.usermodel.XSSFSheet;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.jeecgframework.poi.excel.annotation.ExcelTarget;
@@ -268,6 +269,7 @@ public class ExcelImportServer extends ImportBaseService {
} else {
isAdd = false;
}
verfiyFail = true;
}
}
if (params.getVerifyHanlder() != null) {
@@ -284,6 +286,7 @@ public class ExcelImportServer extends ImportBaseService {
} else {
isAdd = false;
}
verfiyFail = true;
}
}
if (cell != null)
@@ -430,6 +433,7 @@ public class ExcelImportServer extends ImportBaseService {
for (ExcelImportEntity excelImportEntity : collection) {
if (excelImportEntity.isImportField()
&& !titlemap.containsValue(excelImportEntity.getName())) {
LOGGER.error(excelImportEntity.getName() + "必须有,但是没找到");
throw new ExcelImportException(ExcelImportEnum.IS_NOT_A_VALID_TEMPLATE);
}
}
@@ -503,8 +507,11 @@ public class ExcelImportServer extends ImportBaseService {
}
savefile = new File(path + "/" + fileName);
FileOutputStream fos = new FileOutputStream(savefile);
fos.write(data);
fos.close();
try {
fos.write(data);
} finally {
IOUtils.closeQuietly(fos);
}
setValues(excelParams.get(titleString), object,
getSaveUrl(excelParams.get(titleString), object) + "/" + fileName);
} else {


+ 1
- 0
easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/JeecgTemplateExcelView.java Bestand weergeven

@@ -48,6 +48,7 @@ public class JeecgTemplateExcelView extends MiniAbstractExcelView {
protected void renderMergedOutputModel(Map<String, Object> model, HttpServletRequest request,
HttpServletResponse response) throws Exception {
String codedFileName = "临时文件";
@SuppressWarnings("deprecation")
Workbook workbook = ExcelExportUtil.exportExcel(
(TemplateExportParams) model.get(TemplateExcelConstants.PARAMS),
(Class<?>) model.get(TemplateExcelConstants.CLASS),


Laden…
Annuleren
Opslaan