From 67ac603f410319a0d999e5f493c8ef2d74163fe1 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期一, 15 九月 2025 19:44:47 +0800
Subject: [PATCH] 保养标准：点检标准导入 点检名称修改/ 设备台账导入
---
src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java | 45 +++++++++++----------------------------------
1 files changed, 11 insertions(+), 34 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java b/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java
index a43dc02..a9913c1 100644
--- a/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java
+++ b/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java
@@ -44,10 +44,7 @@
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@@ -311,13 +308,8 @@
ImportParams params = new ImportParams();
params.setTitleRows(2); // 璺宠繃鍓�2琛屾爣棰�
- params.setHeadRows(1); // 绗�3琛屾槸琛ㄥご
+ params.setHeadRows(2); // 绗�3琛屾槸琛ㄥご
params.setSheetNum(1); // 璇诲彇绗竴涓伐浣滆〃
-
- int dataEndRow = findDataEndRow(file.getInputStream());
- log.info("璁＄畻鍑虹殑鏁版嵁缁撴潫琛�: {}", dataEndRow);
-
- params.setLastOfInvalidRow(dataEndRow);
params.setNeedSave(true);
EamMaintenanceStandardRequest standardRequest = new EamMaintenanceStandardRequest();
@@ -332,7 +324,7 @@
continue;
}
- standardRequest.setStandardName(standardRequest.getEquipmentName() + "鐐规鏍囧噯");
+ standardRequest.setStandardName(equipment.getEquipmentName() + "鐐规鏍囧噯");
standardRequest.setMaintenanceCategory(MaintenanceCategoryEnum.POINT_INSPECTION.name());
standardRequest.setEquipmentId(equipment.getId());
@@ -342,22 +334,17 @@
List<MaintenanceStandardImport> list = ExcelImportUtil.importExcel(file.getInputStream(), MaintenanceStandardImport.class, params);
log.info("瀹為檯璇诲彇鍒扮殑鏄庣粏鏁伴噺: {}", list.size());
-
- // 鎵撳嵃鍓嶅嚑鏉¤褰曠敤浜庤皟璇�
- if (!list.isEmpty()) {
- log.info("鍓�3鏉¤褰曡鎯�:");
- for (int i = 0; i < Math.min(3, list.size()); i++) {
- MaintenanceStandardImport item = list.get(i);
- log.info("绗瑊}鏉�: NO={}, 鐐规鏉′欢={}, 閮ㄤ綅鍚嶇О={}, 鐐规鍐呭={}",
- i+1, item.getItemCode(), item.getCondition(),
- item.getItemPart(), item.getItemName());
+ //鏄庣粏椤�
+ List<EamMaintenanceStandardDetail> tableList = new ArrayList<>();
+ for(MaintenanceStandardImport maintenanceStandardImport : list) {
+ try {
+ Integer.valueOf(maintenanceStandardImport.getItemCode());
+ } catch (NumberFormatException e) {
+ break;
}
- } else {
- log.warn("鏈鍙栧埌浠讳綍鏄庣粏璁板綍");
+ tableList.add(new EamMaintenanceStandardDetail(maintenanceStandardImport));
}
- //鏄庣粏椤�
- List<EamMaintenanceStandardDetail> tableList = list.stream().map(EamMaintenanceStandardDetail::new).collect(Collectors.toList());
standardRequest.setTableDetailList(tableList);
log.info("杞崲鍚庣殑鏄庣粏鏁伴噺: {}", tableList.size());
@@ -532,11 +519,6 @@
throw new JeecgBootException("Excel銆�" + file.getOriginalFilename() + "銆戠浜岃绗竴鍒楄幏鍙栧埌鐨勮澶囩紪鍙蜂负绌猴紒");
}
request.setFileCode(fileCodeValue.trim());
-// if(CellType.NUMERIC.equals(equipmentCode.getCellType())) {
-// request.setEquipmentCode(String.valueOf((int) equipmentCode.getNumericCellValue()));
-// }else if(CellType.STRING.equals(equipmentCode.getCellType())) {
-// request.setEquipmentCode(equipmentCode.getStringCellValue());
-// }
String equipmentCodeStr = extractEquipmentCode(equipmentCode);
if (StringUtils.isBlank(equipmentCodeStr)) {
throw new JeecgBootException("Excel銆� " + file.getOriginalFilename() + "銆戞病鏈夎鍙栧埌鏈夋晥鐨勮澶囩紪鍙凤紝瀵煎叆澶辫触锛�");
@@ -552,11 +534,6 @@
} else {
request.setInitialDate(new Date());
}
- //璁惧鍚嶇О
-// Cell equipmentName = row.getCell(13);
-// request.setEquipmentName(equipmentName.getStringCellValue());
-
-
row = sheet.getRow(4);
//淇濆吇鍛ㄦ湡
Cell period = row.getCell(7);
--
Gitblit v1.9.3