From 8bb85a10dac0b43a2f87397c48b6c62b1ae8556a Mon Sep 17 00:00:00 2001 From: schangxiang@126.com <schangxiang@126.com> Date: 周四, 08 5月 2025 17:10:05 +0800 Subject: [PATCH] 公用属性 --- /dev/null | 26 -- Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterial/WmsMaterial.cs | 1 Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250508090853_InitialCreate4.Designer.cs | 17 + Weben_CMS专用代码生成器/queryExtensions/CmsQueryExtensions/CmsQueryExtensions.csproj | 6 Weben_CMS专用代码生成器/queryExtensions/CmsQueryExtensions/Extension/EntityTypeBuilderExtensions/EntityTypeBuilderExtensions.cs | 99 +++++++++ Weben_CMS专用代码生成器/queryExtensions/CmsQueryExtensions/Extension/EntityTypeBuilderExtensions/MyFullAuditedAggregateRoot.cs | 114 +++++++++++ Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterial.cs | 7 Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250508090853_InitialCreate4.cs | 8 Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/Extension/MyFullAuditedAggregateRoot.cs | 132 ++++++------ CommonDLL/CmsQueryExtensions.dll | 0 Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/Extension/Class1.cs | 132 ++++++------ Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs | 15 + 12 files changed, 393 insertions(+), 164 deletions(-) diff --git a/CommonDLL/CmsQueryExtensions.dll b/CommonDLL/CmsQueryExtensions.dll index 06867a8..119a687 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/AuditableEntity.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/AuditableEntity.cs" deleted file mode 100644 index d2b09ad..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/AuditableEntity.cs" +++ /dev/null @@ -1,26 +0,0 @@ -锘縰sing System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace CMS.Plugin.HIAWms.Domain.Extension -{ - public class AuditableEntity - { - public string CreatorId { get; set; } - public string CreatorName { get; set; } - public DateTime CreationTime { get; set; } - public string LastModifierName { get; set; } - public string LastModifierId { get; set; } - public DateTime? LastModificationTime { get; set; } - public bool IsDeleted { get; set; } - public string DeleterId { get; set; } - public DateTime? DeletionTime { get; set; } - public string ExtraProperties { get; set; } - public string ConcurrencyStamp { get; set; } - public int Sort { get; set; } - public string Remark { get; set; } - public bool IsDisabled { get; set; } - } -} 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" index f877bf9..5432fed 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/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" @@ -1,80 +1,80 @@ -锘縰sing Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Metadata.Builders; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +锘�//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"); +//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.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("鏄惁绂佺敤"); +// } +// } +//} 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 7247863..c3d0c71 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,84 @@ -锘縰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 CMS.Plugin.HIAWms.Domain; +//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> +///// 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 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> -/// 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> +///// 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; } - protected MyFullAuditedAggregateRoot() - { +// protected MyFullAuditedAggregateRoot() +// { - } +// } - protected MyFullAuditedAggregateRoot(TKey id) - : base(id) - { +// 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 d85fefb..a27c363 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" @@ -1,5 +1,6 @@ using CMS.Plugin.HIAWms.Domain.Shared.Enums; using CMS.Plugin.HIAWms.Domain.Shared.WmsMaterial; +using CmsQueryExtensions.Extension; using MathNet.Numerics; using Volo.Abp; using Volo.Abp.Domain.Entities.Auditing; 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 2762586..ab49d14 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,9 +1,8 @@ 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; using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Metadata.Builders; using Volo.Abp; using Volo.Abp.EntityFrameworkCore.Modeling; @@ -140,9 +139,9 @@ b.HasIndex(x => x.PurchaseType); // 閲囪喘绫诲瀷绱㈠紩锛堝闇�鏌ヨ杩囨护锛� b.HasIndex(x => x.MaterialType); // 鐗╂枡绫诲瀷绱㈠紩锛堝闇�鏌ヨ杩囨护锛� - b.xx(); + b.ConfigureMyCmsEntity(); - + // b.Property(x => x.CreatorId) // .HasMaxLength(36) // .IsRequired(false) 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.MySQL/Migrations/20250508083921_InitialCreate4.Designer.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.MySQL/Migrations/20250508090853_InitialCreate4.Designer.cs" similarity index 98% rename from "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.MySQL/Migrations/20250508083921_InitialCreate4.Designer.cs" rename to "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.MySQL/Migrations/20250508090853_InitialCreate4.Designer.cs" index 521901f..3cf28b3 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.MySQL/Migrations/20250508083921_InitialCreate4.Designer.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.MySQL/Migrations/20250508090853_InitialCreate4.Designer.cs" @@ -12,7 +12,7 @@ namespace CMS.Plugin.HIAWms.MySQL.Migrations { [DbContext(typeof(CMSPluginDbContext))] - [Migration("20250508083921_InitialCreate4")] + [Migration("20250508090853_InitialCreate4")] partial class InitialCreate4 { protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -468,6 +468,21 @@ .HasColumnName("DeletionTime") .HasComment("鍒犻櫎鏃堕棿"); + b.Property<string>("ExtraField1") + .HasMaxLength(256) + .HasColumnType("varchar(256)") + .HasComment("鎵╁睍瀛楁1"); + + b.Property<string>("ExtraField2") + .HasMaxLength(256) + .HasColumnType("varchar(256)") + .HasComment("鎵╁睍瀛楁2"); + + b.Property<string>("ExtraField3") + .HasMaxLength(256) + .HasColumnType("varchar(256)") + .HasComment("鎵╁睍瀛楁3"); + b.Property<string>("ExtraProperties") .HasColumnType("longtext") .HasColumnName("ExtraProperties") 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.MySQL/Migrations/20250508083921_InitialCreate4.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.MySQL/Migrations/20250508090853_InitialCreate4.cs" similarity index 98% rename from "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.MySQL/Migrations/20250508083921_InitialCreate4.cs" rename to "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.MySQL/Migrations/20250508090853_InitialCreate4.cs" index b17a88f..0f8c7c6 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.MySQL/Migrations/20250508083921_InitialCreate4.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.MySQL/Migrations/20250508090853_InitialCreate4.cs" @@ -202,7 +202,13 @@ Sort = table.Column<int>(type: "int", nullable: false, defaultValue: 0, comment: "鎺掑簭"), Remark = table.Column<string>(type: "varchar(500)", maxLength: 500, nullable: true, comment: "澶囨敞") .Annotation("MySql:CharSet", "utf8mb4"), - IsDisabled = table.Column<bool>(type: "tinyint(1)", nullable: true, defaultValue: false, comment: "鏄惁绂佺敤") + IsDisabled = table.Column<bool>(type: "tinyint(1)", nullable: true, defaultValue: false, comment: "鏄惁绂佺敤"), + ExtraField1 = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "鎵╁睍瀛楁1") + .Annotation("MySql:CharSet", "utf8mb4"), + ExtraField2 = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "鎵╁睍瀛楁2") + .Annotation("MySql:CharSet", "utf8mb4"), + ExtraField3 = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "鎵╁睍瀛楁3") + .Annotation("MySql:CharSet", "utf8mb4") }, constraints: table => { 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.MySQL/Migrations/CMSPluginDbContextModelSnapshot.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.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs" index 0e2b2cb..cf7429b 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.MySQL/Migrations/CMSPluginDbContextModelSnapshot.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.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs" @@ -466,6 +466,21 @@ .HasColumnName("DeletionTime") .HasComment("鍒犻櫎鏃堕棿"); + b.Property<string>("ExtraField1") + .HasMaxLength(256) + .HasColumnType("varchar(256)") + .HasComment("鎵╁睍瀛楁1"); + + b.Property<string>("ExtraField2") + .HasMaxLength(256) + .HasColumnType("varchar(256)") + .HasComment("鎵╁睍瀛楁2"); + + b.Property<string>("ExtraField3") + .HasMaxLength(256) + .HasColumnType("varchar(256)") + .HasComment("鎵╁睍瀛楁3"); + b.Property<string>("ExtraProperties") .HasColumnType("longtext") .HasColumnName("ExtraProperties") 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/CmsQueryExtensions.csproj" "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/CmsQueryExtensions.csproj" index 132c02c..d6ad5a8 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/CmsQueryExtensions.csproj" +++ "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/CmsQueryExtensions.csproj" @@ -6,4 +6,10 @@ <Nullable>enable</Nullable> </PropertyGroup> + <ItemGroup> + <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.16" /> + <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.16" /> + <PackageReference Include="Volo.Abp.Ddd.Domain" Version="6.0.0" /> + </ItemGroup> + </Project> 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" new file mode 100644 index 0000000..716facd --- /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/queryExtensions/CmsQueryExtensions/Extension/EntityTypeBuilderExtensions/EntityTypeBuilderExtensions.cs" @@ -0,0 +1,99 @@ +锘縰sing 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"); + + 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/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" new file mode 100644 index 0000000..ca7ea91 --- /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/queryExtensions/CmsQueryExtensions/Extension/EntityTypeBuilderExtensions/MyFullAuditedAggregateRoot.cs" @@ -0,0 +1,114 @@ +锘縰sing System; +using Volo.Abp.Auditing; +using Volo.Abp.Domain.Entities.Auditing; + +namespace CmsQueryExtensions.Extension; + +/// <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 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; } + + +} + +/// <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 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) + { + + } +} -- Gitblit v1.9.3