复杂类型增量源生成器

modules/JiShe.CollectBus.Analyzers/ComplexTypeSourceAnalyzers.cs

@@ -1,5 +1,6 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -8,19 +9,17 @@ using System.Text;
 namespace JiShe.CollectBus.IncrementalGenerator
 {
     /// <summary>
-    /// 复杂类型源生成器
+    /// 复杂类型增量源生成器
     /// </summary>
     [Generator(LanguageNames.CSharp)]
     public class ComplexTypeSourceAnalyzers : IIncrementalGenerator
     {
         private const string AttributeFullName = "JiShe.CollectBus.Analyzers.Shared.SourceAnalyzersAttribute";
-        private const string SourceEntityAccessorFactoryNamespace = "JiShe.CollectBus.Analyzers.Shared";
 
         public void Initialize(IncrementalGeneratorInitializationContext context)
         {
             //Debugger.Launch();
 
-
             // 步骤1：筛选带有 [SourceAnalyzers] 的类
             var classDeclarations = context.SyntaxProvider
                 .CreateSyntaxProvider(
@@ -107,128 +106,14 @@ namespace JiShe.CollectBus.IncrementalGenerator
                     continue;
                 }
                  
-                //context.ReportDiagnostic(Diagnostic.Create(
+                var code3 = BuildAccessorsForSourceEntity(classSymbol, compilation, processedTypes);
-                //new DiagnosticDescriptor(
-                //    "PA001",
-                //    "Generated Accessors",
-                //    $"Generating accessors for {classSymbol.Name}",
-                //    "Performance",
-                //    DiagnosticSeverity.Info,
-                //    true),
-                //Location.None));
-
-                //// 新增：输出继承链信息
-                //context.ReportDiagnostic(Diagnostic.Create(
-                //    new DiagnosticDescriptor("HIERARCHY", "Class Hierarchy",
-                //    $"Processing class: {classSymbol.Name}, BaseType: {classSymbol.BaseType?.Name}",
-                //    "Debug", DiagnosticSeverity.Info, true),
-                //    Location.None));
-
-                //context.ReportDiagnostic(Diagnostic.Create(
-                //new DiagnosticDescriptor("PA002", "Class Found",
-                //$"Processing class: {classSymbol.Name}", "Debug", DiagnosticSeverity.Warning, true),
-                //Location.None));
-
-                var code = BuildAccessorsForType(classSymbol, compilation, processedTypes);
-
-                //System.Diagnostics.Debug.WriteLine($"Generated code for {classSymbol.Name}:\n{code}"); // 调试输出
-
-                context.AddSource($"{classSymbol.Name}Extension.g.cs", code);
-
-
-                var code3 = BuildAccessorsForType2(classSymbol, compilation, processedTypes);
                 context.AddSource($"{classSymbol.Name}Accessor.g.cs", code3);
-
-                //code.AppendLine($"namespace {classSymbol.ContainingNamespace.ToDisplayString()};");
-                //if (classSymbol.ContainingNamespace.ToDisplayString() == "JiShe.CollectBus.IoTDB")
-                //{
-
-                //}
             }
 
             // 生成工厂注册代码
             context.AddSource("SourceEntityAccessorFactory.g.cs", BuildFactoryCode());
         }
          
-        /// <summary>
-        /// 构建类的属性访问器代码
-        /// </summary>
-        /// <param name="classSymbol"></param>
-        /// <param name="compilation"></param>
-        /// <param name="processedTypes"></param>
-        /// <returns></returns>
-        private static string BuildAccessorsForType(
-           INamedTypeSymbol classSymbol,
-           Compilation compilation,
-           HashSet<ITypeSymbol> processedTypes)
-        {
-            var code = new StringBuilder();
-            code.AppendLine("#pragma warning disable CS0419 // 禁用警告");
-            code.AppendLine("// Generated code for " + classSymbol.Name);
-            code.AppendLine("// <auto-generated/>");
-            code.AppendLine("#nullable enable");
-            code.AppendLine($"namespace {classSymbol.ContainingNamespace.ToDisplayString()};");
-            code.AppendLine();
-
-            code.AppendLine($"public static class {classSymbol.Name}Extension{GetGenericParams(classSymbol)}");
-            code.AppendLine("{");
-
-            foreach (var prop in GetAllPropertiesInHierarchy(classSymbol))
-            {
-                if (prop.IsIndexer) continue;
-                GeneratePropertyAccessorsForType(prop, code, compilation, processedTypes);
-            }
-
-            code.AppendLine("}");
-            return code.ToString();
-        }
-
-        /// <summary>
-        /// 构建类的属性访问器代码
-        /// </summary>
-        /// <param name="classSymbol"></param>
-        /// <param name="compilation"></param>
-        /// <param name="processedTypes"></param>
-        /// <returns></returns>
-        private static string BuildAccessorsForType2(
-           INamedTypeSymbol classSymbol,
-           Compilation compilation,
-           HashSet<ITypeSymbol> processedTypes)
-        {
-            var code = new StringBuilder();
-            code.AppendLine("#pragma warning disable CS0419 // 禁用警告");
-            code.AppendLine("// Generated code for " + classSymbol.Name);
-            code.AppendLine("// <auto-generated/>");
-            code.AppendLine("#nullable enable");
-            code.AppendLine($"namespace {classSymbol.ContainingNamespace.ToDisplayString()};");
-            code.AppendLine();
-
-            code.AppendLine($"public sealed class {classSymbol.Name}Accessor : ISourceEntityAccessor<{classSymbol.Name}>");
-            code.AppendLine("{");
-
-            foreach (var prop in GetAllPropertiesInHierarchy(classSymbol))
-            {
-                if (prop.IsIndexer) continue;
-                GeneratePropertyAccessorsForType(prop, code, compilation, processedTypes);
-            }
-
-            code.AppendLine("}");
-
-            //var code3 = $@"
-            //    public sealed class {classSymbol.Name}Accessor : ISourceEntityAccessor<{classSymbol.Name}>
-            //    {{
-            //        public object GetPropertyValue({classSymbol.Name} entity, string propName) => propName switch
-            //        {{
-            //            {GeneratePropertyCases(classSymbol)}
-            //            _ => throw new ArgumentException(""无效属性名"")
-            //        }};
-
-            //        {GenerateTupleSupport(classSymbol)}
-            //    }}";
-
-            return code.ToString();
-        }
-
         /// <summary>
         /// 获取泛型参数
         /// </summary>
@@ -241,63 +126,6 @@ namespace JiShe.CollectBus.IncrementalGenerator
             return $"<{string.Join(", ", parameters)}>";
         }
          
-        /// <summary>
-        /// 生成属性访问器代码
-        /// </summary>
-        /// <param name="prop"></param>
-        /// <param name="code"></param>
-        /// <param name="compilation"></param>
-        /// <param name="processedTypes"></param>
-        private static void GeneratePropertyAccessorsForType(
-            IPropertySymbol prop,
-            StringBuilder code,
-            Compilation compilation,
-            HashSet<ITypeSymbol> processedTypes)
-        {
-            // 安全类型转换
-            if (prop.Type is not ITypeSymbol propType) return;
-
-            code.AppendLine($"    // Processing property: {prop.Name}");
-
-            // 处理元组类型
-            if (propType is INamedTypeSymbol { IsTupleType: true } tupleType)
-            {
-                GenerateTupleAccessors(prop, tupleType, code);
-            }
-            else if (propType is INamedTypeSymbol namedType)
-            {
-                GenerateStandardAccessors(prop, namedType, code);
-                ProcessNestedType(namedType, compilation, processedTypes);
-            }
-        }
-
-        /// <summary>
-        /// 处理元组类型
-        /// </summary>
-        /// <param name="prop"></param>
-        /// <param name="tupleType"></param>
-        /// <param name="code"></param>
-        private static void GenerateTupleAccessors(IPropertySymbol prop, INamedTypeSymbol tupleType, StringBuilder code)
-        {
-            var elements = tupleType.TupleElements;
-            var parentType = prop.ContainingType.ToDisplayString();
-
-            for (int i = 0; i < elements.Length; i++)
-            {
-                var element = elements[i];
-                if (element.Type is not ITypeSymbol elementType) continue;
-
-                var elementName = element.CorrespondingTupleField?.Name ?? $"Item{i + 1}";
-                code.AppendLine($"    public static {elementType.ToDisplayString()} Get{prop.Name}_{elementName}({parentType} obj) => obj.{prop.Name}.{elementName};");
-
-                if (prop.SetMethod != null)
-                {
-                    var assignments = elements.Select((e, idx) =>
-                        idx == i ? "value" : $"obj.{prop.Name}.{e.Name}");
-                    code.AppendLine($"    public static void Set{prop.Name}_{elementName}({parentType} obj, {elementType.ToDisplayString()} value) => obj.{prop.Name} = ({string.Join(", ", assignments)});");
-                }
-            }
-        }
          
         /// <summary>
         /// 生成标准属性的访问器
@@ -318,60 +146,327 @@ namespace JiShe.CollectBus.IncrementalGenerator
          
 
         /// <summary>
-        /// 处理嵌套类型
+        /// 构建实体访问器代码（支持泛型）
         /// </summary>
-        /// <param name="typeSymbol"></param>
+        private static string BuildAccessorsForSourceEntity(
-        /// <param name="compilation"></param>
+            INamedTypeSymbol classSymbol,
-        /// <param name="processedTypes"></param>
+            Compilation compilation,
-        private static void ProcessNestedType(ITypeSymbol typeSymbol, Compilation compilation, HashSet<ITypeSymbol> processedTypes)
+            HashSet<ITypeSymbol> processedTypes)
         {
-            if (typeSymbol is not INamedTypeSymbol namedType) return;
+            var code = new StringBuilder();
-            if (!ShouldProcessNestedType(namedType)) return;
+            code.AppendLine("// <auto-generated/>");
-            if (!processedTypes.Add(namedType)) return;
+            code.AppendLine("#nullable enable");
+            code.AppendLine("using System;");
+            code.AppendLine("using System.Collections.Generic;");
+            code.AppendLine("using JiShe.CollectBus.Analyzers.Shared;");
+            code.AppendLine($"namespace {classSymbol.ContainingNamespace.ToDisplayString()};");
+            code.AppendLine();
 
-            var code = BuildAccessorsForType(namedType, compilation, processedTypes);
+            // 处理泛型类型名称
+            var accessibility = classSymbol.DeclaredAccessibility switch
+            {
+                Accessibility.Public => "public",
+                _ => "internal"
+            };
+
+            var genericParams = classSymbol.IsGenericType
+                ? $"<{string.Join(", ", classSymbol.TypeParameters.Select(t => t.Name))}>"
+                : "";
+
+            code.AppendLine(
+                $"{accessibility} sealed class {classSymbol.Name}Accessor{genericParams} " + // 保留泛型参数
+                $": ISourceEntityAccessor<{classSymbol.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)}>");
+
+            code.AppendLine("{");
+ 
+            var propList = GetAllPropertiesInHierarchy(classSymbol);
+
+            foreach (var prop in propList)
+            {
+                // 安全类型转换
+                if (prop.Type is not ITypeSymbol propType) continue;
+
+                if (propType is INamedTypeSymbol { IsTupleType: true } tupleType)
+                {
+                    GenerateTupleAccessors(prop, tupleType, code, classSymbol);
+                }
+                else if (propType is INamedTypeSymbol namedType)
+                {
+                    GenerateStandardAccessors(prop, namedType, code);
+                }
+            }
+
+            //生成当前类属性名称集合
+            GeneratePropertyListForSourceEntity(propList, code, compilation, classSymbol);
+            
+
+            //生成当前类属性访问
+            GetGeneratePropertyValueForSourceEntity(
+                propList,
+                code,
+                compilation,
+                classSymbol);
+
+            //生成当前类属性设置
+            SetGeneratePropertyValueForSourceEntity(
+                propList,
+                code,
+                compilation,
+                classSymbol);
+
+
+
+            code.AppendLine("}");
+            return code.ToString();
         }
 
         /// <summary>
-        /// 处理嵌套类型
+        /// 生成泛型ValueTuple 元组访问器
         /// </summary>
-        /// <param name="symbol"></param>
+        private static void GenerateTupleAccessors(
-        /// <returns></returns>
+           IPropertySymbol prop,
-        private static bool ShouldProcessNestedType(INamedTypeSymbol symbol)
+           INamedTypeSymbol tupleType,
+           StringBuilder code,
+           INamedTypeSymbol classSymbol)
         {
-            return symbol.DeclaredAccessibility == Accessibility.Public &&
+            var parentType = classSymbol.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat);
-                   !symbol.IsTupleType &&
+            var tupleElements = tupleType.TupleElements;
-                   !symbol.IsAnonymousType &&
+
-                   !symbol.IsImplicitlyDeclared &&
+            for (int i = 0; i < tupleElements.Length; i++)
-                   !symbol.Name.StartsWith("<");
+            {
+                var element = tupleElements[i];
+                var elementType = element.Type.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat);
+                var elementName = element.Name;
+
+                // Getter保持不变
+                code.AppendLine(
+                    $"    public static {elementType} Get{prop.Name}_{elementName}" +
+                    $"({parentType} obj) => obj.{prop.Name}.{elementName};");
+
+                // Setter修复：使用元组字面量
+                if (prop.SetMethod != null)
+                {
+                    var valueExpressions = tupleElements.Select((e, idx) =>
+                        idx == i ? "value" : $"obj.{prop.Name}.{e.Name}"
+                    ).ToList();
+
+                    // 关键修复：生成正确的元组字面量表达式
+                    code.AppendLine(
+                        $"    public static void Set{prop.Name}_{elementName}" +
+                        $"({parentType} obj, {elementType} value) => " +
+                        $"obj.{prop.Name} = ({string.Join(", ", valueExpressions)});");
+                }
+            }
         }
 
         /// <summary>
-        /// 生成扩展类工厂代码
+        /// 处理System.Tuple类型的访问器生成
+        /// </summary>
+        private static void GenerateSystemTupleAccessors(
+            IPropertySymbol prop,
+            INamedTypeSymbol tupleType,
+            StringBuilder code,
+            INamedTypeSymbol classSymbol)
+        {
+            var parentType = classSymbol.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat);
+            var elementTypes = tupleType.TypeArguments;
+            var tupleTypeName = tupleType.ToDisplayString();
+
+            for (int i = 0; i < elementTypes.Length; i++)
+            {
+                var elementType = elementTypes[i].ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat);
+                var elementName = $"Item{i + 1}";
+
+                // Getter
+                code.AppendLine(
+                    $"    public static {elementType} Get{prop.Name}_{elementName}" +
+                    $"({parentType} obj) => obj.{prop.Name}.{elementName};");
+
+                // Setter
+                if (prop.SetMethod != null)
+                {
+                    var assignments = elementTypes.Select((_, idx) =>
+                        idx == i ? "value" : $"obj.{prop.Name}.Item{idx + 1}"
+                    ).ToList();
+
+                    code.AppendLine(
+                        $"    public static void Set{prop.Name}_{elementName}" +
+                        $"({parentType} obj, {elementType} value) => " +
+                        $"obj.{prop.Name} = new {tupleTypeName}({string.Join(", ", assignments)});");
+                }
+            }
+        }
+
+        /// <summary>
+        /// 增强的工厂类实现
         /// </summary>
-        /// <returns></returns>
         private static string BuildFactoryCode()
         {
             return """
-            using System;
+        using System;
-            using System.Collections.Concurrent;
+        using System.Collections.Concurrent;
-            namespace JiShe.CollectBus.Analyzers.Shared;
+        using System.Reflection;
-            public static class SourceEntityAccessorFactory
-            {
-                private static readonly ConcurrentDictionary<Type, object> _accessors = new();
         
-                public static ISourceEntityAccessor<T> GetAccessor<T>()
+        namespace JiShe.CollectBus.Analyzers.Shared;
+        
+        public static class SourceEntityAccessorFactory
+        {
+            private static readonly ConcurrentDictionary<Type, object> _accessors = new();
+
+            public static ISourceEntityAccessor<T> GetAccessor<T>()
+            {
+                return (ISourceEntityAccessor<T>)_accessors.GetOrAdd(typeof(T), t =>
                 {
-                    if (!_accessors.TryGetValue(typeof(T), out var accessor))
+                    // 获取泛型类型定义信息（如果是泛型类型）
+                    var isGeneric = t.IsGenericType;
+                    var genericTypeDef = isGeneric ? t.GetGenericTypeDefinition() : null;
+                    var arity = isGeneric ? genericTypeDef!.GetGenericArguments().Length : 0;
+
+                    // 构建访问器类名
+                    var typeName = isGeneric 
+                        ? $"{t.Namespace}.{genericTypeDef!.Name.Split('`')[0]}Accessor`{arity}" 
+                        : $"{t.Namespace}.{t.Name}Accessor";
+
+                    // 尝试从当前程序集加载
+                    var accessorType = Assembly.GetAssembly(t)!.GetType(typeName)
+                        ?? throw new InvalidOperationException($"Accessor type {typeName} not found");
+
+                    // 处理泛型参数
+                    if (isGeneric && accessorType.IsGenericTypeDefinition)
                     {
-                        accessor = Activator.CreateInstance(
+                        accessorType = accessorType.MakeGenericType(t.GetGenericArguments());
-                            Type.GetType($"{typeof(T).Namespace}.{typeof(T).Name}Accessor")!)!;
-                        _accessors.TryAdd(typeof(T), accessor);
                     }
-                    return (ISourceEntityAccessor<T>)accessor!;
+
+                    return Activator.CreateInstance(accessorType)!;
+                });
+            }
+        }
+        """;
+        }
+
+        /// <summary>
+        /// 属性访问生成逻辑
+        /// </summary>
+        /// <param name="propList">属性集合</param>
+        /// <param name="code"></param>
+        /// <param name="compilation"></param>
+        /// <param name="classSymbol"></param>
+        private static void GetGeneratePropertyValueForSourceEntity(
+            IEnumerable<IPropertySymbol> propList,
+            StringBuilder code,
+            Compilation compilation,
+            INamedTypeSymbol classSymbol)
+        {
+            code.AppendLine($"    public object GetPropertyValue({classSymbol} targetEntity, string propertyName)");
+            code.AppendLine("    {");
+            code.AppendLine("        return propertyName switch");
+            code.AppendLine("        {");
+
+            foreach (var prop in propList)
+            {
+                if (prop.Type is INamedTypeSymbol { IsTupleType: true } tupleType)
+                {
+                    foreach (var element in tupleType.TupleElements)
+                    {
+                        code.AppendLine(
+                            $"            \"{prop.Name}.{element.Name}\" => " +
+                            $"Get{prop.Name}_{element.Name}(targetEntity),");
+                    }
+                }
+                else
+                {
+                    code.AppendLine(
+                        $"            \"{prop.Name}\" => " +
+                        $"Get{prop.Name}(targetEntity),");
                 }
             }
-            """;
+
+            code.AppendLine("            _ => throw new ArgumentException($\"Unknown property: {propertyName}\")");
+            code.AppendLine("        };");
+            code.AppendLine("    }");
+        }
+
+        /// <summary>
+        /// 属性设置生成逻辑
+        /// </summary>
+        /// <param name="propList">属性集合</param>
+        /// <param name="code"></param>
+        /// <param name="compilation"></param>
+        /// <param name="classSymbol"></param>
+        private static void SetGeneratePropertyValueForSourceEntity(
+            IEnumerable<IPropertySymbol> propList,
+            StringBuilder code,
+            Compilation compilation,
+            INamedTypeSymbol classSymbol)
+        {
+            code.AppendLine($"    public void SetPropertyValue({classSymbol} targetEntity, string propertyName, object value)");
+            code.AppendLine("    {");
+            code.AppendLine("        switch (propertyName)");
+            code.AppendLine("        {");
+
+            foreach (var prop in propList)
+            {
+                if (prop.Type is INamedTypeSymbol { IsTupleType: true } tupleType)
+                {
+                    foreach (var element in tupleType.TupleElements)
+                    {
+                        var elementType = element.Type.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat);
+                        code.AppendLine($"            case \"{prop.Name}.{element.Name}\":");
+                        code.AppendLine($"                Set{prop.Name}_{element.Name}(");
+                        code.AppendLine($"                    targetEntity, ({elementType})value);");
+                        code.AppendLine("                break;");
+                    }
+                }
+                else if (prop.SetMethod != null)
+                {
+                    var propType = prop.Type.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat);
+                    code.AppendLine($"            case \"{prop.Name}\":");
+                    code.AppendLine($"                Set{prop.Name}(");
+                    code.AppendLine($"                    targetEntity, ({propType})value);");
+                    code.AppendLine("                break;");
+                }
+            }
+
+            code.AppendLine("            default:");
+            code.AppendLine("                throw new ArgumentException($\"Unknown property: {propertyName}\");");
+            code.AppendLine("        }");
+            code.AppendLine("    }");
+        }
+
+        /// <summary>
+        /// 属性名称集合
+        /// </summary>
+        /// <param name="propList">属性集合</param>
+        /// <param name="code"></param>
+        /// <param name="compilation"></param>
+        /// <param name="classSymbol"></param>
+        private static void GeneratePropertyListForSourceEntity(
+            IEnumerable<IPropertySymbol> propList,
+            StringBuilder code,
+            Compilation compilation,
+            INamedTypeSymbol classSymbol)
+        {
+            code.AppendLine("    public List<string> PropertyList {get;} = new List<string>()");
+            code.AppendLine("    {");
+            List<string> tempPropList = new List<string>();
+            foreach (var prop in propList)
+            {
+                if (prop.Type is INamedTypeSymbol { IsTupleType: true } tupleType)
+                { 
+                    foreach (var element in tupleType.TupleElements)
+                    {
+                        tempPropList.Add($"\"{prop.Name}.{element.Name}\"");
+                    }
+                }
+                else
+                {
+                    tempPropList.Add($"\"{prop.Name}\"");
+                }
+            }
+
+            code.Append(string.Join(",", tempPropList));
+
+            code.AppendLine("    };");
         }
     }
 }

modules/JiShe.CollectBus.IoTDB/Model/TableModelSingleMeasuringEntity.cs

@@ -15,6 +15,6 @@ namespace JiShe.CollectBus.IoTDB.Model
         /// 单项数据键值对
         /// </summary>
         [SingleMeasuring(nameof(SingleColumn))]
-        public required Tuple<string, T> SingleColumn { get; set; }
+        public required ValueTuple<string, T> SingleColumn { get; set; }
     }
 }

modules/JiShe.CollectBus.IoTDB/Model/TableModelSingleMeasuringEntityAccessor.cs

@@ -0,0 +1,77 @@
+// <auto-generated/>
+#nullable enable
+using System;
+using System.Collections.Generic;
+using JiShe.CollectBus.Analyzers.Shared;
+namespace JiShe.CollectBus.IoTDB.Model;
+
+public sealed class TableModelSingleMeasuringEntityAccessor3<T> : ISourceEntityAccessor<global::JiShe.CollectBus.IoTDB.Model.TableModelSingleMeasuringEntity<T>>
+{
+    public static string GetSingleColumn_Item1(global::JiShe.CollectBus.IoTDB.Model.TableModelSingleMeasuringEntity<T> obj) => obj.SingleColumn.Item1;
+    public static void SetSingleColumn_Item1(global::JiShe.CollectBus.IoTDB.Model.TableModelSingleMeasuringEntity<T> obj, string value) => obj.SingleColumn = (value, obj.SingleColumn.Item2);
+    public static T GetSingleColumn_Item2(global::JiShe.CollectBus.IoTDB.Model.TableModelSingleMeasuringEntity<T> obj) => obj.SingleColumn.Item2;
+    public static void SetSingleColumn_Item2(global::JiShe.CollectBus.IoTDB.Model.TableModelSingleMeasuringEntity<T> obj, T value) => obj.SingleColumn = (obj.SingleColumn.Item1, value);
+    public static string GetSystemName(JiShe.CollectBus.IoTDB.Model.IoTEntity obj) => obj.SystemName;
+    public static void SetSystemName(JiShe.CollectBus.IoTDB.Model.IoTEntity obj, string value) => obj.SystemName = value;
+    public static string GetProjectId(JiShe.CollectBus.IoTDB.Model.IoTEntity obj) => obj.ProjectId;
+    public static void SetProjectId(JiShe.CollectBus.IoTDB.Model.IoTEntity obj, string value) => obj.ProjectId = value;
+    public static string GetDeviceType(JiShe.CollectBus.IoTDB.Model.IoTEntity obj) => obj.DeviceType;
+    public static void SetDeviceType(JiShe.CollectBus.IoTDB.Model.IoTEntity obj, string value) => obj.DeviceType = value;
+    public static string GetDeviceId(JiShe.CollectBus.IoTDB.Model.IoTEntity obj) => obj.DeviceId;
+    public static void SetDeviceId(JiShe.CollectBus.IoTDB.Model.IoTEntity obj, string value) => obj.DeviceId = value;
+    public static long GetTimestamps(JiShe.CollectBus.IoTDB.Model.IoTEntity obj) => obj.Timestamps;
+    public static void SetTimestamps(JiShe.CollectBus.IoTDB.Model.IoTEntity obj, long value) => obj.Timestamps = value;
+    public List<string> PropertyList { get; } = new List<string>()
+    {
+"SingleColumn.Item1","SingleColumn.Item2","SystemName","ProjectId","DeviceType","DeviceId","Timestamps"    };
+    public object GetPropertyValue(JiShe.CollectBus.IoTDB.Model.TableModelSingleMeasuringEntity<T> targetEntity, string propertyName)
+    {
+        return propertyName switch
+        {
+            "SingleColumn.Item1" => GetSingleColumn_Item1(targetEntity),
+            "SingleColumn.Item2" => GetSingleColumn_Item2(targetEntity),
+            "SystemName" => GetSystemName(targetEntity),
+            "ProjectId" => GetProjectId(targetEntity),
+            "DeviceType" => GetDeviceType(targetEntity),
+            "DeviceId" => GetDeviceId(targetEntity),
+            "Timestamps" => GetTimestamps(targetEntity),
+            _ => throw new ArgumentException($"Unknown property: {propertyName}")
+        };
+    }
+    public void SetPropertyValue(JiShe.CollectBus.IoTDB.Model.TableModelSingleMeasuringEntity<T> targetEntity, string propertyName, object value)
+    {
+        switch (propertyName)
+        {
+            case "SingleColumn.Item1":
+                SetSingleColumn_Item1(
+                    targetEntity, (string)value);
+                break;
+            case "SingleColumn.Item2":
+                SetSingleColumn_Item2(
+                    targetEntity, (T)value);
+                break;
+            case "SystemName":
+                SetSystemName(
+                    targetEntity, (string)value);
+                break;
+            case "ProjectId":
+                SetProjectId(
+                    targetEntity, (string)value);
+                break;
+            case "DeviceType":
+                SetDeviceType(
+                    targetEntity, (string)value);
+                break;
+            case "DeviceId":
+                SetDeviceId(
+                    targetEntity, (string)value);
+                break;
+            case "Timestamps":
+                SetTimestamps(
+                    targetEntity, (long)value);
+                break;
+            default:
+                throw new ArgumentException($"Unknown property: {propertyName}");
+        }
+    }
+}

modules/JiShe.CollectBus.IoTDB/Model/TreeModelSingleMeasuringEntity.cs

@@ -15,6 +15,6 @@ namespace JiShe.CollectBus.IoTDB.Model
         /// 单项数据键值对
         /// </summary>
         [SingleMeasuring(nameof(SingleMeasuring))]
-        public required Tuple<string, T> SingleMeasuring { get; set; }
+        public required ValueTuple<string, T> SingleMeasuring { get; set; }
     }
 }

modules/JiShe.CollectBus.IoTDB/Provider/IoTDBProvider.cs

@@ -20,6 +20,7 @@ using JiShe.CollectBus.IoTDB.Options;
 using Microsoft.Extensions.Logging;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Domain.Entities;
+using JiShe.CollectBus.Analyzers.Shared;
 
 namespace JiShe.CollectBus.IoTDB.Provider
 {
@@ -176,6 +177,8 @@ namespace JiShe.CollectBus.IoTDB.Provider
         /// <returns></returns>
         public async Task<DeviceMetadata> GetMetadata<T>() where T : IoTEntity
         {
+            var accessor = SourceEntityAccessorFactory.GetAccessor<T>();
+
             var columns = CollectColumnMetadata(typeof(T));
             var metadata = BuildDeviceMetadata<T>(columns);
             var metaData = MetadataCache.AddOrUpdate(
@@ -260,6 +263,8 @@ namespace JiShe.CollectBus.IoTDB.Provider
             List<string> tempColumnNames = new List<string>();
             tempColumnNames.AddRange(metadata.ColumnNames);
 
+            var accessor = SourceEntityAccessorFactory.GetAccessor<T>();
+
             var entityTypeAttribute = typeof(T).GetCustomAttribute<EntityTypeAttribute>();
 
             if (entityTypeAttribute == null)
@@ -295,69 +300,74 @@ namespace JiShe.CollectBus.IoTDB.Provider
 
                 foreach (var measurement in tempColumnNames)
                 {
-
+                    rowValues.Add(accessor.GetPropertyValue(entity,measurement));
-                    PropertyInfo propertyInfo = typeof(T).GetProperty(measurement);
-                    if (propertyInfo == null)
-                    {
-                        throw new Exception($"{nameof(BuildTablet)} 构建表模型{typeof(T).Name}时，没有找到{measurement}属性，属于异常情况，-101。");
-                    }
-
-                    var value = propertyInfo.GetValue(entity);
-                    if (propertyInfo.IsDefined(typeof(SingleMeasuringAttribute), false) && metadata.IsSingleMeasuring == true)//表示当前对象是单测点模式
-                    {
-                        if (value != null)
-                        {
-                            Type tupleType = value.GetType();
-                            Type[] tupleArgs = tupleType.GetGenericArguments();
-                            Type item2Type = tupleArgs[1]; // T 的实际类型
-                            var item1 = tupleType.GetProperty("Item1")!.GetValue(value);
-                            var item2 = tupleType.GetProperty("Item2")!.GetValue(value);
-                            if (item1 == null || item2 == null)
-                            {
-                                throw new Exception($"{nameof(BuildTablet)} 构建表模型{typeof(T).Name}时，单测点模式构建失败，没有获取测点名称或者测点值，-102。");
-                            }
-
-                            var indexOf = metadata.ColumnNames.IndexOf(measurement);
-                            metadata.ColumnNames[indexOf] = (string)item1!;
-
-                            rowValues.Add(item2);
-                        }
-                        else
-                        {
-                            rowValues.Add(null);
-                        }
-
-                        //同时如果是单测点模式，且是table模型存储，路径只能通过DevicePathBuilder.GetDeviceTableName(entity)获取
-                        if (_runtimeContext.UseTableSessionPool)
-                        {
-                            tableNameOrTreePath = DevicePathBuilder.GetDeviceTableName(entity);
-                        }
-                    }
-                    else
-                    {
-
-                        //需要根据value的类型，进行相应的值映射转换，例如datetime转换为long的时间戳值
-                        if (value != null)
-                        {
-                            Type tupleType = value.GetType();
-                            var tempValue = tupleType.Name.ToUpper() switch
-                            {
-                                "DATETIME" => Convert.ToDateTime(value).GetDateTimeOffset().ToUnixTimeNanoseconds(),
-                                _ => value
-                            };
-
-                            rowValues.Add(tempValue);
-                        }
-                        else
-                        {
-                            rowValues.Add(value);
-                        }
-
-                    }
-
                 }
 
-                values.Add(rowValues);
+                    //foreach (var measurement in tempColumnNames)
+                    //{
+
+                    //    PropertyInfo propertyInfo = typeof(T).GetProperty(measurement);
+                    //    if (propertyInfo == null)
+                    //    {
+                    //        throw new Exception($"{nameof(BuildTablet)} 构建表模型{typeof(T).Name}时，没有找到{measurement}属性，属于异常情况，-101。");
+                    //    }
+
+                    //    var value = propertyInfo.GetValue(entity);
+                    //    if (propertyInfo.IsDefined(typeof(SingleMeasuringAttribute), false) && metadata.IsSingleMeasuring == true)//表示当前对象是单测点模式
+                    //    {
+                    //        if (value != null)
+                    //        {
+                    //            Type tupleType = value.GetType();
+                    //            Type[] tupleArgs = tupleType.GetGenericArguments();
+                    //            Type item2Type = tupleArgs[1]; // T 的实际类型
+                    //            var item1 = tupleType.GetProperty("Item1")!.GetValue(value);
+                    //            var item2 = tupleType.GetProperty("Item2")!.GetValue(value);
+                    //            if (item1 == null || item2 == null)
+                    //            {
+                    //                throw new Exception($"{nameof(BuildTablet)} 构建表模型{typeof(T).Name}时，单测点模式构建失败，没有获取测点名称或者测点值，-102。");
+                    //            }
+
+                    //            var indexOf = metadata.ColumnNames.IndexOf(measurement);
+                    //            metadata.ColumnNames[indexOf] = (string)item1!;
+
+                    //            rowValues.Add(item2);
+                    //        }
+                    //        else
+                    //        {
+                    //            rowValues.Add(null);
+                    //        }
+
+                    //        //同时如果是单测点模式，且是table模型存储，路径只能通过DevicePathBuilder.GetDeviceTableName(entity)获取
+                    //        if (_runtimeContext.UseTableSessionPool)
+                    //        {
+                    //            tableNameOrTreePath = DevicePathBuilder.GetDeviceTableName(entity);
+                    //        }
+                    //    }
+                    //    else
+                    //    {
+
+                    //        //需要根据value的类型，进行相应的值映射转换，例如datetime转换为long的时间戳值
+                    //        if (value != null)
+                    //        {
+                    //            Type tupleType = value.GetType();
+                    //            var tempValue = tupleType.Name.ToUpper() switch
+                    //            {
+                    //                "DATETIME" => Convert.ToDateTime(value).GetDateTimeOffset().ToUnixTimeNanoseconds(),
+                    //                _ => value
+                    //            };
+
+                    //            rowValues.Add(tempValue);
+                    //        }
+                    //        else
+                    //        {
+                    //            rowValues.Add(value);
+                    //        }
+
+                    //    }
+
+                    //}
+
+                    values.Add(rowValues);
 
                 //如果指定了路径
                 if (!string.IsNullOrWhiteSpace(tableNameOrTreePath))
@@ -556,6 +566,8 @@ namespace JiShe.CollectBus.IoTDB.Provider
             //metadata.ColumnNames.Insert(0, "Timestamps");
             //metadata.DataTypes.Insert(0, TSDataType.TIMESTAMP);
 
+            var accessor = SourceEntityAccessorFactory.GetAccessor<T>();
+
             while (dataSet.HasNext() && results.Count < pageSize)
             {
                 var record = dataSet.Next();
@@ -578,11 +590,14 @@ namespace JiShe.CollectBus.IoTDB.Provider
 
                         if (measurement.ToLower().EndsWith("time"))
                         {
-                            typeof(T).GetProperty(measurement)?.SetValue(entity, TimestampHelper.ConvertToDateTime(tempValue, TimestampUnit.Nanoseconds));
+                            //typeof(T).GetProperty(measurement)?.SetValue(entity, TimestampHelper.ConvertToDateTime(tempValue, TimestampUnit.Nanoseconds));
+
+                            accessor.SetPropertyValue(entity, measurement, TimestampHelper.ConvertToDateTime(tempValue, TimestampUnit.Nanoseconds));
                         }
                         else
                         {
-                            typeof(T).GetProperty(measurement)?.SetValue(entity, tempValue);
+                            accessor.SetPropertyValue(entity, measurement, tempValue);
+                            //typeof(T).GetProperty(measurement)?.SetValue(entity, tempValue);
                         }
                     }
 

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/DataStorage.cs

@@ -90,7 +90,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
                 DeviceType = $"{data.MeterType}",
                 ProjectId = $"{data.ProjectId}",
                 Timestamps = data.TimeSpan!.Value.GetFormatTime(analysisBaseDto.DensityUnit, analysisBaseDto.TimeDensity).GetDateTimeOffset().ToUnixTimeMilliseconds(), 
-                SingleMeasuring = new Tuple<string, T>(data.FiledName ?? string.Empty, data.DataValue ?? default)
+                SingleMeasuring = (data.FiledName ?? string.Empty, data.DataValue ?? default)
             };
             _runtimeContext.UseTableSessionPool = true; // 使用表模型池
             var taskSendInfo = await _dbProvider.QueryAsync<MeterReadingTelemetryPacketInfo>(new IoTDBQueryOptions() { TableNameOrTreePath = DevicePathBuilder.GetTableName<MeterReadingTelemetryPacketInfo>(), Conditions = conditions, PageIndex = 0, PageSize = 1 });
@@ -193,7 +193,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
                     DeviceType = $"{item.MeterType}",
                     ProjectId = $"{item.ProjectId}",
                     Timestamps = item.TimeSpan!.Value.GetFormatTime(analysisBaseDto.DensityUnit, analysisBaseDto.TimeDensity).GetDateTimeOffset().ToUnixTimeMilliseconds(),  // TODO:这里暂时格式化15分钟数据，需要进行调整
-                    SingleMeasuring = new Tuple<string, T>(item.FiledName ?? string.Empty, item.DataValue ?? default)
+                    SingleMeasuring = (item.FiledName ?? string.Empty, item.DataValue ?? default)
                 };
                 _runtimeContext.UseTableSessionPool = true; // 使用表模型池
                 var taskSendInfo = await _dbProvider.QueryAsync<MeterReadingTelemetryPacketInfo>(new IoTDBQueryOptions() { TableNameOrTreePath = DevicePathBuilder.GetTableName<MeterReadingTelemetryPacketInfo>(), Conditions = conditions, PageIndex = 0, PageSize = 1 });

services/JiShe.CollectBus.Application/Samples/SampleAppService.cs

@@ -72,6 +72,10 @@ public class SampleAppService : CollectBusAppService, ISampleAppService, IKafkaS
         };
         //ElectricityMeterTreeModelExtension.GetCurrent()
         //SourceEntityAccessorFactory.SetCurrent(meter);
+
+        //ElectricityMeterTreeModelAccessor.
+        //TableModelSingleMeasuringEntityExtension
+        //TableModelSingleMeasuringEntityAccessor.GetSystemName(meter);
         await _iotDBProvider.InsertAsync(meter);
     }
 
@@ -170,6 +174,8 @@ public class SampleAppService : CollectBusAppService, ISampleAppService, IKafkaS
     [HttpGet]
     public async Task TestTreeModelSingleMeasuringEntity(string measuring, string value, DateTime time)
     {
+        time = DateTime.Now;
+
         var meter = new TreeModelSingleMeasuringEntity<string>()
         {
             SystemName = "energy",
@@ -177,7 +183,7 @@ public class SampleAppService : CollectBusAppService, ISampleAppService, IKafkaS
             DeviceType = "1",
             ProjectId = "10059",
             Timestamps = time.GetDateTimeOffset().ToUnixTimeMilliseconds(),
-            SingleMeasuring = new Tuple<string, string>(measuring, value)
+            SingleMeasuring = (measuring, value)
         };
         await _iotDBProvider.InsertAsync(meter);
     }
@@ -190,6 +196,7 @@ public class SampleAppService : CollectBusAppService, ISampleAppService, IKafkaS
     [HttpGet]
     public async Task TestTreeModelSingleMeasuringEntity2(string measuring, int value, DateTime time)
     {
+        time = DateTime.Now;
         var meter = new TreeModelSingleMeasuringEntity<int>()
         {
             SystemName = "energy",
@@ -197,7 +204,7 @@ public class SampleAppService : CollectBusAppService, ISampleAppService, IKafkaS
             DeviceType = "Ammeter",
             ProjectId = "10059",
             Timestamps = time.GetDateTimeOffset().ToUnixTimeMilliseconds(),
-            SingleMeasuring = new Tuple<string, int>(measuring, value)
+            SingleMeasuring = (measuring, value)
         };
         await _iotDBProvider.InsertAsync(meter);
     }
@@ -210,6 +217,8 @@ public class SampleAppService : CollectBusAppService, ISampleAppService, IKafkaS
     [HttpGet]
     public async Task TestTableModelSingleMeasuringEntity(string measuring, string value, DateTime time)
     {
+        time = DateTime.Now;
+
         var meter = new TableModelSingleMeasuringEntity<string>()
         {
             SystemName = "energy",
@@ -217,7 +226,7 @@ public class SampleAppService : CollectBusAppService, ISampleAppService, IKafkaS
             DeviceType = "Ammeter",
             ProjectId = "10059",
             Timestamps = time.GetDateTimeOffset().ToUnixTimeMilliseconds(),
-            SingleColumn = new Tuple<string, string>(measuring, value)
+            SingleColumn = (measuring, value)
         };
         _dbContext.UseTableSessionPool = true;
         await _iotDBProvider.InsertAsync(meter);
@@ -231,6 +240,8 @@ public class SampleAppService : CollectBusAppService, ISampleAppService, IKafkaS
     [HttpGet]
     public async Task TestTableModelSingleMeasuringEntity2(string measuring, int value, DateTime time)
     {
+        time = DateTime.Now;
+
         var meter = new TableModelSingleMeasuringEntity<int>()
         {
             SystemName = "energy",
@@ -238,7 +249,7 @@ public class SampleAppService : CollectBusAppService, ISampleAppService, IKafkaS
             DeviceType = "Ammeter",
             ProjectId = "10059",
             Timestamps = time.GetDateTimeOffset().ToUnixTimeMilliseconds(),
-            SingleColumn = new Tuple<string, int>(measuring, value)
+            SingleColumn = (measuring, value)
         };
         _dbContext.UseTableSessionPool = true;
         await _iotDBProvider.InsertAsync(meter);

services/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs

@@ -336,47 +336,47 @@ namespace JiShe.CollectBus.ScheduledMeterReading
 
             //此处代码不要删除
 #if DEBUG
-            var timeDensity = "15";
+            //var timeDensity = "15";
-            var serverTagName = "JiSheCollectBus2";
+            //var serverTagName = "JiSheCollectBus2";
-            var redisCacheMeterInfoHashKeyTemp = $"{string.Format(RedisConst.CacheMeterInfoHashKey, SystemType, serverTagName, MeterTypeEnum.Ammeter, timeDensity)}";
+            //var redisCacheMeterInfoHashKeyTemp = $"{string.Format(RedisConst.CacheMeterInfoHashKey, SystemType, serverTagName, MeterTypeEnum.Ammeter, timeDensity)}";
-            var redisCacheMeterInfoSetIndexKeyTemp = $"{string.Format(RedisConst.CacheMeterInfoSetIndexKey, SystemType, serverTagName, MeterTypeEnum.Ammeter, timeDensity)}";
+            //var redisCacheMeterInfoSetIndexKeyTemp = $"{string.Format(RedisConst.CacheMeterInfoSetIndexKey, SystemType, serverTagName, MeterTypeEnum.Ammeter, timeDensity)}";
-            var redisCacheMeterInfoZSetScoresIndexKeyTemp = $"{string.Format(RedisConst.CacheMeterInfoZSetScoresIndexKey, SystemType, serverTagName, MeterTypeEnum.Ammeter, timeDensity)}";
+            //var redisCacheMeterInfoZSetScoresIndexKeyTemp = $"{string.Format(RedisConst.CacheMeterInfoZSetScoresIndexKey, SystemType, serverTagName, MeterTypeEnum.Ammeter, timeDensity)}";
 
             List<AmmeterInfo> meterInfos = new List<AmmeterInfo>();
-            List<string> focusAddressDataLista = new List<string>();
+            //List<string> focusAddressDataLista = new List<string>();
-            var timer1 = Stopwatch.StartNew();
+            //var timer1 = Stopwatch.StartNew();
 
-            var allIds = new HashSet<string>();
+            //var allIds = new HashSet<string>();
-            decimal? score = null;
+            //decimal? score = null;
-            string member = null;
+            //string member = null;
 
-            while (true)
+            //while (true)
-            {
+            //{
-                var page = await _redisDataCacheService.GetAllPagedData<AmmeterInfo>(
+            //    var page = await _redisDataCacheService.GetAllPagedData<AmmeterInfo>(
-                    redisCacheMeterInfoHashKeyTemp,
+            //        redisCacheMeterInfoHashKeyTemp,
-                    redisCacheMeterInfoZSetScoresIndexKeyTemp,
+            //        redisCacheMeterInfoZSetScoresIndexKeyTemp,
-                    pageSize: 1000,
+            //        pageSize: 1000,
-                    lastScore: score,
+            //        lastScore: score,
-                    lastMember: member);
+            //        lastMember: member);
 
-                meterInfos.AddRange(page.Items);
+            //    meterInfos.AddRange(page.Items);
-                focusAddressDataLista.AddRange(page.Items.Select(d => $"{d.MeterId}"));
+            //    focusAddressDataLista.AddRange(page.Items.Select(d => $"{d.MeterId}"));
-                foreach (var item in page.Items)
+            //    foreach (var item in page.Items)
-                {
+            //    {
-                    if (!allIds.Add(item.MemberId))
+            //        if (!allIds.Add(item.MemberId))
-                    {
+            //        {
-                        _logger.LogError($"{item.MemberId}Duplicate data found!");
+            //            _logger.LogError($"{item.MemberId}Duplicate data found!");
-                    }
+            //        }
-                }
+            //    }
-                if (!page.HasNext) break;
+            //    if (!page.HasNext) break;
-                score = page.NextScore;
+            //    score = page.NextScore;
-                member = page.NextMember;
+            //    member = page.NextMember;
-            }
+            //}
 
 
-            timer1.Stop();
+            //timer1.Stop();
-            _logger.LogError($"电表初始化读取数据总共花费时间{timer1.ElapsedMilliseconds}毫秒");
+            //_logger.LogError($"电表初始化读取数据总共花费时间{timer1.ElapsedMilliseconds}毫秒");
-            DeviceGroupBalanceControl.InitializeCache(focusAddressDataLista, _kafkaOptions.NumPartitions);
+            //DeviceGroupBalanceControl.InitializeCache(focusAddressDataLista, _kafkaOptions.NumPartitions);
             return;
 #else
                         var meterInfos = await GetAmmeterInfoList(gatherCode);

services/JiShe.CollectBus.Domain/Ammeters/ElectricityMeter.cs

@@ -6,7 +6,7 @@ using JiShe.CollectBus.IoTDB.Model;
 namespace JiShe.CollectBus.Ammeters
 {
     [EntityType(EntityTypeEnum.TableModel)]
-    [SourceAnalyzers]
+    //[SourceAnalyzers]
     public class ElectricityMeter : IoTEntity
     {
         [ATTRIBUTEColumn]

services/JiShe.CollectBus.Domain/Ammeters/ElectricityMeterTreeModel.cs

@@ -2,6 +2,7 @@
 using JiShe.CollectBus.IoTDB.Attribute;
 using JiShe.CollectBus.IoTDB.Enums;
 using JiShe.CollectBus.IoTDB.Model;
+using System;
 
 namespace JiShe.CollectBus.Ammeters
 {
@@ -35,5 +36,7 @@ namespace JiShe.CollectBus.Ammeters
 
         [FIELDColumn]
         public double? Currentd { get; set; }
+
+        public Tuple<int,string> TupleData { get; set;}
     }
 }

shared/JiShe.CollectBus.Analyzers.Shared/ISourceEntityAccessor.cs

@@ -23,18 +23,8 @@ namespace JiShe.CollectBus.Analyzers.Shared
         void SetPropertyValue(T entity, string propertyName, object value);
 
         /// <summary>
-        /// 判断是否是元组属性
+        /// 属性名称集合
         /// </summary>
-        /// <param name="propertyName"></param>
+        List<string> PropertyList { get; } 
-        /// <returns></returns>
-        bool IsTupleProperty(string propertyName);
-
-        /// <summary>
-        /// 获取元组属性值
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <param name="tuplePropertyName"></param>
-        /// <returns></returns>
-        (object Item1, object Item2) GetTupleParts(T entity, string tuplePropertyName);
     }
 }