|
@@ -20,10 +20,12 @@ import org.apache.poi.ss.usermodel.BorderStyle;
|
|
|
import org.apache.poi.ss.usermodel.Cell;
|
|
|
import org.apache.poi.ss.usermodel.CellStyle;
|
|
|
import org.apache.poi.ss.usermodel.CellType;
|
|
|
+import org.apache.poi.ss.usermodel.ClientAnchor;
|
|
|
import org.apache.poi.ss.usermodel.DataValidation;
|
|
|
import org.apache.poi.ss.usermodel.DataValidationConstraint;
|
|
|
import org.apache.poi.ss.usermodel.DataValidationHelper;
|
|
|
import org.apache.poi.ss.usermodel.DateUtil;
|
|
|
+import org.apache.poi.ss.usermodel.Drawing;
|
|
|
import org.apache.poi.ss.usermodel.FillPatternType;
|
|
|
import org.apache.poi.ss.usermodel.Font;
|
|
|
import org.apache.poi.ss.usermodel.HorizontalAlignment;
|
|
@@ -35,6 +37,7 @@ import org.apache.poi.ss.usermodel.Workbook;
|
|
|
import org.apache.poi.ss.usermodel.WorkbookFactory;
|
|
|
import org.apache.poi.ss.util.CellRangeAddressList;
|
|
|
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
|
|
|
+import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
|
|
|
import org.apache.poi.xssf.usermodel.XSSFDataValidation;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
@@ -45,6 +48,8 @@ import com.ruoyi.common.core.annotation.Excels;
|
|
|
import com.ruoyi.common.core.text.Convert;
|
|
|
import com.ruoyi.common.core.utils.DateUtils;
|
|
|
import com.ruoyi.common.core.utils.StringUtils;
|
|
|
+import com.ruoyi.common.core.utils.file.FileTypeUtils;
|
|
|
+import com.ruoyi.common.core.utils.file.ImageUtils;
|
|
|
import com.ruoyi.common.core.utils.reflect.ReflectUtils;
|
|
|
|
|
|
/**
|
|
@@ -96,6 +101,11 @@ public class ExcelUtil<T>
|
|
|
*/
|
|
|
private List<Object[]> fields;
|
|
|
|
|
|
+ /**
|
|
|
+ * 最大高度
|
|
|
+ */
|
|
|
+ private short maxHeight;
|
|
|
+
|
|
|
/**
|
|
|
* 统计列表
|
|
|
*/
|
|
@@ -233,7 +243,15 @@ public class ExcelUtil<T>
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- val = Convert.toStr(val);
|
|
|
+ String dateFormat = field.getAnnotation(Excel.class).dateFormat();
|
|
|
+ if (StringUtils.isNotEmpty(dateFormat))
|
|
|
+ {
|
|
|
+ val = DateUtils.parseDateToStr(dateFormat, (Date) val);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ val = Convert.toStr(val);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
else if ((Integer.TYPE == fieldType || Integer.class == fieldType) && StringUtils.isNumeric(Convert.toStr(val)))
|
|
@@ -512,6 +530,47 @@ public class ExcelUtil<T>
|
|
|
{
|
|
|
cell.setCellValue(StringUtils.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value));
|
|
|
}
|
|
|
+ else if (ColumnType.IMAGE == attr.cellType())
|
|
|
+ {
|
|
|
+ ClientAnchor anchor = new XSSFClientAnchor(0, 0, 0, 0, (short) cell.getColumnIndex(), cell.getRow().getRowNum(), (short) (cell.getColumnIndex() + 1),
|
|
|
+ cell.getRow().getRowNum() + 1);
|
|
|
+ String imagePath = Convert.toStr(value);
|
|
|
+ if (StringUtils.isNotEmpty(imagePath))
|
|
|
+ {
|
|
|
+ byte[] data = ImageUtils.getImage(imagePath);
|
|
|
+ getDrawingPatriarch(cell.getSheet()).createPicture(anchor,
|
|
|
+ cell.getSheet().getWorkbook().addPicture(data, getImageType(data)));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 获取画布
|
|
|
+ */
|
|
|
+ public static Drawing<?> getDrawingPatriarch(Sheet sheet)
|
|
|
+ {
|
|
|
+ if (sheet.getDrawingPatriarch() == null)
|
|
|
+ {
|
|
|
+ sheet.createDrawingPatriarch();
|
|
|
+ }
|
|
|
+ return sheet.getDrawingPatriarch();
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 获取图片类型,设置图片插入类型
|
|
|
+ */
|
|
|
+ public int getImageType(byte[] value)
|
|
|
+ {
|
|
|
+ String type = FileTypeUtils.getFileExtendName(value);
|
|
|
+ if ("JPG".equalsIgnoreCase(type))
|
|
|
+ {
|
|
|
+ return Workbook.PICTURE_TYPE_JPEG;
|
|
|
+ }
|
|
|
+ else if ("PNG".equalsIgnoreCase(type))
|
|
|
+ {
|
|
|
+ return Workbook.PICTURE_TYPE_PNG;
|
|
|
+ }
|
|
|
+ return Workbook.PICTURE_TYPE_JPEG;
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -527,7 +586,6 @@ public class ExcelUtil<T>
|
|
|
{
|
|
|
// 设置列宽
|
|
|
sheet.setColumnWidth(column, (int) ((attr.width() + 0.72) * 256));
|
|
|
- row.setHeight((short) (attr.height() * 20));
|
|
|
}
|
|
|
// 如果设置了提示信息则鼠标放上去提示.
|
|
|
if (StringUtils.isNotEmpty(attr.prompt()))
|
|
@@ -552,7 +610,7 @@ public class ExcelUtil<T>
|
|
|
try
|
|
|
{
|
|
|
// 设置行高
|
|
|
- row.setHeight((short) (attr.height() * 20));
|
|
|
+ row.setHeight(maxHeight);
|
|
|
// 根据Excel中设置情况决定是否导出,有些情况需要保持为空,希望用户填写这一列.
|
|
|
if (attr.isExport())
|
|
|
{
|
|
@@ -851,6 +909,21 @@ public class ExcelUtil<T>
|
|
|
}
|
|
|
}
|
|
|
this.fields = this.fields.stream().sorted(Comparator.comparing(objects -> ((Excel) objects[1]).sort())).collect(Collectors.toList());
|
|
|
+ this.maxHeight = getRowHeight();
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 根据注解获取最大行高
|
|
|
+ */
|
|
|
+ public short getRowHeight()
|
|
|
+ {
|
|
|
+ double maxHeight = 0;
|
|
|
+ for (Object[] os : this.fields)
|
|
|
+ {
|
|
|
+ Excel excel = (Excel) os[1];
|
|
|
+ maxHeight = maxHeight > excel.height() ? maxHeight : excel.height();
|
|
|
+ }
|
|
|
+ return (short) (maxHeight * 20);
|
|
|
}
|
|
|
|
|
|
/**
|