src/main/java/com/ruoyi/basic/dto/ProductImportRowDto.java

@@ -1,5 +1,6 @@
package com.ruoyi.basic.dto;

import com.ruoyi.common.utils.poi.ExcelRowAware;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import lombok.Data;

@@ -7,7 +8,7 @@
 * äº§å“æ‰¹é‡å¯¼å…¥è¡Œï¼ˆä¸‰ä¸ªsheet：原料/半成品/成品）
 */
@Data
public class ProductImportRowDto {
public class ProductImportRowDto implements ExcelRowAware {

    @Excel(name = "产品父类")
    private String productParentName;
@@ -26,4 +27,6 @@

    @Excel(name = "单位")
    private String unit;

    private Integer excelRowNum;
}

 src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java

@@ -161,12 +161,16 @@
            Map<String, Long> nodeCache = new HashMap<>();
            for (int i = 0; i < rows.size(); i++) {
                ProductImportRowDto row = rows.get(i);
                int rowNum = i + 2;
                //  æ²¡æœ‰åç§°/编码/规格的行构不成产品数据，按空行跳过
                if (hasNoProductContent(row)) {
                    continue;
                }
                String parentName = trimToNull(row.getProductParentName());
                String categoryName = trimToNull(row.getProductCategoryName());
                String productName = trimToNull(row.getProductName());
                if (productName == null) {
                    throw new ServiceException("第 " + rowNum + " è¡Œ [产品名称] ä¸èƒ½ä¸ºç©º");
                    throw new ServiceException(String.format("工作表【%s】第 %d è¡Œ [产品名称] ä¸èƒ½ä¸ºç©ºï¼ˆè¯¥è¡Œå·²å¡«ï¼š%s）",
                            sheetName, resolveRowNum(row, i), describeRow(row)));
                }

                String model = trimToNull(row.getModel());
@@ -291,6 +295,41 @@
        return keys;
    }

    /**
     * è§£æžæ—¶ä¼šè·³è¿‡ç©ºè¡Œ
     */
    private static int resolveRowNum(ProductImportRowDto row, int index) {
        return row.getExcelRowNum() != null ? row.getExcelRowNum() : index + 2;
    }

    private static boolean hasNoProductContent(ProductImportRowDto row) {
        return trimToNull(row.getProductName()) == null
                && trimToNull(row.getProductCode()) == null
                && trimToNull(row.getModel()) == null;
    }

    private static String describeRow(ProductImportRowDto row) {
        StringBuilder description = new StringBuilder();
        appendFilledColumn(description, "产品父类", row.getProductParentName());
        appendFilledColumn(description, "产品大类", row.getProductCategoryName());
        appendFilledColumn(description, "产品名称", row.getProductName());
        appendFilledColumn(description, "产品编码", row.getProductCode());
        appendFilledColumn(description, "规格型号", row.getModel());
        appendFilledColumn(description, "单位", row.getUnit());
        return description.length() == 0 ? "无" : description.toString();
    }

    private static void appendFilledColumn(StringBuilder description, String columnName, String value) {
        String trimmed = trimToNull(value);
        if (trimmed == null) {
            return;
        }
        if (description.length() > 0) {
            description.append("，");
        }
        description.append(columnName).append('=').append(trimmed);
    }

    private static String dedupKey(String productName, String model, String productCode) {
        String normalizedModel = trimToNull(model) == null ? "/" : model.trim();
        String normalizedCode = productCode == null ? "" : productCode.trim();

 src/main/java/com/ruoyi/common/utils/poi/ExcelRowAware.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
package com.ruoyi.common.utils.poi;

/**
 * å¯¼å…¥å®žä½“可实现此接口，解析时由 {@link ExcelUtil} å›žå¡«æ‰€åœ¨ Excel çš„真实行号（1 èµ·ç®—，与 Excel å·¦ä¾§è¡Œå·ä¸€è‡´ï¼‰ã€‚
 * ExcelUtil ä¼šè·³è¿‡è¡¨å¤´ä¸Žç©ºè¡Œï¼Œå®žä½“在列表中的下标并不等于真实行号，报错提示需要真实行号定位问题。
 *
 * @author ruoyi
 */
public interface ExcelRowAware {

    void setExcelRowNum(Integer excelRowNum);
}

 src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java

@@ -465,37 +465,37 @@
                    {

                        val = Convert.toBigDecimal(val);

                    }

                    else if (Date.class == fieldType)
                    {
                        if (val instanceof String)
                        {
                            val = DateUtils.parseDate(val);
                    else if (Date.class == fieldType)

                    {

                        if (val instanceof String)

                        {

                            val = DateUtils.parseDate(val);

                        }

                        else if (val instanceof Double)

                        {
                            val = DateUtil.getJavaDate((Double) val);
                        }
                    }
                    else if (LocalDate.class == fieldType)
                    {
                        if (val instanceof String)
                        {
                            Date date = DateUtils.parseDate(val);
                            val = StringUtils.isNull(date) ? null : DateUtils.toLocalDate(date);
                        }
                        else if (val instanceof Date)
                        {
                            val = DateUtils.toLocalDate((Date) val);
                        }
                        else if (val instanceof Double)
                        {
                            val = DateUtils.toLocalDate(DateUtil.getJavaDate((Double) val));
                        }
                    }
                    else if (Boolean.TYPE == fieldType || Boolean.class == fieldType)
                    {
                        val = Convert.toBool(val, false);
                    }
                        {

                            val = DateUtil.getJavaDate((Double) val);

                        }

                    }

                    else if (LocalDate.class == fieldType)

                    {

                        if (val instanceof String)

                        {

                            Date date = DateUtils.parseDate(val);

                            val = StringUtils.isNull(date) ? null : DateUtils.toLocalDate(date);

                        }

                        else if (val instanceof Date)

                        {

                            val = DateUtils.toLocalDate((Date) val);

                        }

                        else if (val instanceof Double)

                        {

                            val = DateUtils.toLocalDate(DateUtil.getJavaDate((Double) val));

                        }

                    }

                    else if (Boolean.TYPE == fieldType || Boolean.class == fieldType)

                    {

                        val = Convert.toBool(val, false);

                    }

                    if (StringUtils.isNotNull(fieldType))

                    {

                        String propertyName = field.getName();

@@ -534,6 +534,9 @@
                        }

                        ReflectUtils.invokeSetter(entity, propertyName, val);

                    }

                }

                if (entity instanceof ExcelRowAware) {

                    ((ExcelRowAware) entity).setExcelRowNum(i + 1);

                }

                list.add(entity);

            }

@@ -667,24 +670,24 @@
                        val = Convert.toFloat(val);

                    } else if (BigDecimal.class == fieldType) {

                        val = Convert.toBigDecimal(val);

                    } else if (Date.class == fieldType) {
                        if (val instanceof String) {
                            val = DateUtils.parseDate(val);
                        } else if (val instanceof Double) {
                            val = DateUtil.getJavaDate((Double) val);
                        }
                    } else if (LocalDate.class == fieldType) {
                        if (val instanceof String) {
                            Date date = DateUtils.parseDate(val);
                            val = StringUtils.isNull(date) ? null : DateUtils.toLocalDate(date);
                        } else if (val instanceof Date) {
                            val = DateUtils.toLocalDate((Date) val);
                        } else if (val instanceof Double) {
                            val = DateUtils.toLocalDate(DateUtil.getJavaDate((Double) val));
                        }
                    } else if (Boolean.TYPE == fieldType || Boolean.class == fieldType) {
                        val = Convert.toBool(val, false);
                    }
                    } else if (Date.class == fieldType) {

                        if (val instanceof String) {

                            val = DateUtils.parseDate(val);

                        } else if (val instanceof Double) {

                            val = DateUtil.getJavaDate((Double) val);

                        }

                    } else if (LocalDate.class == fieldType) {

                        if (val instanceof String) {

                            Date date = DateUtils.parseDate(val);

                            val = StringUtils.isNull(date) ? null : DateUtils.toLocalDate(date);

                        } else if (val instanceof Date) {

                            val = DateUtils.toLocalDate((Date) val);

                        } else if (val instanceof Double) {

                            val = DateUtils.toLocalDate(DateUtil.getJavaDate((Double) val));

                        }

                    } else if (Boolean.TYPE == fieldType || Boolean.class == fieldType) {

                        val = Convert.toBool(val, false);

                    }



                    if (StringUtils.isNotNull(fieldType)) {

                        String propertyName = field.getName();

@@ -714,6 +717,9 @@
                        ReflectUtils.invokeSetter(entity, propertyName, val);

                    }

                }

                if (entity instanceof ExcelRowAware) {

                    ((ExcelRowAware) entity).setExcelRowNum(i + 1);

                }

                list.add(entity);

            }

        }