From 20572e0ad39c65d7052ff912b7ca6f6793c5254d Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 09 5月 2025 08:06:12 +0800
Subject: [PATCH] 22
---
CommonDLL/公共实体类扩展类/使用方法.txt | 4
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterial/WmsMaterial.cs | 2
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509000114_InitialCreate5.Designer.cs | 2
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/MyExtension/MyFullAuditedAggregateRoot.cs | 2
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterial.cs | 2
CommonDLL/公共实体类扩展类/MyExtension/EntityTypeBuilderExtensions.cs | 114 ++++++++++++++++++++++
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250509000114_InitialCreate5.cs | 0
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/MyExtension/EntityTypeBuilderExtensions.cs | 2
CommonDLL/公共实体类扩展类/MyExtension/MyFullAuditedAggregateRoot.cs | 136 +++++++++++++++++++++++++++
9 files changed, 259 insertions(+), 5 deletions(-)
diff --git "a/CommonDLL/\345\205\254\345\205\261\345\256\236\344\275\223\347\261\273\346\211\251\345\261\225\347\261\273/MyExtension/EntityTypeBuilderExtensions.cs" "b/CommonDLL/\345\205\254\345\205\261\345\256\236\344\275\223\347\261\273\346\211\251\345\261\225\347\261\273/MyExtension/EntityTypeBuilderExtensions.cs"
new file mode 100644
index 0000000..60fee7b
--- /dev/null
+++ "b/CommonDLL/\345\205\254\345\205\261\345\256\236\344\275\223\347\261\273\346\211\251\345\261\225\347\261\273/MyExtension/EntityTypeBuilderExtensions.cs"
@@ -0,0 +1,114 @@
+锘縰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.MyExtension.Domain
+{
+ /// <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(256)
+ .IsRequired(false)
+ .HasComment("澶囨敞");
+
+ b.Property(x => x.OperationRemark)
+ .HasMaxLength(256)
+ .IsRequired(false)
+ .HasComment("鎿嶄綔澶囨敞");
+
+ b.Property(x => x.DeleteRemark)
+ .HasMaxLength(256)
+ .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/CommonDLL/\345\205\254\345\205\261\345\256\236\344\275\223\347\261\273\346\211\251\345\261\225\347\261\273/MyExtension/MyFullAuditedAggregateRoot.cs" "b/CommonDLL/\345\205\254\345\205\261\345\256\236\344\275\223\347\261\273\346\211\251\345\261\225\347\261\273/MyExtension/MyFullAuditedAggregateRoot.cs"
new file mode 100644
index 0000000..3808e5a
--- /dev/null
+++ "b/CommonDLL/\345\205\254\345\205\261\345\256\236\344\275\223\347\261\273\346\211\251\345\261\225\347\261\273/MyExtension/MyFullAuditedAggregateRoot.cs"
@@ -0,0 +1,136 @@
+锘縰sing System;
+using Volo.Abp.Auditing;
+using Volo.Abp.Domain.Entities.Auditing;
+
+namespace CMS.Plugin.MyExtension.Domain;
+
+
+/// <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? OperationRemark { get; set; }
+
+ /// <summary>
+ /// 鍒犻櫎澶囨敞
+ /// </summary>
+ public virtual string? DeleteRemark { 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 string? OperationRemark { get; set; }
+
+ /// <summary>
+ /// 鍒犻櫎澶囨敞
+ /// </summary>
+ public virtual string? DeleteRemark { 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/CommonDLL/\345\205\254\345\205\261\345\256\236\344\275\223\347\261\273\346\211\251\345\261\225\347\261\273/\344\275\277\347\224\250\346\226\271\346\263\225.txt" "b/CommonDLL/\345\205\254\345\205\261\345\256\236\344\275\223\347\261\273\346\211\251\345\261\225\347\261\273/\344\275\277\347\224\250\346\226\271\346\263\225.txt"
new file mode 100644
index 0000000..996c40c
--- /dev/null
+++ "b/CommonDLL/\345\205\254\345\205\261\345\256\236\344\275\223\347\261\273\346\211\251\345\261\225\347\261\273/\344\275\277\347\224\250\346\226\271\346\263\225.txt"
@@ -0,0 +1,4 @@
+1銆佸皢鏂囦欢澶广�怣yExtension銆戞嫹璐濆埌瑙ｅ喅鏂规 銆怌MS.Plugin.XXX.Domain銆戜腑銆�
+2銆佽В鍐虫柟妗堛�怌MS.Plugin.XXX.EntityFrameworkCore銆�-銆怑xtensions銆戜腑鐩稿簲鐨勬暟鎹簱瀹炰綋閰嶇疆绾﹀畾Configure鏌怲able涓厤缃涓嬩唬鐮�
+ //閰嶇疆閫氱敤瀛楁
+ b.ConfigureMyCmsEntity();
\ No newline at end of file
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/MyExtension/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/MyExtension/EntityTypeBuilderExtensions.cs"
index 5e513de..60fee7b 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/MyExtension/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/MyExtension/EntityTypeBuilderExtensions.cs"
@@ -6,7 +6,7 @@
using System.Text;
using System.Threading.Tasks;
-namespace CMS.Plugin.HIAWms.Domain.MyExtension
+namespace CMS.Plugin.MyExtension.Domain
{
/// <summary>
/// 鐢ㄤ簬鎵╁睍 EntityTypeBuilder 鐨勯潤鎬佺被锛屾彁渚涢拡瀵圭户鎵胯嚜 MyFullAuditedAggregateRoot<Guid> 鐨勫疄浣撶被鍨嬬殑閰嶇疆鎵╁睍鏂规硶
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/MyExtension/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/MyExtension/MyFullAuditedAggregateRoot.cs"
index dc74ab3..3808e5a 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/MyExtension/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/MyExtension/MyFullAuditedAggregateRoot.cs"
@@ -2,7 +2,7 @@
using Volo.Abp.Auditing;
using Volo.Abp.Domain.Entities.Auditing;
-namespace CMS.Plugin.HIAWms.Domain.MyExtension;
+namespace CMS.Plugin.MyExtension.Domain;
/// <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.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 1ffe823..b59aa06 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,6 +1,6 @@
-using CMS.Plugin.HIAWms.Domain.MyExtension;
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using CMS.Plugin.HIAWms.Domain.Shared.WmsMaterial;
+using CMS.Plugin.MyExtension.Domain;
using CmsQueryExtensions.Extension;
using MathNet.Numerics;
using Volo.Abp;
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 a11277f..64e9484 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,10 +1,10 @@
using CMS.Plugin.HIAWms.Domain;
-using CMS.Plugin.HIAWms.Domain.MyExtension;
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using CMS.Plugin.HIAWms.Domain.WmsMaterial;
using Microsoft.EntityFrameworkCore;
using Volo.Abp;
using Volo.Abp.EntityFrameworkCore.Modeling;
+using CMS.Plugin.MyExtension.Domain;
namespace CMS.Plugin.HIAWms.EntityFrameworkCore.Extensions;
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/20250508235400_InitialCreate5.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/20250509000114_InitialCreate5.Designer.cs"
similarity index 99%
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/20250508235400_InitialCreate5.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/20250509000114_InitialCreate5.Designer.cs"
index a4eb0af..a29e742 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/20250508235400_InitialCreate5.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/20250509000114_InitialCreate5.Designer.cs"
@@ -12,7 +12,7 @@
namespace CMS.Plugin.HIAWms.MySQL.Migrations
{
[DbContext(typeof(CMSPluginDbContext))]
- [Migration("20250508235400_InitialCreate5")]
+ [Migration("20250509000114_InitialCreate5")]
partial class InitialCreate5
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
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/20250508235400_InitialCreate5.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/20250509000114_InitialCreate5.cs"
similarity index 100%
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/20250508235400_InitialCreate5.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/20250509000114_InitialCreate5.cs"
--
Gitblit v1.9.3