From 8eaee61fbbdea1eaa294b0f1a7d9f2a10da9ade9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 10 三月 2025 17:06:37 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.97.1.152:5880/r/wms-master into dev
---
rsf-server/src/main/java/com/vincent/rsf/server/common/utils/ExcelUtil.java | 79 ++++-----------------------------------
1 files changed, 9 insertions(+), 70 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/ExcelUtil.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/ExcelUtil.java
index bab11e6..b501bda 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/ExcelUtil.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/ExcelUtil.java
@@ -1,5 +1,6 @@
package com.vincent.rsf.server.common.utils;
+import cn.afterturn.easypoi.excel.entity.ImportParams;
import com.vincent.rsf.framework.common.Cools;
import io.swagger.annotations.ApiModelProperty;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -64,7 +65,8 @@
continue;
}
- field.setAccessible(true); // 姝よ寰堥噸瑕侊紝鐗瑰埆鏄瓧娈典负private鏃�
+ // 姝よ寰堥噸瑕侊紝鐗瑰埆鏄瓧娈典负private鏃�
+ field.setAccessible(true);
Object value = null;
try {
value = field.get(t);
@@ -91,76 +93,13 @@
}
/**
- * Excel 瀵煎叆
- * @param file 鏂囦欢
- * @param keys 鏁版嵁椤哄簭
+ * 娣诲姞瀵煎叆excel閰嶇疆鍙傛暟
+ * 娉細榛樿閰嶇疆鍙弧瓒冲綋鍓嶉渶姹�
+ * @return
*/
- public static List<Map<String, Object>> importExcel(MultipartFile file, String[] keys) throws Exception{
- Workbook wb = null;
- String fileName = file.getOriginalFilename();
- if (fileName.endsWith("xls")) {
- POIFSFileSystem pois = new POIFSFileSystem(file.getInputStream());
- wb = new HSSFWorkbook(pois);
- } else if (fileName.endsWith("xlsx")) {
- wb = new XSSFWorkbook(file.getInputStream());
- }
- Sheet sheet = wb.getSheetAt(0);
- int rowCount = sheet.getPhysicalNumberOfRows();
- if (sheet.getRow( 1).getPhysicalNumberOfCells() != keys.length){
- throw new RuntimeException("瀵煎叆鐨凟xcel鍜屾ā鏉跨殑鍒椾笉鍖归厤");
- }
- List<Map<String,Object>> result = new ArrayList<>();
- for (int i = 0; i < rowCount - 1; i++) {
- Row row = sheet.getRow(i + 1);
- Map<String,Object> tmp = new HashMap<>();
- for (int j = 0;j < keys.length; j++){
- Cell cell = row.getCell(j);
- // 鎶婄被鍨嬭浆琛孲tring
-// cell.setCellType(CellType.STRING);
- tmp.put(keys[j], cell.getStringCellValue());
- }
- result.add(tmp);
- }
- return result;
- }
-
- /**
- * 琛ㄥご鏍峰紡
- */
- private static CellStyle HeaderStyle(Workbook wb){
- Font font = wb.createFont();
- font.setFontName("瀹嬩綋");
- font.setFontHeightInPoints((short) 11);
- CellStyle cellStyle = commonStyle(wb);
- cellStyle.setFont(font);
- return cellStyle;
- }
-
- /**
- * 鍐呭鏍峰紡
- */
- private static CellStyle contentStyle(Workbook wb){
- Font font = wb.createFont();
- font.setFontName("瀹嬩綋");
- font.setFontHeightInPoints((short) 10);
- CellStyle cellStyle = commonStyle(wb);
- cellStyle.setFont(font);
- return cellStyle;
- }
-
- /**
- * 鍏叡鏍峰紡
- */
- private static CellStyle commonStyle(Workbook wb){
- CellStyle style = wb.createCellStyle();
- style.setAlignment(HorizontalAlignment.CENTER);
- style.setVerticalAlignment(VerticalAlignment.CENTER);
- style.setBorderBottom(BorderStyle.THIN);
- style.setBorderLeft(BorderStyle.THIN);
- style.setBorderTop(BorderStyle.THIN);
- style.setBorderRight(BorderStyle.THIN);
- style.setWrapText(true);// 鑷姩鎹㈣
- return style;
+ public static ImportParams getDefaultImportParams() {
+ ImportParams params = new ImportParams();
+ return params;
}
}
--
Gitblit v1.9.1