保养标准：点检标准导入 点检名称修改/ 设备台账导入

Houjie

2 天以前 67ac603f410319a0d999e5f493c8ef2d74163fe1

 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);