From 645784f3c94c9bbf0ba71cda119cd0abc6ae3709 Mon Sep 17 00:00:00 2001 From: schangxiang@126.com <schangxiang@126.com> Date: 周四, 08 5月 2025 18:44:28 +0800 Subject: [PATCH] 222 --- Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/Extension/EntityTypeBuilderExtensions.cs | 104 ++++++++ /dev/null | 80 ------ Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterial/WmsMaterial.cs | 18 + Weben_CMS专用代码生成器/queryExtensions/CmsQueryExtensions/Extension/EntityTypeBuilderExtensions/EntityTypeBuilderExtensions.cs | 162 ++++++------ Weben_CMS专用代码生成器/queryExtensions/CmsQueryExtensions/Extension/EntityTypeBuilderExtensions/MyFullAuditedAggregateRoot.cs | 182 +++++++------- Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterial.cs | 1 Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/Extension/MyFullAuditedAggregateRoot.cs | 173 +++++++----- CommonDLL/CmsQueryExtensions.dll | 0 Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsMaterialRepository.cs | 2 9 files changed, 396 insertions(+), 326 deletions(-) diff --git a/CommonDLL/CmsQueryExtensions.dll b/CommonDLL/CmsQueryExtensions.dll index 119a687..f0ee850 100644 --- a/CommonDLL/CmsQueryExtensions.dll +++ b/CommonDLL/CmsQueryExtensions.dll Binary files differ diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/Extension/Class1.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/Extension/Class1.cs" deleted file mode 100644 index 5432fed..0000000 --- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/Extension/Class1.cs" +++ /dev/null @@ -1,80 +0,0 @@ -锘�//using Microsoft.EntityFrameworkCore; -//using Microsoft.EntityFrameworkCore.Metadata.Builders; -//using System; -//using System.Collections.Generic; -//using System.Linq; -//using System.Text; -//using System.Threading.Tasks; - -//namespace CMS.Plugin.HIAWms.Domain.Extension -//{ -// public static class EntityTypeBuilderExtensions -// { -// public static void xx<TEntity>(this EntityTypeBuilder<TEntity> b) where TEntity : MyFullAuditedAggregateRoot<Guid> -// { -// b.Property(x => x.CreatorId) -// .HasMaxLength(36) -// .IsRequired(false) -// .HasComment("鍒涘缓浜篒D"); - -// b.Property(x => x.CreatorName) -// .HasMaxLength(64) -// .IsRequired(false) -// .HasComment("鍒涘缓浜�"); - -// b.Property(x => x.CreationTime) -// .IsRequired() -// .HasComment("鍒涘缓鏃堕棿"); - -// b.Property(x => x.LastModifierName) -// .HasMaxLength(64) -// .IsRequired(false) -// .HasComment("淇敼浜�"); - -// b.Property(x => x.LastModifierId) -// .HasMaxLength(36) -// .IsRequired(false) -// .HasComment("淇敼浜篒D"); - -// b.Property(x => x.LastModificationTime) -// .IsRequired(false) -// .HasComment("淇敼鏃堕棿"); - -// b.Property(x => x.IsDeleted) -// .IsRequired() -// .HasComment("鏄惁鍒犻櫎"); - -// b.Property(x => x.DeleterId) -// .HasMaxLength(36) -// .IsRequired(false) -// .HasComment("鍒犻櫎浜篒D"); - -// b.Property(x => x.DeletionTime) -// .IsRequired(false) -// .HasComment("鍒犻櫎鏃堕棿"); - -// b.Property(x => x.ExtraProperties) -// .IsRequired(false) -// .HasComment("鎵╁睍灞炴��"); - -// b.Property(x => x.ConcurrencyStamp) -// .IsRequired(false) -// .HasMaxLength(40) -// .HasComment("骞跺彂鎴�"); - -// b.Property(x => x.Sort) -// .HasDefaultValue(0) -// .HasComment("鎺掑簭"); - -// b.Property(x => x.Remark) -// .HasMaxLength(500) -// .IsRequired(false) -// .HasComment("澶囨敞"); - -// b.Property(x => x.IsDisabled) -// .IsRequired(false) -// .HasDefaultValue(false) -// .HasComment("鏄惁绂佺敤"); -// } -// } -//} diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/Extension/EntityTypeBuilderExtensions.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/Extension/EntityTypeBuilderExtensions.cs" new file mode 100644 index 0000000..dc8563a --- /dev/null +++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/Extension/EntityTypeBuilderExtensions.cs" @@ -0,0 +1,104 @@ +锘縰sing Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Metadata.Builders; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CMS.Plugin.HIAWms.Domain.Extension +{ + /// <summary> + /// 鐢ㄤ簬鎵╁睍 EntityTypeBuilder 鐨勯潤鎬佺被锛屾彁渚涢拡瀵圭户鎵胯嚜 MyFullAuditedAggregateRoot<Guid> 鐨勫疄浣撶被鍨嬬殑閰嶇疆鎵╁睍鏂规硶 + /// </summary> + public static class EntityTypeBuilderExtensions + { + /// <summary> + /// 閽堝缁ф壙鑷� MyFullAuditedAggregateRoot<Guid> 鐨勫疄浣撶被鍨嬶紝閰嶇疆鍏跺叕鍏卞睘鎬� + /// </summary> + /// <typeparam name="TEntity">缁ф壙鑷� MyFullAuditedAggregateRoot<Guid> 鐨勫疄浣撶被鍨�</typeparam> + /// <param name="b">EntityTypeBuilder<TEntity> 瀹炰緥锛岀敤浜庨厤缃疄浣撶殑灞炴��</param> + public static void ConfigureMyCmsEntity<TEntity>(this EntityTypeBuilder<TEntity> b) where TEntity : MyFullAuditedAggregateRoot<Guid> + { + b.Property(x => x.CreatorId) + .HasMaxLength(36) + .IsRequired(false) + .HasComment("鍒涘缓浜篒D"); + + b.Property(x => x.CreatorName) + .HasMaxLength(64) + .IsRequired(false) + .HasComment("鍒涘缓浜�"); + + b.Property(x => x.CreationTime) + .IsRequired() + .HasComment("鍒涘缓鏃堕棿"); + + b.Property(x => x.LastModifierName) + .HasMaxLength(64) + .IsRequired(false) + .HasComment("淇敼浜�"); + + b.Property(x => x.LastModifierId) + .HasMaxLength(36) + .IsRequired(false) + .HasComment("淇敼浜篒D"); + + b.Property(x => x.LastModificationTime) + .IsRequired(false) + .HasComment("淇敼鏃堕棿"); + + b.Property(x => x.IsDeleted) + .IsRequired() + .HasComment("鏄惁鍒犻櫎"); + + b.Property(x => x.DeleterId) + .HasMaxLength(36) + .IsRequired(false) + .HasComment("鍒犻櫎浜篒D"); + + b.Property(x => x.DeletionTime) + .IsRequired(false) + .HasComment("鍒犻櫎鏃堕棿"); + + b.Property(x => x.ExtraProperties) + .IsRequired(false) + .HasComment("鎵╁睍灞炴��"); + + b.Property(x => x.ConcurrencyStamp) + .IsRequired(false) + .HasMaxLength(40) + .HasComment("骞跺彂鎴�"); + + b.Property(x => x.Sort) + .HasDefaultValue(0) + .HasComment("鎺掑簭"); + + b.Property(x => x.Remark) + .HasMaxLength(500) + .IsRequired(false) + .HasComment("澶囨敞"); + + b.Property(x => x.IsDisabled) + .IsRequired(false) + .HasDefaultValue(false) + .HasComment("鏄惁绂佺敤"); + + b.Property(x => x.ExtraField1) + .HasMaxLength(256) + .IsRequired(false) + .HasComment("鎵╁睍瀛楁1"); + + b.Property(x => x.ExtraField2) + .HasMaxLength(256) + .IsRequired(false) + .HasComment("鎵╁睍瀛楁2"); + + b.Property(x => x.ExtraField3) + .HasMaxLength(256) + .IsRequired(false) + .HasComment("鎵╁睍瀛楁3"); + + } + } +} diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/Extension/MyFullAuditedAggregateRoot.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/Extension/MyFullAuditedAggregateRoot.cs" index c3d0c71..daf590f 100644 --- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/Extension/MyFullAuditedAggregateRoot.cs" +++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/Extension/MyFullAuditedAggregateRoot.cs" @@ -1,84 +1,115 @@ -锘�//using System; -//using Volo.Abp.Auditing; -//using Volo.Abp.Domain.Entities.Auditing; +锘縰sing System; +using Volo.Abp.Auditing; +using Volo.Abp.Domain.Entities.Auditing; -//namespace CMS.Plugin.HIAWms.Domain; - -///// <summary> -///// Implements <see cref="IFullAuditedObject"/> to be a base class for full-audited aggregate roots. -///// </summary> -//[Serializable] -//public abstract class MyFullAuditedAggregateRoot : FullAuditedAggregateRoot -//{ -// /// <summary> -// /// 鍒涘缓浜� -// /// </summary> -// public virtual string? CreatorName { get; set; } - -// /// <summary> -// /// 淇敼浜� -// /// </summary> -// public virtual string? LastModifierName { get; set; } - -// /// <summary> -// /// 鎺掑簭 -// /// </summary> -// public virtual int Sort { get; set; } - -// /// <summary> -// /// 澶囨敞 -// /// </summary> -// public virtual string Remark { get; set; } - -// /// <summary> -// /// 鏄惁绂佺敤 -// /// </summary> -// public virtual bool? IsDisabled { get; set; } +namespace CMS.Plugin.HIAWms.Domain; -//} +/// <summary> +/// 瀹炰綋绫诲熀绫� +/// </summary> +[Serializable] +public abstract class MyFullAuditedAggregateRoot : FullAuditedAggregateRoot +{ + /// <summary> + /// 鍒涘缓浜� + /// </summary> + public virtual string? CreatorName { get; set; } -///// <summary> -///// Implements <see cref="IFullAuditedObject"/> to be a base class for full-audited aggregate roots. -///// </summary> -///// <typeparam name="TKey">Type of the primary key of the entity</typeparam> -//[Serializable] -//public abstract class MyFullAuditedAggregateRoot<TKey> : FullAuditedAggregateRoot<TKey> -//{ -// /// <summary> -// /// 鍒涘缓浜� -// /// </summary> -// public virtual string? CreatorName { get; set; } + /// <summary> + /// 淇敼浜� + /// </summary> + public virtual string? LastModifierName { get; set; } -// /// <summary> -// /// 淇敼浜� -// /// </summary> -// public virtual string? LastModifierName { get; set; } + /// <summary> + /// 鎺掑簭 + /// </summary> + public virtual int Sort { get; set; } -// /// <summary> -// /// 鎺掑簭 -// /// </summary> -// public virtual int Sort { get; set; } + /// <summary> + /// 澶囨敞 + /// </summary> + public virtual string? Remark { get; set; } -// /// <summary> -// /// 澶囨敞 -// /// </summary> -// public virtual string Remark { get; set; } + /// <summary> + /// 鏄惁绂佺敤 + /// </summary> + public virtual bool? IsDisabled { get; set; } -// /// <summary> -// /// 鏄惁绂佺敤 -// /// </summary> -// public virtual bool? IsDisabled { get; set; } + /// <summary> + /// 鎵╁睍瀛楁1 + /// </summary> + public virtual string? ExtraField1 { get; set; } + + /// <summary> + /// 鎵╁睍瀛楁2 + /// </summary> + public virtual string? ExtraField2 { get; set; } + + /// <summary> + /// 鎵╁睍瀛楁3 + /// </summary> + public virtual string? ExtraField3 { get; set; } -// protected MyFullAuditedAggregateRoot() -// { +} -// } +/// <summary> +/// 瀹炰綋绫诲熀绫� +/// </summary> +/// <typeparam name="TKey"></typeparam> +[Serializable] +public abstract class MyFullAuditedAggregateRoot<TKey> : FullAuditedAggregateRoot<TKey> +{ + /// <summary> + /// 鍒涘缓浜� + /// </summary> + public virtual string? CreatorName { get; set; } -// protected MyFullAuditedAggregateRoot(TKey id) -// : base(id) -// { + /// <summary> + /// 淇敼浜� + /// </summary> + public virtual string? LastModifierName { get; set; } -// } -//} + /// <summary> + /// 鎺掑簭 + /// </summary> + public virtual int Sort { get; set; } + + /// <summary> + /// 澶囨敞 + /// </summary> + public virtual string? Remark { get; set; } + + /// <summary> + /// 鏄惁绂佺敤 + /// </summary> + public virtual bool? IsDisabled { get; set; } + + + /// <summary> + /// 鎵╁睍瀛楁1 + /// </summary> + public virtual string? ExtraField1 { get; set; } + + /// <summary> + /// 鎵╁睍瀛楁2 + /// </summary> + public virtual string? ExtraField2 { get; set; } + + /// <summary> + /// 鎵╁睍瀛楁3 + /// </summary> + public virtual string? ExtraField3 { get; set; } + + protected MyFullAuditedAggregateRoot() + { + + } + + protected MyFullAuditedAggregateRoot(TKey id) + : base(id) + { + + } +} diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterial/WmsMaterial.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterial/WmsMaterial.cs" index a27c363..4173e82 100644 --- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterial/WmsMaterial.cs" +++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterial/WmsMaterial.cs" @@ -71,7 +71,7 @@ /// 鐢熶骇宸ュ巶 /// </summary> public string Factory { get; set; } - + /// <summary> /// 璇佷功缂栧彿锛堝锛氬帇鍔涘鍣ㄨ璇侊級 /// </summary> @@ -92,7 +92,21 @@ /// </summary> public string RedundantField3 { get; set; } - + /// <summary> + /// 鎺掑簭 + /// </summary> + public virtual int Sort { get; set; } + + /// <summary> + /// 澶囨敞 + /// </summary> + public virtual string Remark { get; set; } + + /// <summary> + /// 鏄惁绂佺敤 + /// </summary> + public virtual bool? IsDisabled { get; set; } + /// <summary> /// Adjusts the sort. /// </summary> diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterial.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterial.cs" index 22ed6c0..0bfac11 100644 --- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterial.cs" +++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterial.cs" @@ -1,4 +1,5 @@ using CMS.Plugin.HIAWms.Domain; +using CMS.Plugin.HIAWms.Domain.Extension; using CMS.Plugin.HIAWms.Domain.Shared.Enums; using CMS.Plugin.HIAWms.Domain.WmsMaterial; using CmsQueryExtensions.Extension; diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsMaterialRepository.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsMaterialRepository.cs" index 7a7edc1..73cd64c 100644 --- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsMaterialRepository.cs" +++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsMaterialRepository.cs" @@ -84,7 +84,7 @@ .IncludeDetails(includeDetails) .WhereIf(whereConditions != null, whereConditions.data) .Where(x => !x.IsDeleted) - .OrderBy(sorting.IsNullOrEmpty() ? nameof(WmsMaterial.Sort) : sorting) + //.OrderBy(sorting.IsNullOrEmpty() ? nameof(WmsMaterial.Sort) : sorting) .PageBy(skipCount, maxResultCount) .ToListAsync(GetCancellationToken(cancellationToken)); } diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/queryExtensions/CmsQueryExtensions/Extension/EntityTypeBuilderExtensions/EntityTypeBuilderExtensions.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/queryExtensions/CmsQueryExtensions/Extension/EntityTypeBuilderExtensions/EntityTypeBuilderExtensions.cs" index 716facd..2935771 100644 --- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/queryExtensions/CmsQueryExtensions/Extension/EntityTypeBuilderExtensions/EntityTypeBuilderExtensions.cs" +++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/queryExtensions/CmsQueryExtensions/Extension/EntityTypeBuilderExtensions/EntityTypeBuilderExtensions.cs" @@ -1,99 +1,99 @@ -锘縰sing Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Metadata.Builders; +锘�//using Microsoft.EntityFrameworkCore; +//using Microsoft.EntityFrameworkCore.Metadata.Builders; -namespace CmsQueryExtensions.Extension -{ - /// <summary> - /// 鐢ㄤ簬鎵╁睍 EntityTypeBuilder 鐨勯潤鎬佺被锛屾彁渚涢拡瀵圭户鎵胯嚜 MyFullAuditedAggregateRoot<Guid> 鐨勫疄浣撶被鍨嬬殑閰嶇疆鎵╁睍鏂规硶 - /// </summary> - public static class EntityTypeBuilderExtensions - { - /// <summary> - /// 閽堝缁ф壙鑷� MyFullAuditedAggregateRoot<Guid> 鐨勫疄浣撶被鍨嬶紝閰嶇疆鍏跺叕鍏卞睘鎬� - /// </summary> - /// <typeparam name="TEntity">缁ф壙鑷� MyFullAuditedAggregateRoot<Guid> 鐨勫疄浣撶被鍨�</typeparam> - /// <param name="b">EntityTypeBuilder<TEntity> 瀹炰緥锛岀敤浜庨厤缃疄浣撶殑灞炴��</param> - public static void ConfigureMyCmsEntity<TEntity>(this EntityTypeBuilder<TEntity> b) where TEntity : MyFullAuditedAggregateRoot<Guid> - { - b.Property(x => x.CreatorId) - .HasMaxLength(36) - .IsRequired(false) - .HasComment("鍒涘缓浜篒D"); +//namespace CmsQueryExtensions.Extension +//{ +// /// <summary> +// /// 鐢ㄤ簬鎵╁睍 EntityTypeBuilder 鐨勯潤鎬佺被锛屾彁渚涢拡瀵圭户鎵胯嚜 MyFullAuditedAggregateRoot<Guid> 鐨勫疄浣撶被鍨嬬殑閰嶇疆鎵╁睍鏂规硶 +// /// </summary> +// public static class EntityTypeBuilderExtensions +// { +// /// <summary> +// /// 閽堝缁ф壙鑷� MyFullAuditedAggregateRoot<Guid> 鐨勫疄浣撶被鍨嬶紝閰嶇疆鍏跺叕鍏卞睘鎬� +// /// </summary> +// /// <typeparam name="TEntity">缁ф壙鑷� MyFullAuditedAggregateRoot<Guid> 鐨勫疄浣撶被鍨�</typeparam> +// /// <param name="b">EntityTypeBuilder<TEntity> 瀹炰緥锛岀敤浜庨厤缃疄浣撶殑灞炴��</param> +// public static void ConfigureMyCmsEntity<TEntity>(this EntityTypeBuilder<TEntity> b) where TEntity : MyFullAuditedAggregateRoot<Guid> +// { +// b.Property(x => x.CreatorId) +// .HasMaxLength(36) +// .IsRequired(false) +// .HasComment("鍒涘缓浜篒D"); - b.Property(x => x.CreatorName) - .HasMaxLength(64) - .IsRequired(false) - .HasComment("鍒涘缓浜�"); +// b.Property(x => x.CreatorName) +// .HasMaxLength(64) +// .IsRequired(false) +// .HasComment("鍒涘缓浜�"); - b.Property(x => x.CreationTime) - .IsRequired() - .HasComment("鍒涘缓鏃堕棿"); +// b.Property(x => x.CreationTime) +// .IsRequired() +// .HasComment("鍒涘缓鏃堕棿"); - b.Property(x => x.LastModifierName) - .HasMaxLength(64) - .IsRequired(false) - .HasComment("淇敼浜�"); +// b.Property(x => x.LastModifierName) +// .HasMaxLength(64) +// .IsRequired(false) +// .HasComment("淇敼浜�"); - b.Property(x => x.LastModifierId) - .HasMaxLength(36) - .IsRequired(false) - .HasComment("淇敼浜篒D"); +// b.Property(x => x.LastModifierId) +// .HasMaxLength(36) +// .IsRequired(false) +// .HasComment("淇敼浜篒D"); - b.Property(x => x.LastModificationTime) - .IsRequired(false) - .HasComment("淇敼鏃堕棿"); +// b.Property(x => x.LastModificationTime) +// .IsRequired(false) +// .HasComment("淇敼鏃堕棿"); - b.Property(x => x.IsDeleted) - .IsRequired() - .HasComment("鏄惁鍒犻櫎"); +// b.Property(x => x.IsDeleted) +// .IsRequired() +// .HasComment("鏄惁鍒犻櫎"); - b.Property(x => x.DeleterId) - .HasMaxLength(36) - .IsRequired(false) - .HasComment("鍒犻櫎浜篒D"); +// b.Property(x => x.DeleterId) +// .HasMaxLength(36) +// .IsRequired(false) +// .HasComment("鍒犻櫎浜篒D"); - b.Property(x => x.DeletionTime) - .IsRequired(false) - .HasComment("鍒犻櫎鏃堕棿"); +// b.Property(x => x.DeletionTime) +// .IsRequired(false) +// .HasComment("鍒犻櫎鏃堕棿"); - b.Property(x => x.ExtraProperties) - .IsRequired(false) - .HasComment("鎵╁睍灞炴��"); +// b.Property(x => x.ExtraProperties) +// .IsRequired(false) +// .HasComment("鎵╁睍灞炴��"); - b.Property(x => x.ConcurrencyStamp) - .IsRequired(false) - .HasMaxLength(40) - .HasComment("骞跺彂鎴�"); +// b.Property(x => x.ConcurrencyStamp) +// .IsRequired(false) +// .HasMaxLength(40) +// .HasComment("骞跺彂鎴�"); - b.Property(x => x.Sort) - .HasDefaultValue(0) - .HasComment("鎺掑簭"); +// b.Property(x => x.Sort) +// .HasDefaultValue(0) +// .HasComment("鎺掑簭"); - b.Property(x => x.Remark) - .HasMaxLength(500) - .IsRequired(false) - .HasComment("澶囨敞"); +// b.Property(x => x.Remark) +// .HasMaxLength(500) +// .IsRequired(false) +// .HasComment("澶囨敞"); - b.Property(x => x.IsDisabled) - .IsRequired(false) - .HasDefaultValue(false) - .HasComment("鏄惁绂佺敤"); +// b.Property(x => x.IsDisabled) +// .IsRequired(false) +// .HasDefaultValue(false) +// .HasComment("鏄惁绂佺敤"); - b.Property(x => x.ExtraField1) - .HasMaxLength(256) - .IsRequired(false) - .HasComment("鎵╁睍瀛楁1"); +// b.Property(x => x.ExtraField1) +// .HasMaxLength(256) +// .IsRequired(false) +// .HasComment("鎵╁睍瀛楁1"); - b.Property(x => x.ExtraField2) - .HasMaxLength(256) - .IsRequired(false) - .HasComment("鎵╁睍瀛楁2"); +// b.Property(x => x.ExtraField2) +// .HasMaxLength(256) +// .IsRequired(false) +// .HasComment("鎵╁睍瀛楁2"); - b.Property(x => x.ExtraField3) - .HasMaxLength(256) - .IsRequired(false) - .HasComment("鎵╁睍瀛楁3"); +// b.Property(x => x.ExtraField3) +// .HasMaxLength(256) +// .IsRequired(false) +// .HasComment("鎵╁睍瀛楁3"); - } - } -} +// } +// } +//} diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/queryExtensions/CmsQueryExtensions/Extension/EntityTypeBuilderExtensions/MyFullAuditedAggregateRoot.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/queryExtensions/CmsQueryExtensions/Extension/EntityTypeBuilderExtensions/MyFullAuditedAggregateRoot.cs" index ca7ea91..5a6d61a 100644 --- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/queryExtensions/CmsQueryExtensions/Extension/EntityTypeBuilderExtensions/MyFullAuditedAggregateRoot.cs" +++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/queryExtensions/CmsQueryExtensions/Extension/EntityTypeBuilderExtensions/MyFullAuditedAggregateRoot.cs" @@ -1,114 +1,114 @@ -锘縰sing System; -using Volo.Abp.Auditing; -using Volo.Abp.Domain.Entities.Auditing; +锘�//using System; +//using Volo.Abp.Auditing; +//using Volo.Abp.Domain.Entities.Auditing; -namespace CmsQueryExtensions.Extension; +//namespace CmsQueryExtensions.Extension; +//CMS鏃犳硶鍔犺浇璇ユ枃浠讹紝搴旇鏄疌MS涓嶄細鎵捐繖涓猟ll鍐呭鍚� +///// <summary> +///// 瀹炰綋绫诲熀绫� +///// </summary> +//[Serializable] +//public abstract class MyFullAuditedAggregateRoot : FullAuditedAggregateRoot +//{ +// /// <summary> +// /// 鍒涘缓浜� +// /// </summary> +// public virtual string? CreatorName { get; set; } -/// <summary> -/// 瀹炰綋绫诲熀绫� -/// </summary> -[Serializable] -public abstract class MyFullAuditedAggregateRoot : FullAuditedAggregateRoot -{ - /// <summary> - /// 鍒涘缓浜� - /// </summary> - public virtual string? CreatorName { get; set; } +// /// <summary> +// /// 淇敼浜� +// /// </summary> +// public virtual string? LastModifierName { get; set; } - /// <summary> - /// 淇敼浜� - /// </summary> - public virtual string? LastModifierName { get; set; } +// /// <summary> +// /// 鎺掑簭 +// /// </summary> +// public virtual int Sort { get; set; } - /// <summary> - /// 鎺掑簭 - /// </summary> - public virtual int Sort { get; set; } +// /// <summary> +// /// 澶囨敞 +// /// </summary> +// public virtual string? Remark { get; set; } - /// <summary> - /// 澶囨敞 - /// </summary> - public virtual string? Remark { get; set; } +// /// <summary> +// /// 鏄惁绂佺敤 +// /// </summary> +// public virtual bool? IsDisabled { get; set; } - /// <summary> - /// 鏄惁绂佺敤 - /// </summary> - public virtual bool? IsDisabled { get; set; } +// /// <summary> +// /// 鎵╁睍瀛楁1 +// /// </summary> +// public virtual string? ExtraField1 { get; set; } - /// <summary> - /// 鎵╁睍瀛楁1 - /// </summary> - public virtual string? ExtraField1 { get; set; } +// /// <summary> +// /// 鎵╁睍瀛楁2 +// /// </summary> +// public virtual string? ExtraField2 { get; set; } - /// <summary> - /// 鎵╁睍瀛楁2 - /// </summary> - public virtual string? ExtraField2 { get; set; } - - /// <summary> - /// 鎵╁睍瀛楁3 - /// </summary> - public virtual string? ExtraField3 { get; set; } +// /// <summary> +// /// 鎵╁睍瀛楁3 +// /// </summary> +// public virtual string? ExtraField3 { get; set; } -} +//} -/// <summary> -/// 瀹炰綋绫诲熀绫� -/// </summary> -/// <typeparam name="TKey"></typeparam> -[Serializable] -public abstract class MyFullAuditedAggregateRoot<TKey> : FullAuditedAggregateRoot<TKey> -{ - /// <summary> - /// 鍒涘缓浜� - /// </summary> - public virtual string? CreatorName { get; set; } +///// <summary> +///// 瀹炰綋绫诲熀绫� +///// </summary> +///// <typeparam name="TKey"></typeparam> +//[Serializable] +//public abstract class MyFullAuditedAggregateRoot<TKey> : FullAuditedAggregateRoot<TKey> +//{ +// /// <summary> +// /// 鍒涘缓浜� +// /// </summary> +// public virtual string? CreatorName { get; set; } - /// <summary> - /// 淇敼浜� - /// </summary> - public virtual string? LastModifierName { get; set; } +// /// <summary> +// /// 淇敼浜� +// /// </summary> +// public virtual string? LastModifierName { get; set; } - /// <summary> - /// 鎺掑簭 - /// </summary> - public virtual int Sort { get; set; } +// /// <summary> +// /// 鎺掑簭 +// /// </summary> +// public virtual int Sort { get; set; } - /// <summary> - /// 澶囨敞 - /// </summary> - public virtual string? Remark { get; set; } +// /// <summary> +// /// 澶囨敞 +// /// </summary> +// public virtual string? Remark { get; set; } - /// <summary> - /// 鏄惁绂佺敤 - /// </summary> - public virtual bool? IsDisabled { get; set; } +// /// <summary> +// /// 鏄惁绂佺敤 +// /// </summary> +// public virtual bool? IsDisabled { get; set; } - /// <summary> - /// 鎵╁睍瀛楁1 - /// </summary> - public virtual string? ExtraField1 { get; set; } +// /// <summary> +// /// 鎵╁睍瀛楁1 +// /// </summary> +// public virtual string? ExtraField1 { get; set; } - /// <summary> - /// 鎵╁睍瀛楁2 - /// </summary> - public virtual string? ExtraField2 { get; set; } +// /// <summary> +// /// 鎵╁睍瀛楁2 +// /// </summary> +// public virtual string? ExtraField2 { get; set; } - /// <summary> - /// 鎵╁睍瀛楁3 - /// </summary> - public virtual string? ExtraField3 { get; set; } +// /// <summary> +// /// 鎵╁睍瀛楁3 +// /// </summary> +// public virtual string? ExtraField3 { get; set; } - protected MyFullAuditedAggregateRoot() - { +// protected MyFullAuditedAggregateRoot() +// { - } +// } - protected MyFullAuditedAggregateRoot(TKey id) - : base(id) - { +// protected MyFullAuditedAggregateRoot(TKey id) +// : base(id) +// { - } -} +// } +//} -- Gitblit v1.9.3