18 changed files with 60 additions and 188 deletions
--- a/JiShe.CollectBus.sln
+++ b/JiShe.CollectBus.sln
@ -62,9 +62,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0.Docs", "0.Docs", "{D8346C
 		readme.md = readme.md
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.CollectBus.Analyzers.Shared", "shared\JiShe.CollectBus.Analyzers.Shared\JiShe.CollectBus.Analyzers.Shared.csproj", "{DD68F314-BC66-5601-B094-B1A7BE93F4E0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.CollectBus.Analyzers.Attributes", "shared\JiShe.CollectBus.Analyzers.Attributes\JiShe.CollectBus.Analyzers.Attributes.csproj", "{D834B28F-E336-4E05-A5DD-DAF68E3342AA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.CollectBus.Analyzers", "modules\JiShe.CollectBus.Analyzers\JiShe.CollectBus.Analyzers.csproj", "{EB97C7BB-1E4A-CBA4-04C1-22DBF48A253A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.CollectBus.Analyzers", "shared\JiShe.CollectBus.Analyzers\JiShe.CollectBus.Analyzers.csproj", "{00DF55EE-82CF-B5AA-F8C7-0E5B823FBC24}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -152,14 +152,14 @@ Global
 		{75B7D419-C261-577D-58D6-AA3ACED9129F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{75B7D419-C261-577D-58D6-AA3ACED9129F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{75B7D419-C261-577D-58D6-AA3ACED9129F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DD68F314-BC66-5601-B094-B1A7BE93F4E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DD68F314-BC66-5601-B094-B1A7BE93F4E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DD68F314-BC66-5601-B094-B1A7BE93F4E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DD68F314-BC66-5601-B094-B1A7BE93F4E0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EB97C7BB-1E4A-CBA4-04C1-22DBF48A253A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EB97C7BB-1E4A-CBA4-04C1-22DBF48A253A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EB97C7BB-1E4A-CBA4-04C1-22DBF48A253A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EB97C7BB-1E4A-CBA4-04C1-22DBF48A253A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D834B28F-E336-4E05-A5DD-DAF68E3342AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D834B28F-E336-4E05-A5DD-DAF68E3342AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D834B28F-E336-4E05-A5DD-DAF68E3342AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D834B28F-E336-4E05-A5DD-DAF68E3342AA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{00DF55EE-82CF-B5AA-F8C7-0E5B823FBC24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{00DF55EE-82CF-B5AA-F8C7-0E5B823FBC24}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{00DF55EE-82CF-B5AA-F8C7-0E5B823FBC24}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{00DF55EE-82CF-B5AA-F8C7-0E5B823FBC24}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@ -185,8 +185,8 @@ Global
 		{8A61DF78-069B-40B5-8811-614E2960443E} = {3C3F9DB2-EC97-4464-B49F-BF1A0C2B46DC}
 		{E27377CC-E2D3-4237-060F-96EA214D3129} = {3C3F9DB2-EC97-4464-B49F-BF1A0C2B46DC}
 		{75B7D419-C261-577D-58D6-AA3ACED9129F} = {3C3F9DB2-EC97-4464-B49F-BF1A0C2B46DC}
-		{DD68F314-BC66-5601-B094-B1A7BE93F4E0} = {EBF7C01F-9B4F-48E6-8418-2CBFDA51EB0B}
-		{EB97C7BB-1E4A-CBA4-04C1-22DBF48A253A} = {2E0FE301-34C3-4561-9CAE-C7A9E65AEE59}
+		{D834B28F-E336-4E05-A5DD-DAF68E3342AA} = {EBF7C01F-9B4F-48E6-8418-2CBFDA51EB0B}
+		{00DF55EE-82CF-B5AA-F8C7-0E5B823FBC24} = {EBF7C01F-9B4F-48E6-8418-2CBFDA51EB0B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4324B3B4-B60B-4E3C-91D8-59576B4E26DD}
--- a/modules/JiShe.CollectBus.IoTDB/JiShe.CollectBus.IoTDB.csproj
+++ b/modules/JiShe.CollectBus.IoTDB/JiShe.CollectBus.IoTDB.csproj
@ -10,11 +10,11 @@
 		<PackageReference Include="Volo.Abp" Version="8.3.3" />
 	</ItemGroup>
 	<ItemGroup>
+		<ProjectReference Include="..\..\shared\JiShe.CollectBus.Analyzers.Attributes\JiShe.CollectBus.Analyzers.Attributes.csproj"/>
+		
+		<ProjectReference Include="..\..\shared\JiShe.CollectBus.Analyzers\JiShe.CollectBus.Analyzers.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
+		
 	
-		<ProjectReference Include="..\..\shared\JiShe.CollectBus.Analyzers.Shared\JiShe.CollectBus.Analyzers.Shared.csproj" /> 
 		<ProjectReference Include="..\..\shared\JiShe.CollectBus.Common\JiShe.CollectBus.Common.csproj" />
-
-		<ProjectReference Include="..\..\modules\JiShe.CollectBus.Analyzers\JiShe.CollectBus.Analyzers.csproj"
-													OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
 	</ItemGroup>
 </Project>
--- a/modules/JiShe.CollectBus.IoTDB/Model/TableModelSingleMeasuringEntity.cs
+++ b/modules/JiShe.CollectBus.IoTDB/Model/TableModelSingleMeasuringEntity.cs
@ -1,4 +1,4 @@
-using JiShe.CollectBus.Analyzers.Shared;
+using JiShe.CollectBus.Analyzers.Attributes;
 using JiShe.CollectBus.IoTDB.Attribute;
 using JiShe.CollectBus.IoTDB.Enums;

@ -8,7 +8,7 @@ namespace JiShe.CollectBus.IoTDB.Model
    /// Table模型单项数据实体
    /// </summary>
    [EntityType(EntityTypeEnum.TableModel)]
-    [SourceAnalyzers]
+    [GenerateAccessors]
    public class TableModelSingleMeasuringEntity<T> : IoTEntity
    {
        /// <summary>
--- a/modules/JiShe.CollectBus.IoTDB/Model/TreeModelSingleMeasuringEntity.cs
+++ b/modules/JiShe.CollectBus.IoTDB/Model/TreeModelSingleMeasuringEntity.cs
@ -1,4 +1,4 @@
-using JiShe.CollectBus.Analyzers.Shared;
+using JiShe.CollectBus.Analyzers.Attributes;
 using JiShe.CollectBus.IoTDB.Attribute;
 using JiShe.CollectBus.IoTDB.Enums;

@ -8,7 +8,7 @@ namespace JiShe.CollectBus.IoTDB.Model
    /// Tree模型单项数据实体
    /// </summary>
    [EntityType(EntityTypeEnum.TreeModel)]
-    [SourceAnalyzers]
+    [GenerateAccessors]
    public class TreeModelSingleMeasuringEntity<T> : IoTEntity
    {
        /// <summary>
--- a/services/JiShe.CollectBus.Application.Contracts/ScheduledMeterReading/IScheduledMeterReadingService.cs
+++ b/services/JiShe.CollectBus.Application.Contracts/ScheduledMeterReading/IScheduledMeterReadingService.cs
@ -124,7 +124,7 @@ namespace JiShe.CollectBus.ScheduledMeterReading
        /// 水表数据采集
        /// </summary>
        /// <returns></returns>
-        Task WatermeterScheduledMeterAutoReadding();
+        Task WatermeterScheduledMeterAutoReading();

        #endregion

--- a/services/JiShe.CollectBus.Application/Samples/SampleAppService.cs
+++ b/services/JiShe.CollectBus.Application/Samples/SampleAppService.cs
@ -66,7 +66,7 @@ public class SampleAppService : CollectBusAppService, ISampleAppService, IKafkaS
            IssuedMessageHexString = "messageHexString",
            Timestamps = testTime// DateTimeOffset.UtcNow.ToUnixTimeNanoseconds()//testTime.GetDateTimeOffset().ToUnixTimeNanoseconds(),
        };
-        //ElectricityMeterTreeModelExtension.GetCurrent()
+        //ElectricityMeterExtension.get
        await _iotDBProvider.InsertAsync(meter);
    }

--- a/services/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs
+++ b/services/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs
@ -709,8 +709,7 @@ namespace JiShe.CollectBus.ScheduledMeterReading
                 itemCode: tempItem,
                 subItemCode: null,
                 pendingCopyReadTime: currentTime,
-                 creationTime: currentTime,
-                 packetType: (TelemetryPacketTypeEnum)timeDensity);
+                 creationTime: currentTime);
                taskList.Add(meterReadingRecords);
            }

@ -792,8 +791,7 @@ namespace JiShe.CollectBus.ScheduledMeterReading
                    itemCode: itemCode,
                    subItemCode: subItemCode,
                    pendingCopyReadTime: currentTime,
-                    creationTime: currentTime,
-                    packetType: TelemetryPacketTypeEnum.AmmeterAutomaticVerificationTime);
+                    creationTime: currentTime);
                taskList.Add(meterReadingRecords);

                if (taskList == null || taskList.Count <= 0)
@ -874,8 +872,7 @@ namespace JiShe.CollectBus.ScheduledMeterReading
                    itemCode: item,
                    subItemCode: null,
                    pendingCopyReadTime: currentTime,
-                    creationTime: currentTime,
-                    packetType: TelemetryPacketTypeEnum.AmmeterDayFreeze);
+                    creationTime: currentTime);
                    taskList.Add(meterReadingRecords);
                }
                
@ -957,8 +954,7 @@ namespace JiShe.CollectBus.ScheduledMeterReading
                    itemCode: item,
                    subItemCode: null,
                    pendingCopyReadTime: currentTime,
-                    creationTime: currentTime,
-                    packetType: TelemetryPacketTypeEnum.AmmeterMonthFreeze);
+                    creationTime: currentTime);
                    taskList.Add(meterReadingRecords);
                }

@ -1101,7 +1097,7 @@ namespace JiShe.CollectBus.ScheduledMeterReading
        /// 水表数据采集
        /// </summary>
        /// <returns></returns>
-        public virtual async Task WatermeterScheduledMeterAutoReadding()
+        public virtual async Task WatermeterScheduledMeterAutoReading()
        {
            //获取缓存中的水表信息
            int timeDensity = 60;//水表目前只有一个采集频率 60分钟
@ -1133,7 +1129,7 @@ namespace JiShe.CollectBus.ScheduledMeterReading
                Conditions = conditions,
            });

-            _logger.LogInformation($"{nameof(WatermeterScheduledMeterAutoReadding)} {timeDensity}分钟采集水表数据处理完成");
+            _logger.LogInformation($"{nameof(WatermeterScheduledMeterAutoReading)} {timeDensity}分钟采集水表数据处理完成");
        }

        /// <summary>
@ -1218,7 +1214,6 @@ namespace JiShe.CollectBus.ScheduledMeterReading
                DeviceId = $"{watermeter.MeterId}",
                Timestamps = DateTimeOffset.Now.ToUnixTimeNanoseconds(),
                DatabaseBusiID = watermeter.DatabaseBusiID,
-                PacketType = (int)TelemetryPacketTypeEnum.WatermeterAutoReadding,
                PendingCopyReadTime = timestamps,
                CreationTime = currentTime,
                MeterAddress = watermeter.MeterAddress,
@ -1303,8 +1298,7 @@ namespace JiShe.CollectBus.ScheduledMeterReading
                itemCode: itemCode,
                subItemCode: null,
                pendingCopyReadTime: currentTime,
-                creationTime: currentTime,
-                packetType: TelemetryPacketTypeEnum.TerminalVersion);
+                creationTime: currentTime);
                taskList.Add(meterReadingRecords);

                if (taskList == null || taskList.Count <= 0)
@ -1382,8 +1376,7 @@ namespace JiShe.CollectBus.ScheduledMeterReading
               itemCode: itemCode,
               subItemCode: null,
               pendingCopyReadTime: currentTime,
-               creationTime: currentTime,
-               packetType: TelemetryPacketTypeEnum.TelematicsModule);
+               creationTime: currentTime);
                taskList.Add(meterReadingRecords);

                if (taskList == null || taskList.Count <= 0)
@ -1567,9 +1560,8 @@ namespace JiShe.CollectBus.ScheduledMeterReading
        /// <param name="subItemCode">端到端采集项编码</param>
        /// <param name="pendingCopyReadTime">待采集时间，定时采集频率才是特殊情况，其他默认当前时间戳</param>
        /// <param name="creationTime">数据创建时间戳</param>
-        /// <param name="packetType">数据包类型</param>
        /// <returns></returns>
-        protected MeterReadingTelemetryPacketInfo CreateAmmeterPacketInfo(AmmeterInfo ammeterInfo, long timestamps, ProtocolBuildResponse builderResponse, string itemCode, string subItemCode, DateTime pendingCopyReadTime, DateTime creationTime, TelemetryPacketTypeEnum packetType)
+        protected MeterReadingTelemetryPacketInfo CreateAmmeterPacketInfo(AmmeterInfo ammeterInfo, long timestamps, ProtocolBuildResponse builderResponse, string itemCode, string subItemCode, DateTime pendingCopyReadTime, DateTime creationTime)
        {
            string taskMark = CommonHelper.GetTaskMark(builderResponse.AFn, builderResponse.Fn, ammeterInfo.MeteringCode, builderResponse.MSA, builderResponse.Seq);
            return new MeterReadingTelemetryPacketInfo()
@ -1583,13 +1575,10 @@ namespace JiShe.CollectBus.ScheduledMeterReading
                PendingCopyReadTime = pendingCopyReadTime,
                CreationTime = creationTime,
                MeterAddress = ammeterInfo.AmmerterAddress,
-                PacketType = (int)packetType,
                AFN = builderResponse.AFn,
                Fn = builderResponse.Fn,
                Seq = builderResponse.Seq,
                MSA = builderResponse.MSA,
-                FocusId = ammeterInfo.FocusId,
-                FocusAddress = ammeterInfo.FocusAddress,
                ItemCode = itemCode,
                SubItemCode = subItemCode,
                TaskMark = taskMark,
--- a/services/JiShe.CollectBus.Domain/Ammeters/ElectricityMeter.cs
+++ b/services/JiShe.CollectBus.Domain/Ammeters/ElectricityMeter.cs
@ -1,4 +1,4 @@
-using JiShe.CollectBus.Analyzers.Shared;
+using JiShe.CollectBus.Analyzers.Attributes;
 using JiShe.CollectBus.IoTDB.Attribute;
 using JiShe.CollectBus.IoTDB.Enums;
 using JiShe.CollectBus.IoTDB.Model;
@ -6,7 +6,7 @@ using JiShe.CollectBus.IoTDB.Model;
 namespace JiShe.CollectBus.Ammeters
 {
    [EntityType(EntityTypeEnum.TableModel)]
-    [SourceAnalyzers]
+    [GenerateAccessors]
    public class ElectricityMeter : IoTEntity
    {
        [ATTRIBUTEColumn]
--- a/services/JiShe.CollectBus.Domain/Ammeters/ElectricityMeterTreeModel.cs
+++ b/services/JiShe.CollectBus.Domain/Ammeters/ElectricityMeterTreeModel.cs
@ -1,4 +1,4 @@
-using JiShe.CollectBus.Analyzers.Shared;
+using JiShe.CollectBus.Analyzers.Attributes;
 using JiShe.CollectBus.IoTDB.Attribute;
 using JiShe.CollectBus.IoTDB.Enums;
 using JiShe.CollectBus.IoTDB.Model;
@ -6,7 +6,7 @@ using JiShe.CollectBus.IoTDB.Model;
 namespace JiShe.CollectBus.Ammeters
 {
    [EntityType(EntityTypeEnum.TreeModel)]
-    [SourceAnalyzers]
+    [GenerateAccessors]
    public class ElectricityMeterTreeModel : IoTEntity
    {
        [ATTRIBUTEColumn]
--- a/services/JiShe.CollectBus.Domain/IotSystems/MeterReadingRecords/MeterReadingTelemetryPacketInfo.cs
+++ b/services/JiShe.CollectBus.Domain/IotSystems/MeterReadingRecords/MeterReadingTelemetryPacketInfo.cs
@ -1,4 +1,4 @@
-using JiShe.CollectBus.Analyzers.Shared;
+using JiShe.CollectBus.Analyzers.Attributes;
 using JiShe.CollectBus.IoTDB.Attribute;
 using JiShe.CollectBus.IoTDB.Enums;
 using JiShe.CollectBus.IoTDB.Model;
@ -10,7 +10,7 @@ namespace JiShe.CollectBus.IotSystems.MeterReadingRecords
    /// 抄读任务数据
    /// </summary>
    [EntityType(EntityTypeEnum.TableModel)]
-    [SourceAnalyzers]
+    [GenerateAccessors]
    public class MeterReadingTelemetryPacketInfo : IoTEntity
    {
        /// <summary>
@ -19,12 +19,6 @@ namespace JiShe.CollectBus.IotSystems.MeterReadingRecords
        [FIELDColumn]
        public string ScoreValue { get; set; }

-        /// <summary>
-        /// 数据包类型
-        /// </summary>
-        [FIELDColumn]
-        public int PacketType { get; set; }
-
        /// <summary>
        /// 是否手动操作
        /// </summary>
@ -62,6 +56,12 @@ namespace JiShe.CollectBus.IotSystems.MeterReadingRecords
        [FIELDColumn]
        public string FocusAddress { get; set; }

+        /// <summary>
+        /// 表Id
+        /// </summary>
+        [FIELDColumn]
+        public int MeterId { get; set; }
+          
        /// <summary>
        /// 表地址
        /// </summary>
--- a/services/JiShe.CollectBus.Domain/JiShe.CollectBus.Domain.csproj
+++ b/services/JiShe.CollectBus.Domain/JiShe.CollectBus.Domain.csproj
@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-	<Import Project="..\..\common.props" />
-	
  <PropertyGroup>
    <TargetFramework>net8.0</TargetFramework>
    <Nullable>enable</Nullable>
@ -23,11 +21,13 @@
  <ItemGroup>
    <ProjectReference Include="..\..\modules\JiShe.CollectBus.FreeSql\JiShe.CollectBus.FreeSql.csproj" />
    <ProjectReference Include="..\..\modules\JiShe.CollectBus.IoTDB\JiShe.CollectBus.IoTDB.csproj" /> 
-    <ProjectReference Include="..\..\shared\JiShe.CollectBus.Analyzers.Shared\JiShe.CollectBus.Analyzers.Shared.csproj" /> 
    <ProjectReference Include="..\..\shared\JiShe.CollectBus.Common\JiShe.CollectBus.Common.csproj" />
    <ProjectReference Include="..\..\shared\JiShe.CollectBus.Domain.Shared\JiShe.CollectBus.Domain.Shared.csproj" />
-		<ProjectReference Include="..\..\modules\JiShe.CollectBus.Analyzers\JiShe.CollectBus.Analyzers.csproj"
-													OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
+		
+	<ProjectReference Include="..\..\shared\JiShe.CollectBus.Analyzers.Attributes\JiShe.CollectBus.Analyzers.Attributes.csproj"/>
+		
+		<ProjectReference Include="..\..\shared\JiShe.CollectBus.Analyzers\JiShe.CollectBus.Analyzers.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
+			
 	</ItemGroup>

  <ItemGroup>
--- a/shared/JiShe.CollectBus.Analyzers.Attributes/GenerateAccessorsAttribute.cs
+++ b/shared/JiShe.CollectBus.Analyzers.Attributes/GenerateAccessorsAttribute.cs
@ -1,12 +1,12 @@
 using System;

-namespace JiShe.CollectBus.Analyzers.Shared
+namespace JiShe.CollectBus.Analyzers.Attributes
 {
    /// <summary>
    /// 标记需要生成源码的类
    /// </summary>
    [AttributeUsage(AttributeTargets.Class)]
-    public class SourceAnalyzersAttribute : Attribute
+    public class GenerateAccessorsAttribute : Attribute
    {
    }
 }
--- a/shared/JiShe.CollectBus.Analyzers.Attributes/JiShe.CollectBus.Analyzers.Attributes.csproj
+++ b/shared/JiShe.CollectBus.Analyzers.Attributes/JiShe.CollectBus.Analyzers.Attributes.csproj
--- a/shared/JiShe.CollectBus.Analyzers.Shared/ISourceAnalyzersProvider.cs
+++ b/shared/JiShe.CollectBus.Analyzers.Shared/ISourceAnalyzersProvider.cs
@ -1,40 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace JiShe.CollectBus.Analyzers
-{
-    public interface ISourceAnalyzersProvider<T>
-    {
-        /// <summary>
-        /// 获取属性值
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <param name="propertyName"></param>
-        /// <returns></returns>
-        object GetPropertyValue(T entity, string propertyName);
-
-        /// <summary>
-        /// 设置属性值
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <param name="propertyName"></param>
-        /// <param name="value"></param>
-        void SetPropertyValue(T entity, string propertyName, object value);
-
-        /// <summary>
-        /// 判断是否是元组属性
-        /// </summary>
-        /// <param name="propertyName"></param>
-        /// <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);
-    }
-}
--- a/modules/JiShe.CollectBus.Analyzers/ComplexTypeSourceAnalyzers.cs
+++ b/modules/JiShe.CollectBus.Analyzers/ComplexTypeSourceAnalyzers.cs
@ -11,9 +11,9 @@ namespace JiShe.CollectBus.IncrementalGenerator
    /// 复杂类型源生成器
    /// </summary>
    [Generator(LanguageNames.CSharp)]
-    public class ComplexTypeSourceAnalyzers : IIncrementalGenerator
+    public class ComplexTypeSourceGenerator : IIncrementalGenerator
    {
-        private const string AttributeFullName = "JiShe.CollectBus.Analyzers.Shared.SourceAnalyzersAttribute";
+        private const string AttributeFullName = "JiShe.CollectBus.Analyzers.Attributes.GenerateAccessorsAttribute";

        public void Initialize(IncrementalGeneratorInitializationContext context)
        {
--- a/modules/JiShe.CollectBus.Analyzers/JiShe.CollectBus.Analyzers.csproj
+++ b/modules/JiShe.CollectBus.Analyzers/JiShe.CollectBus.Analyzers.csproj
@ -16,6 +16,6 @@
 		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.13.0" PrivateAssets="all" />
 	</ItemGroup>
 	<ItemGroup>
-	  <ProjectReference Include="..\..\shared\JiShe.CollectBus.Analyzers.Shared\JiShe.CollectBus.Analyzers.Shared.csproj" />
+	  <ProjectReference Include="..\JiShe.CollectBus.Analyzers.Attributes\JiShe.CollectBus.Analyzers.Attributes.csproj" />
 	</ItemGroup> 
 </Project>
--- a/shared/JiShe.CollectBus.Common/Enums/TelemetryPacketTypeEnum.cs
+++ b/shared/JiShe.CollectBus.Common/Enums/TelemetryPacketTypeEnum.cs
@ -1,75 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace JiShe.CollectBus.Common.Enums
-{
-    /// <summary>
-    /// 遥测数据包类型枚举
-    /// </summary>
-    public enum TelemetryPacketTypeEnum
-    {
-        /// <summary>
-        /// 1分钟密度
-        /// </summary>
-        [Description("1分钟密度")]
-        AmmeterOneMinute = 1,
-
-        /// <summary>
-        /// 5分钟密度
-        /// </summary>
-        [Description("5分钟密度")]
-        AmmeterMeterFiveMinute = 5,
-
-        /// <summary>
-        /// 15分钟密度
-        /// </summary>
-        [Description("15分钟密度")]
-        AmmeterFifteenMinute = 15,
-
-        /// <summary>
-        /// 自动校时
-        /// </summary>
-        [Description("自动校时")]
-        AmmeterAutomaticVerificationTime = 16,
-
-        /// <summary>
-        /// 日冻结
-        /// </summary>
-        [Description("日冻结")]
-        AmmeterDayFreeze = 17,
-
-        /// <summary>
-        /// 月冻结
-        /// </summary>
-        [Description("月冻结")]
-        AmmeterMonthFreeze = 18,
-
-        /// <summary>
-        /// 自动阀控
-        /// </summary>
-        [Description("自动阀控")]
-        AmmeterAutoValveControl = 19,
-
-        /// <summary>
-        /// 集中器终端版本
-        /// </summary>
-        [Description("集中器终端版本")]
-        TerminalVersion = 20,
-
-        /// <summary>
-        /// 集中器通信模块SIM
-        /// </summary>
-        [Description("集中器通信模块SIM")]
-        TelematicsModule = 21,
-
-        /// <summary>
-        /// 水表抄读
-        /// </summary>
-        [Description("水表抄读")]
-        WatermeterAutoReadding = 22,
-    }
-}
--- a/shared/JiShe.CollectBus.Domain.Shared/JiShe.CollectBus.Domain.Shared.csproj
+++ b/shared/JiShe.CollectBus.Domain.Shared/JiShe.CollectBus.Domain.Shared.csproj
@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">

-	<Import Project="..\..\common.props" />
-
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
 		<Nullable>enable</Nullable>