FreeSql CodeFirst初始化数据

src/PTCMS.API/PTCMS.API/Domain/Entities/Certificate.cs

@@ -15,43 +15,37 @@ namespace PTCMS.API.Domain.Entities
         public int Id { get; set; }
 
         /// <summary>
-        /// 名称
+        /// 姓名
         /// </summary>
-        [Column(Name = "name")]
+        [Column(Name = "name", IsNullable = false, StringLength = 50)]
         public string Name { get; set; }
 
         /// <summary>
-        /// 证件类型
-        /// </summary>
-        [Column(Name = "id_type")]
-        public int IdType { get; set; }
-
-        /// <summary>
-        /// 证件号码
+        /// 身份证号
         /// </summary>
-        [Column(Name = "id_number", StringLength = 20)]
+        [Column(Name = "id_number", StringLength = 50, IsNullable = false)]
         public string IdNumber { get; set; }
 
         /// <summary>
-        /// 证件编号
+        /// 证书编号
         /// </summary>
-        [Column(Name = "id_code", StringLength = 50)]
-        public string IdCode { get; set; }
+        [Column(Name = "certificate_number", StringLength = 50, IsNullable = false)]
+        public string CertificateNumber { get; set; }
 
         /// <summary>
         /// 职称系列
         /// </summary>
         [Column(Name = "professional_title_series", StringLength = 50)]
-        public int ProfessionalTitleSeries { get; set; }
+        public string ProfessionalTitleSeries { get; set; }
 
         /// <summary>
         /// 职称专业
         /// </summary>
-        [Column(Name = "Professional_title", StringLength = 50)]
+        [Column(Name = "professional_title", StringLength = 50)]
         public string ProfessionalTitle { get; set; }
 
         /// <summary>
-        /// 任职资格
+        /// 职务任职资格
         /// </summary>
         [Column(Name = "qualification", StringLength = 50)]
         public string Qualification { get; set; }
@@ -59,8 +53,8 @@ namespace PTCMS.API.Domain.Entities
         /// <summary>
         /// 职称级别
         /// </summary>
-        [Column(Name = "level")]
-        public int Level { get; set; }
+        [Column(Name = "level", StringLength = 10)]
+        public string Level { get; set; }
 
         /// <summary>
         /// 任职资格时间
@@ -97,5 +91,17 @@ namespace PTCMS.API.Domain.Entities
         /// </summary>
         [Column(Name = "remark", StringLength = 200)]
         public string Remark { get; set; }
+
+        /// <summary>
+        /// 证件类型
+        /// </summary>
+        [Column(Name = "id_type", StringLength = 20)]
+        public string IdType { get; set; }
+
+        /// <summary>
+        /// 证件照片
+        /// </summary>
+        [Column(Name = "img_url", StringLength = 1000)]
+        public string ImgUrl { get; set; }
     }
-}
+}

src/PTCMS.API/PTCMS.API/Infrastructure/Dtos/CertificateSearchDto.cs

@@ -15,6 +15,6 @@
         /// <summary>
         /// 证件编号
         /// </summary>
-        public string IdCode { get; set; }
+        public string CertificateNumber { get; set; }
     }
 }

src/PTCMS.API/PTCMS.API/Infrastructure/Repositories/CertificateRepository.cs

@@ -32,21 +32,21 @@ namespace PTCMS.API.Infrastructure.Repositories
         {
             Expression<Func<Certificate, bool>> expression = null;
 
-            if (!string.IsNullOrWhiteSpace(input.Name) && !string.IsNullOrWhiteSpace(input.IdNumber) && !string.IsNullOrWhiteSpace(input.IdCode))
+            if (!string.IsNullOrWhiteSpace(input.Name) && !string.IsNullOrWhiteSpace(input.IdNumber) && !string.IsNullOrWhiteSpace(input.CertificateNumber))
             {
-                expression = expression.And(x => x.Name == input.Name && x.IdNumber == input.IdNumber && x.IdCode == input.IdCode);
+                expression = expression.And(x => x.Name == input.Name && x.IdNumber == input.IdNumber && x.CertificateNumber == input.CertificateNumber);
             }
             else if (!string.IsNullOrWhiteSpace(input.Name) && !string.IsNullOrWhiteSpace(input.IdNumber))
             {
                 expression = expression.And(x => x.Name == input.Name && x.IdNumber == input.IdNumber);
             }
-            else if (!string.IsNullOrWhiteSpace(input.Name) && !string.IsNullOrWhiteSpace(input.IdCode))
+            else if (!string.IsNullOrWhiteSpace(input.Name) && !string.IsNullOrWhiteSpace(input.CertificateNumber))
             {
-                expression = expression.And(x => x.Name == input.Name && x.IdCode == input.IdCode);
+                expression = expression.And(x => x.Name == input.Name && x.CertificateNumber == input.CertificateNumber);
             }
             else
             {
-                return null;
+                throw new Exception("请输入姓名、身份证号、证书编号中的两项进行查询");
             }
 
             if (expression == null)
@@ -59,4 +59,4 @@ namespace PTCMS.API.Infrastructure.Repositories
             return data;
         }
     }
-}
+}

src/PTCMS.API/PTCMS.API/Infrastructure/Utils/Extensions/FreeSqlExtensions.cs

@@ -0,0 +1,166 @@
+using FreeSql;
+
+using PTCMS.API.Domain.Entities;
+
+namespace PTCMS.API.Infrastructure.Utils.Extensions
+{
+    /// <summary>
+    /// freesql扩展
+    /// </summary>
+    public static class FreeSqlExtensions
+    {
+        /// <summary>
+        /// 初始化数据
+        /// </summary>
+        /// <param name="codeFirst"></param>
+        public static void CodeFirstExt(this ICodeFirst codeFirst)
+        {
+            codeFirst.Entity<Certificate>(eb =>
+            {
+                eb.HasData(new List<Certificate>()
+                {
+                    new Certificate{
+                        Name="冉培松",
+                        IdNumber="522127196707160013",
+                        CertificateNumber="黔高1830053000002",
+                        ProfessionalTitleSeries="工程技术人员",
+                        ProfessionalTitle="林业技术",
+                        Qualification="工程技术人才_高级工程师",
+                        Level="中级",
+                        QualificationTime=new DateTime(2018,12,30),
+                        IssueTime=new DateTime(2019,5,1),
+                        ReviewOrganization="遵义市工程技术职务中级评审委员会",
+                        IssuingAuthority="遵义市人力资源和社会保障局",
+                        DeclarationUnit="北京森旺林业工程设计有限公司遵义分公司"
+                    },
+                    new Certificate{
+                        Name="罗仪",
+                        IdNumber="522127199401147514",
+                        CertificateNumber="黔特中1910992980519",
+                        ProfessionalTitleSeries="工程技术人员",
+                        ProfessionalTitle="林业技术",
+                        Qualification="工程技术人才_中级工程师",
+                        Level="中级",
+                        QualificationTime=new DateTime(2018,12,30),
+                        IssueTime=new DateTime(2019,5,1),
+                        ReviewOrganization="遵义市工程技术职务中级评审委员会",
+                        IssuingAuthority="遵义市人力资源和社会保障局",
+                        DeclarationUnit="北京森旺林业工程设计有限公司遵义分公司"
+                    },
+                    new Certificate{
+                        Name="王珂",
+                        IdNumber="522127199202280013",
+                        CertificateNumber="黔特中1910992980562",
+                        ProfessionalTitleSeries="工程技术人员",
+                        ProfessionalTitle="林业技术",
+                        Qualification="工程技术人才_中级工程师",
+                        Level="中级",
+                        QualificationTime=new DateTime(2018,12,30),
+                        IssueTime=new DateTime(2019,5,1),
+                        ReviewOrganization="遵义市工程技术职务中级评审委员会",
+                        IssuingAuthority="遵义市人力资源和社会保障局",
+                        DeclarationUnit="北京森旺林业工程设计有限公司遵义分公司"
+                    },
+                    new Certificate{
+                        Name="黄冲",
+                        IdNumber="522127199309263037",
+                        CertificateNumber="黔特中1910992980635",
+                        ProfessionalTitleSeries="工程技术人员",
+                        ProfessionalTitle="林业技术",
+                        Qualification="工程技术人才_中级工程师",
+                        Level="中级",
+                        QualificationTime=new DateTime(2018,12,30),
+                        IssueTime=new DateTime(2019,5,1),
+                        ReviewOrganization="遵义市工程技术职务中级评审委员会",
+                        IssuingAuthority="遵义市人力资源和社会保障局",
+                        DeclarationUnit="北京森旺林业工程设计有限公司遵义分公司"
+                    },
+                    new Certificate{
+                        Name="石倩倩",
+                        IdNumber="522127199409200025",
+                        CertificateNumber="黔特中1910992980681",
+                        ProfessionalTitleSeries="工程技术人员",
+                        ProfessionalTitle="林业技术",
+                        Qualification="工程技术人才_中级工程师",
+                        Level="中级",
+                        QualificationTime=new DateTime(2018,12,30),
+                        IssueTime=new DateTime(2019,5,1),
+                        ReviewOrganization="遵义市工程技术职务中级评审委员会",
+                        IssuingAuthority="遵义市人力资源和社会保障局",
+                        DeclarationUnit="北京森旺林业工程设计有限公司遵义分公司"
+                    },
+                    new Certificate{
+                        Name="郑泽仙",
+                        IdNumber="522724199209243825",
+                        CertificateNumber="黔特中1910992980188",
+                        ProfessionalTitleSeries="工程技术人员",
+                        ProfessionalTitle="林业技术",
+                        Qualification="工程技术人才_中级工程师",
+                        Level="中级",
+                        QualificationTime=new DateTime(2018,12,30),
+                        IssueTime=new DateTime(2019,5,1),
+                        ReviewOrganization="遵义市工程技术职务中级评审委员会",
+                        IssuingAuthority="遵义市人力资源和社会保障局",
+                        DeclarationUnit="北京森旺林业工程设计有限公司遵义分公司"
+                    },
+                    new Certificate{
+                        Name="王思雨",
+                        IdNumber="522127199201074525",
+                        CertificateNumber="黔特中1910992980217",
+                        ProfessionalTitleSeries="工程技术人员",
+                        ProfessionalTitle="林业技术",
+                        Qualification="工程技术人才_中级工程师",
+                        Level="中级",
+                        QualificationTime=new DateTime(2018,12,30),
+                        IssueTime=new DateTime(2019,5,1),
+                        ReviewOrganization="遵义市工程技术职务中级评审委员会",
+                        IssuingAuthority="遵义市人力资源和社会保障局",
+                        DeclarationUnit="北京森旺林业工程设计有限公司遵义分公司"
+                    },
+                    new Certificate{
+                        Name="王守琴",
+                        IdNumber="522128199003123564",
+                        CertificateNumber="黔特中1810992980865",
+                        ProfessionalTitleSeries="工程技术人员",
+                        ProfessionalTitle="林业技术",
+                        Qualification="工程技术人才_中级工程师",
+                        Level="中级",
+                        QualificationTime=new DateTime(2018,12,30),
+                        IssueTime=new DateTime(2019,5,1),
+                        ReviewOrganization="遵义市工程技术职务中级评审委员会",
+                        IssuingAuthority="遵义市人力资源和社会保障局",
+                        DeclarationUnit="北京森旺林业工程设计有限公司遵义分公司"
+                    },
+                    new Certificate{
+                        Name="欧阳军",
+                        IdNumber="522127198607130035",
+                        CertificateNumber="黔中201501493",
+                        ProfessionalTitleSeries="工程技术人员",
+                        ProfessionalTitle="林业技术",
+                        Qualification="工程技术人才_中级工程师",
+                        Level="中级",
+                        QualificationTime=new DateTime(2018,12,30),
+                        IssueTime=new DateTime(2019,5,1),
+                        ReviewOrganization="遵义市工程技术职务中级评审委员会",
+                        IssuingAuthority="遵义市人力资源和社会保障局",
+                        DeclarationUnit="北京森旺林业工程设计有限公司遵义分公司"
+                    },
+                    new Certificate{
+                        Name="孙泽娟",
+                        IdNumber="520103198608054828",
+                        CertificateNumber="黔中201501511",
+                        ProfessionalTitleSeries="工程技术人员",
+                        ProfessionalTitle="林业技术",
+                        Qualification="工程技术人才_中级工程师",
+                        Level="中级",
+                        QualificationTime=new DateTime(2016,12,30),
+                        IssueTime=new DateTime(2017,5,1),
+                        ReviewOrganization="遵义市工程技术职务中级评审委员会",
+                        IssuingAuthority="遵义市人力资源和社会保障局",
+                        DeclarationUnit="北京森旺林业工程设计有限公司遵义分公司"
+                    },
+                });
+            });
+        }
+    }
+}

src/PTCMS.API/PTCMS.API/Infrastructure/Utils/Extensions/ServiceExtensions.cs

@@ -1,7 +1,10 @@
 using System.Reflection;
 
+using FreeSql;
+
 using PTCMS.API.Domain.Repositories;
 using PTCMS.API.Infrastructure.Repositories;
+using PTCMS.API.Infrastructure.Utils.Helpers;
 
 namespace PTCMS.API.Infrastructure.Utils.Extensions
 {
@@ -57,6 +60,8 @@ namespace PTCMS.API.Infrastructure.Utils.Extensions
                 Console.WriteLine($"--------------End:{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}--------------");
             };
 
+            fsql.CodeFirst.CodeFirstExt();
+
             services.AddFreeRepository(null, nameof(ServiceExtensions).GetType().Assembly);
             services.AddSingleton<IFreeSql>(fsql);
         }
@@ -70,4 +75,4 @@ namespace PTCMS.API.Infrastructure.Utils.Extensions
             services.AddScoped<ICertificateRepository, CertificateRepository>();
         }
     }
-}
+}

src/PTCMS.API/PTCMS.API/Infrastructure/Utils/AppSettingHelper.cs

@@ -1,4 +1,4 @@
-namespace PTCMS.API.Infrastructure.Utils
+namespace PTCMS.API.Infrastructure.Utils.Helpers
 {
     /// <summary>
     /// 读取配置文件帮助类
@@ -9,7 +9,7 @@
         /// <summary>
         /// 配置文件
         /// </summary>
-        private static IConfiguration? _config;
+        private static IConfiguration _config;
         #endregion
 
         #region 构造函数
@@ -37,7 +37,7 @@
             {
                 if (_config != null && sessions.Any())
                 {
-                    string? str = _config[string.Join(":", sessions)];
+                    string str = _config[string.Join(":", sessions)];
                     if (!string.IsNullOrEmpty(str))
                     {
                         return str;

src/PTCMS.API/PTCMS.API/PTCMS.API.csproj

@@ -16,10 +16,6 @@
       <PackageReference Include="FreeSql.Repository" Version="3.2.800" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Infrastructure\Utils\Helpers\" />
-  </ItemGroup>
-
   <ItemGroup>
     <None Include="..\.editorconfig" Link=".editorconfig" />
   </ItemGroup>

src/PTCMS.API/PTCMS.API/Program.cs

@@ -1,5 +1,6 @@
 using PTCMS.API.Infrastructure.Utils;
 using PTCMS.API.Infrastructure.Utils.Extensions;
+using PTCMS.API.Infrastructure.Utils.Helpers;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -27,4 +28,4 @@ app.UseAuthorization();
 
 app.MapControllers();
 
-app.Run();
+app.Run();