Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

hutongqing

2025-01-11 ecd1c9119991888c6ffeac9d1d228d7bce88deb9

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/CodeAnalysisHelper.cs

@@ -1,4 +1,5 @@
using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
using SqlSugar;
using System;
using System.Collections.Generic;
@@ -7,9 +8,11 @@
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Core.Attributes;
using WIDESEA_Core.CodeConfigEnum;
using WIDESEA_Core.DB;
using WIDESEA_Core.Enums;
using WIDESEA_Core.Seed;
using WIDESEA_Core.Utilities;

namespace WIDESEA_Core.Helper
{
@@ -22,7 +25,7 @@
        /// <param name="analysisCode">规则编号</param>
        /// <param name="code">需解析的字符串</param>
        /// <returns></returns>
        public static T CodeAnalysis<T>(AnalysisCode analysisCode, string code)
        public static T CodeAnalysis<T>(AnalysisCodeEnum analysisCode, string code)
        {
            Type type = typeof(T);
            object? obj = Activator.CreateInstance(type);
@@ -52,7 +55,7 @@
                        if (items.Count == codes.Count)
                        {
                            PropertyInfo[] propertyInfos = type.GetProperties();
                            if (AnalysisRule.Split == analysisRule.AnalysisRule)
                            if (AnalysisRuleEnum.Split == analysisRule.AnalysisRule)
                            {
                                for (int i = 0; i < propertyInfos.Length; i++)
                                {
@@ -60,21 +63,51 @@
                                    AnalysisItemRuleAttribute? analysisItemRule = propertyInfo.GetCustomAttribute<AnalysisItemRuleAttribute>();
                                    if (analysisItemRule != null)
                                    {
                                        int index = items.IndexOf($"[{analysisItemRule.AnalysisFormaType}]");
                                        if (index != -1)
                                            propertyInfo.SetValue(result, codes[index]);
                                        if (analysisItemRule.AnalysisFormaType == AnalysisFormatTypeEnum.BD)
                                        {
                                            propertyInfo.SetValue(result, code.ChangeType(propertyInfo.PropertyType));
                                        }
                                        else
                                        {
                                            int index = items.IndexOf($"[{analysisItemRule.AnalysisFormaType}]");
                                            if (index != -1)
                                            {
                                                propertyInfo.SetValue(result, codes[index]);
                                            }
                                            else
                                            {
                                                string? codeItem = items.FirstOrDefault(x => x.Contains($"[{analysisItemRule.AnalysisFormaType}]"));
                                                if (!string.IsNullOrEmpty(codeItem))
                                                {
                                                    index = items.IndexOf(codeItem);
                                                    if (index != -1)
                                                    {
                                                        string value = codes[index];
                                                        string replaceStr = codeItem.Replace($"[{analysisItemRule.AnalysisFormaType}]", "");

                                                        propertyInfo.SetValue(result, value.Replace(replaceStr, "").ChangeType(propertyInfo.PropertyType));
                                                    }
                                                }
                                            }
                                        }
                                    }
                                }
                            }
                        }

                    }
                }
            }
            catch (Exception ex)
            {

                throw new Exception($"解析错误,{ex.Message}");
            }

            (bool, string, object?) validateResult = ModelValidate.ValidateModelData(result, type);
            if (!validateResult.Item1)
            {
                throw new Exception($"解析错误,{validateResult.Item2}");
            }

            return result;
        }

@@ -85,11 +118,11 @@
        /// <param name="analysisCode">规则编号</param>
        /// <param name="codeList">需解析的字符串集合</param>
        /// <returns></returns>
        public static List<T> CodeAnalysis<T>(AnalysisCode analysisCode, List<string> codeList)
        public static List<T> CodeAnalysis<T>(AnalysisCodeEnum analysisCode, List<string> codeList)
        {
            Type type = typeof(T);
            List<T> list = new List<T>();
            

            try
            {
                AnalysisRuleAttribute? analysisRule = type.GetCustomAttribute<AnalysisRuleAttribute>();
@@ -117,7 +150,7 @@
                            if (items.Count == codes.Count)
                            {
                                PropertyInfo[] propertyInfos = type.GetProperties();
                                if (AnalysisRule.Split == analysisRule.AnalysisRule)
                                if (AnalysisRuleEnum.Split == analysisRule.AnalysisRule)
                                {
                                    for (int i = 0; i < propertyInfos.Length; i++)
                                    {
@@ -125,7 +158,7 @@
                                        AnalysisItemRuleAttribute? analysisItemRule = propertyInfo.GetCustomAttribute<AnalysisItemRuleAttribute>();
                                        if (analysisItemRule != null)
                                        {
                                            if(analysisItemRule.AnalysisFormaType == AnalysisFormatType.BD)
                                            if (analysisItemRule.AnalysisFormaType == AnalysisFormatTypeEnum.BD)
                                            {
                                                propertyInfo.SetValue(result, code.ChangeType(propertyInfo.PropertyType));
                                            }
@@ -133,9 +166,25 @@
                                            {
                                                int index = items.IndexOf($"[{analysisItemRule.AnalysisFormaType}]");
                                                if (index != -1)
                                                    propertyInfo.SetValue(result, codes[index].ChangeType(propertyInfo.PropertyType));
                                                {
                                                    propertyInfo.SetValue(result, codes[index]);
                                                }
                                                else
                                                {
                                                    string? codeItem = items.FirstOrDefault(x => x.Contains($"[{analysisItemRule.AnalysisFormaType}]"));
                                                    if (!string.IsNullOrEmpty(codeItem))
                                                    {
                                                        index = items.IndexOf(codeItem);
                                                        if (index != -1)
                                                        {
                                                            string value = codes[index];
                                                            string replaceStr = codeItem.Replace($"[{analysisItemRule.AnalysisFormaType}]", "");

                                                            propertyInfo.SetValue(result, value.Replace(replaceStr, "").ChangeType(propertyInfo.PropertyType));
                                                        }
                                                    }
                                                }
                                            }
                                            
                                        }
                                    }
                                }