优化bug；

alielie

2025-10-10 15bbd62b0b24b72c717ae91ab45348a2083ad04e

 HMI.Util/ExcelHelper.cs

@@ -1,4 +1,6 @@
using NPOI.HSSF.UserModel;
using HMI.Core;
using HMI.Core.Util;
using NPOI.HSSF.UserModel;
using NPOI.SS.UserModel;
using NPOI.XSSF.UserModel;
using System;
@@ -33,7 +35,7 @@
            IRow row1 = SheetOne.CreateRow(0);
            for (int i = 0; i < properties.Count; i++)
            {
                row1.CreateCell(i).SetCellValue((attrs[i]).Name);
                row1.CreateCell(i).SetCellValue(LangUtil.Get((attrs[i]).Name));
            }

            for (int i = 0; i < datas.Count(); i++)
@@ -41,8 +43,9 @@
                IRow rowTemp = SheetOne.CreateRow(i + 1);
                for (int j = 0; j < properties.Count; j++)
                {
                    var value = properties[j].GetValue(datas[i]);
                    rowTemp.CreateCell(j).SetCellValue(value.ToString());
                    var attr = attrs[j];
                    var value = attr.IgnoreExport ? "" : properties[j].GetValue(datas[i]);
                    rowTemp.CreateCell(j).SetCellValue(value?.ToString());
                }
            }

@@ -64,73 +67,91 @@
            Dictionary<string, PropertyInfo> dict = new Dictionary<string, PropertyInfo>();
            for (int i = 0; i < attrs.Count; i++)
            {
                dict.Add(attrs[i].Name, properties[i]);
                dict.Add(LangUtil.Get(attrs[i].Name), properties[i]);
            }
            using (FileStream fileStream1 = new FileStream(sourcePath, FileMode.Open, FileAccess.Read))
            {
                IWorkbook workbook = null;
                if (sourcePath.EndsWith(".xlsx"))
                {
                    workbook = new XSSFWorkbook(fileStream1);
                }
                else if (sourcePath.EndsWith(".xls"))
                if (sourcePath.EndsWith(".xls"))
                {
                    workbook = new HSSFWorkbook(fileStream1);
                }

                ISheet sheet = workbook.GetSheetAt(0);
                IRow titleRow = sheet.GetRow(0);

                List<T> result = new List<T>();
                IRow row;
                for (int i = 1; i < (sheet.LastRowNum + 1); i++)
                else
                {
                    row = sheet.GetRow(i);
                    if (row != null)
                    {
                        T obj = (T)Activator.CreateInstance(type);
                        bool isEmpty = true;
                        for (int j = 0; j < row.Count(); j++)
                        {
                            string title = titleRow.GetCell(j).StringCellValue;
                            if (dict.ContainsKey(title))
                            {
                                CellType ct = row.GetCell(j).CellType;
                                object value = null;
                                if (ct == CellType.String)
                                    value = row.GetCell(j).StringCellValue;
                                else if (ct == CellType.Numeric)
                                    value = row.GetCell(j).NumericCellValue;
                                else if (ct == CellType.Boolean)
                                    value = row.GetCell(j).BooleanCellValue;

                                var prop = dict[title];
                                if (prop.PropertyType is string)
                                {
                                    value = Convert.ToString(value);
                                }
                                else if (prop.PropertyType is double || prop.PropertyType is double?)
                                {
                                    value = Convert.ToDouble(value);
                                }
                                else if (prop.PropertyType is int || prop.PropertyType is int?)
                                {
                                    value = Convert.ToInt16(value);
                                }
                                else if (prop.PropertyType is bool || prop.PropertyType is bool?)
                                {
                                    value = Convert.ToBoolean(value);
                                }

                                prop.SetValue(obj, value);
                                isEmpty = false;
                            }
                        }
                        if (!isEmpty) result.Add(obj);
                    }
                    workbook = new XSSFWorkbook(fileStream1);
                }
                workbook.Close();
                return result;
                int currentRow = 1;
                try
                {
                    ISheet sheet = workbook.GetSheetAt(0);
                    IRow titleRow = sheet.GetRow(0);

                    List<T> result = new List<T>();
                    IRow row;
                    for (currentRow = 1; currentRow < (sheet.LastRowNum + 1); currentRow++)
                    {
                        row = sheet.GetRow(currentRow);
                        if (row != null)
                        {
                            T obj = (T)Activator.CreateInstance(type);
                            bool isEmpty = true;
                            for (int j = 0; j < row.Count(); j++)
                            {
                                string title = titleRow.Cells[j].StringCellValue;
                                if (dict.ContainsKey(title))
                                {
                                    var cell = row.GetCell(j);
                                    if (cell == null || cell.CellType == CellType.Blank)
                                        continue;
                                    CellType ct = cell.CellType;
                                    object value = null;
                                    if (ct == CellType.String)
                                        value = row.GetCell(j).StringCellValue;
                                    else if (ct == CellType.Numeric)
                                        value = row.GetCell(j).NumericCellValue;
                                    else if (ct == CellType.Boolean)
                                        value = row.GetCell(j).BooleanCellValue;
                                    else
                                        value = row.GetCell(j).StringCellValue;

                                    var prop = dict[title];
                                    if (prop.PropertyType == typeof(string))
                                    {
                                        value = Convert.ToString(value);
                                    }
                                    else if (prop.PropertyType == typeof(double) || prop.PropertyType == typeof(double?))
                                    {
                                        value = Convert.ToDouble(value);
                                    }
                                    else if (prop.PropertyType == typeof(int) || prop.PropertyType == typeof(int?))
                                    {
                                        value = Convert.ToInt16(value);
                                    }
                                    else if (prop.PropertyType == typeof(bool) || prop.PropertyType == typeof(bool?))
                                    {
                                        value = Convert.ToBoolean(value);
                                    }
                                    else if (prop.PropertyType.IsEnum)
                                    {
                                        value = Enum.Parse(prop.PropertyType, value.ToString());
                                    }
                                    prop.SetValue(obj, value);
                                    isEmpty = false;
                                }
                            }
                            if (!isEmpty) result.Add(obj);
                        }
                    }
                    return result;
                }
                catch (Exception ex)
                {
                    throw new Exception($"第{currentRow}行解析错误：{ex.Message}", ex);
                }
                finally
                {
                    workbook.Close();
                }
            }
        }
    }