升级脚手架，支持生成插件Postgis

lianggx · lianggx · commit c4cae3b364cc · 2019-08-28T15:06:49.000+08:00
diff --git a/.vs/MyStaging/v15/.suo b/.vs/MyStaging/v15/.suo
diff --git a/MyStaging.App/DAL/EnumsDal.cs b/MyStaging.App/DAL/EnumsDal.cs
@@ -9,16 +9,21 @@ namespace MyStaging.App.DAL
 {
     public class EnumsDal
     {
-        private static string projectName = string.Empty;
-        private static string modelPath = string.Empty;
-        private static string rootPath = string.Empty;
+        private string projectName = string.Empty;
+        private string modelPath = string.Empty;
+        private string rootPath = string.Empty;
+        private List<PluginsViewModel> plugins;
 
-        public static void Generate(string rootpath, string modelpath, string projName)
+        public EnumsDal(string rootpath, string modelpath, string projName, List<PluginsViewModel> plugins)
         {
-            rootPath = rootpath;
-            modelPath = modelpath;
-            projectName = projName;
+            this.rootPath = rootpath;
+            this.modelPath = modelpath;
+            this.projectName = projName;
+            this.plugins = plugins;
+        }
 
+        public void Generate()
+        {
             string _sqltext = @"
 select a.oid,a.typname,b.nspname from pg_type a 
 INNER JOIN pg_namespace b on a.typnamespace = b.oid 
@@ -35,7 +40,7 @@ public static void Generate(string rootpath, string modelpath, string projName)
                 });
             }, System.Data.CommandType.Text, _sqltext);
 
-            string _fileName = Path.Combine(modelpath, "_Enums.cs");
+            string _fileName = Path.Combine(modelPath, "_Enums.cs");
             using (StreamWriter writer = new StreamWriter(File.Create(_fileName), System.Text.Encoding.UTF8))
             {
                 writer.WriteLine("using System;");
@@ -62,7 +67,7 @@ public static void Generate(string rootpath, string modelpath, string projName)
             GenerateMapping(list);
         }
 
-        public static void GenerateMapping(List<EnumTypeInfo> list)
+        public void GenerateMapping(List<EnumTypeInfo> list)
         {
             string _fileName = Path.Combine(rootPath, "_startup.cs");
             using (StreamWriter writer = new StreamWriter(File.Create(_fileName), System.Text.Encoding.UTF8))
@@ -90,6 +95,10 @@ public static void GenerateMapping(List<EnumTypeInfo> list)
                     writer.WriteLine("\t\t\tType[] jsonTypes = { typeof(JToken), typeof(JObject), typeof(JArray) };");
                     writer.WriteLine("\t\t\tNpgsqlNameTranslator translator = new NpgsqlNameTranslator();");
                     writer.WriteLine("\t\t\tNpgsqlConnection.GlobalTypeMapper.UseJsonNet(jsonTypes);");
+                    foreach (var item in plugins)
+                    {
+                        writer.WriteLine($"\t\t\t{item.Mapper}");
+                    }
                     foreach (var item in list)
                     {
                         writer.WriteLine($"\t\t\tNpgsqlConnection.GlobalTypeMapper.MapEnum<{item.TypeName.ToUpperPascal()}>(\"{item.NspName}.{item.TypeName}\", translator);");
diff --git a/MyStaging.App/DAL/SchemaDal.cs b/MyStaging.App/DAL/SchemaDal.cs
@@ -1,45 +1,73 @@
-﻿using MyStaging;
+﻿using MyStaging.App.Models;
 using MyStaging.Helpers;
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Text;
 
 namespace MyStaging.App.DAL
 {
     public class SchemaDal
     {
-        /// <summary>
-        ///  generate schema name list
-        /// </summary>
-        /// <returns></returns>
-        public static List<string> Get_List()
+        public SchemaDal()
         {
-            List<string> schemaList = new List<string>();
-            string[] notin = {
-               "'geometry_columns'",
-               "'raster_columns'",
-               "'spatial_ref_sys'",
-               "'raster_overviews'",
-               "'us_gaz'",
-               "'topology'",
-               "'zip_lookup_all'",
-               "'pg_toast'",
-               "'pg_temp_1'",
-               "'pg_toast_temp_1'",
-               "'pg_catalog'",
-               "'information_schema'",
-               "'tiger'",
-               "'tiger_data'"
-            };
-            string sql = $@"SELECT schema_name FROM information_schema.schemata WHERE SCHEMA_NAME NOT IN({string.Join(",", notin)}) ORDER BY SCHEMA_NAME; ";
+            Filters.AddRange(new string[]{
+               "geometry_columns",
+               "raster_columns",
+               "spatial_ref_sys",
+               "raster_overviews",
+               "us_gaz",
+               "topology",
+               "zip_lookup_all",
+               "pg_toast",
+               "pg_temp_1",
+               "pg_toast_temp_1",
+               "pg_catalog",
+               "information_schema",
+               "tiger",
+               "tiger_data"
+            });
+        }
+
+        public List<string> Filters { get; set; } = new List<string>();
+
+        public List<SchemaViewModel> List()
+        {
+            string[] filters = new string[this.Filters.Count];
+            for (int i = 0; i < Filters.Count; i++)
+            {
+                filters[i] = $"'{Filters[i]}'";
+            }
+
+            List<SchemaViewModel> schemas = new List<SchemaViewModel>();
+            string sql = $@"SELECT schema_name FROM information_schema.schemata WHERE SCHEMA_NAME NOT IN({string.Join(",", filters)}) ORDER BY SCHEMA_NAME; ";
             PgSqlHelper.ExecuteDataReader(dr =>
             {
-                schemaList.Add(dr[0].ToString());
+                var schema = new SchemaViewModel { Name = dr[0].ToString() };
+                schemas.Add(schema);
             }, CommandType.Text, sql);
 
+            foreach (var item in schemas)
+            {
+                Console.WriteLine("正在生成模式：{0}", item.Name);
+                item.Tables = GetTables(item.Name);
+            }
+
+            return schemas;
+        }
+
+        private List<TableViewModel> GetTables(string schema)
+        {
+            string _sqltext = $@"SELECT table_name,'table' as type FROM INFORMATION_SCHEMA.tables WHERE table_schema='{schema}' AND table_type='BASE TABLE'
+UNION ALL
+SELECT table_name,'view' as type FROM INFORMATION_SCHEMA.views WHERE table_schema = '{schema}'";
+            List<TableViewModel> tableList = new List<TableViewModel>();
+            PgSqlHelper.ExecuteDataReader(dr =>
+            {
+                TableViewModel model = new TableViewModel() { Name = dr["table_name"].ToString(), Type = dr["type"].ToString() };
+                tableList.Add(model);
+            }, CommandType.Text, _sqltext);
 
-            return schemaList;
+            return tableList;
         }
     }
 }
diff --git a/MyStaging.App/GeneralFactory.cs b/MyStaging.App/GeneralFactory.cs
@@ -1,47 +1,83 @@
 ﻿using MyStaging.App.DAL;
 using MyStaging.App.Models;
-using MyStaging.Helpers;
 using System;
 using System.Collections.Generic;
-using System.Data;
 using System.IO;
+using System.Linq;
 
 namespace MyStaging.App
 {
     public class GeneralFactory
     {
-        private static string schemaPath = string.Empty;
-        private static string modelPath = string.Empty;
-        private static string dalPath = string.Empty;
-        private static string projectName = string.Empty;
-        private static string outputDir = string.Empty;
+        private string schemaPath = string.Empty;
+        private string modelPath = string.Empty;
+        private string dalPath = string.Empty;
+        private string projectName = string.Empty;
+        private string outputDir = string.Empty;
 
-        public static void Build(string outputdir, string projName)
+        public GeneralFactory(string outputdir, string projName)
         {
-            if (string.IsNullOrEmpty(outputdir) || string.IsNullOrEmpty(projName))
-                throw new ArgumentNullException("outputdir 和 projName", "不能为空");
+            if (string.IsNullOrEmpty(outputdir))
+                throw new ArgumentNullException(nameof(outputdir));
+
+            if (string.IsNullOrEmpty(projName))
+                throw new ArgumentNullException(nameof(projName));
+
             outputDir = outputdir;
             projectName = projName;
+        }
+
+        public void Build()
+        {
+            var schemas = new SchemaDal().List();
+            var plugins = FindPlugins(schemas);
 
             CreateDir();
-            CreateCsproj();
-            EnumsDal.Generate(Path.Combine(outputdir, projName + ".db"), modelPath, GeneralFactory.projectName);
+            CreateCsproj(plugins);
+            CreateEnums(plugins);
+            CreateModels(schemas);
+        }
 
-            List<string> schemaList = SchemaDal.Get_List();
-            foreach (var schemaName in schemaList)
+        private List<PluginsViewModel> FindPlugins(List<SchemaViewModel> schemas)
+        {
+            var plugins = new List<PluginsViewModel>();
+            foreach (var item in schemas)
             {
-                Console.WriteLine("正在生成模式：{0}", schemaName);
-                List<TableViewModel> tableList = GetTables(schemaName);
-                foreach (var item in tableList)
+                if (item.Tables.FirstOrDefault(f => f.Name == "geometry_columns") != null)
                 {
-                    Console.WriteLine("{0}:{1}", item.Type, item.Name);
-                    TablesDal td = new TablesDal(GeneralFactory.projectName, modelPath, schemaPath, dalPath, schemaName, item);
+                    plugins.Add(new PluginsViewModel
+                    {
+                        Name = item.Name,
+                        Mapper = "NpgsqlConnection.GlobalTypeMapper.UseLegacyPostgis();",
+                        Package = "<PackageReference Include=\"Npgsql.LegacyPostgis\" Version=\"4.0.9\" />"
+                    });
+                }
+            }
+
+            return plugins;
+        }
+
+        private void CreateModels(List<SchemaViewModel> schemas)
+        {
+            foreach (var item in schemas)
+            {
+                Console.WriteLine("building：{0}", item.Name);
+                foreach (var table in item.Tables)
+                {
+                    Console.WriteLine("{0}:{1}", table.Type, table.Name);
+                    TablesDal td = new TablesDal(projectName, modelPath, schemaPath, dalPath, item.Name, table);
                     td.Create();
                 }
             }
         }
 
-        private static void CreateDir()
+        private void CreateEnums(List<PluginsViewModel> plugins)
+        {
+            var enumsDal = new EnumsDal(Path.Combine(outputDir, projectName + ".db"), modelPath, projectName, plugins);
+            enumsDal.Generate();
+        }
+
+        private void CreateDir()
         {
             modelPath = Path.Combine(outputDir, projectName + ".db", "Model", "Build");
             schemaPath = Path.Combine(outputDir, projectName + ".db", "Model", "Schemas");
@@ -54,10 +90,9 @@ private static void CreateDir()
             }
         }
 
-        private static void CreateCsproj()
+        private void CreateCsproj(List<PluginsViewModel> plugins)
         {
             string path = Path.Combine(outputDir, $"{projectName}.db");
-
             string csproj = Path.Combine(path, $"{projectName}.db.csproj");
             if (File.Exists(csproj))
                 return;
@@ -72,26 +107,14 @@ private static void CreateCsproj()
                 writer.WriteLine("\t</PropertyGroup>");
                 writer.WriteLine();
                 writer.WriteLine("\t<ItemGroup>");
-                writer.WriteLine("\t\t<PackageReference Include=\"MyStaging\" Version=\"1.0.0\" />");
+                writer.WriteLine("\t\t<PackageReference Include=\"MyStaging\" Version=\"2.*\" />");
+                foreach (var item in plugins)
+                {
+                    writer.WriteLine($"\t\t{item.Package}");
+                }
                 writer.WriteLine("\t</ItemGroup>");
                 writer.WriteLine("</Project>");
             }
         }
-
-        private static List<TableViewModel> GetTables(string schema)
-        {
-            string _sqltext = $@"SELECT table_name,'table' as type FROM INFORMATION_SCHEMA.tables WHERE table_schema='{schema}' AND table_type='BASE TABLE'
-UNION ALL
-SELECT table_name,'view' as type FROM INFORMATION_SCHEMA.views WHERE table_schema = '{schema}'";
-            List<TableViewModel> tableList = new List<TableViewModel>();
-            PgSqlHelper.ExecuteDataReader(dr =>
-            {
-                TableViewModel model = new TableViewModel() { Name = dr["table_name"].ToString(), Type = dr["type"].ToString() };
-                tableList.Add(model);
-            }, CommandType.Text, _sqltext);
-
-            return tableList;
-        }
-
     }
 }
diff --git a/MyStaging.App/Models/PluginsViewModel.cs b/MyStaging.App/Models/PluginsViewModel.cs
@@ -0,0 +1,13 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace MyStaging.App.Models
+{
+    public class PluginsViewModel
+    {
+        public string Name { get; set; }
+        public string Mapper { get; set; }
+        public string Package { get; set; }
+    }
+}
diff --git a/MyStaging.App/Models/SchemaViewModel.cs b/MyStaging.App/Models/SchemaViewModel.cs
@@ -0,0 +1,12 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace MyStaging.App.Models
+{
+    public class SchemaViewModel
+    {
+        public string Name { get; set; }
+        public List<TableViewModel> Tables { get; set; }
+    }
+}
diff --git a/MyStaging.App/Program.cs b/MyStaging.App/Program.cs
@@ -46,19 +46,22 @@ static void Main(string[] args)
                 }
                 i++;
             }
-            //outPutPath = @"D:\MyGitHub\mystaging";
-            //projName = "MyStaging.xUnitTest";
+
+            //var outPutPath = @"D:\MyGitHub\mystaging";
+            //var projName = "MyStaging.SuperApp";
             //MyStaging.Common.StagingOptions options = new Common.StagingOptions()
             //{
-            //    ConnectionMaster = "Host=127.0.0.1;Port=5432;Username=postgres;Password=postgres;Database=mystaging;Pooling=true;Maximum Pool Size=100"
+            //    ConnectionMaster = "Host=127.0.0.1;Port=5432;Username=postgres;Password=123456;Database=mystaging;Pooling=true;Maximum Pool Size=10;"
             //};
-            // PgSqlHelper.InitConnection(options);
+            //PgSqlHelper.InitConnection(options);
+
             var options = new Common.StagingOptions()
             {
                 ConnectionMaster = connection.ToString()
             };
             PgSqlHelper.InitConnection(options);
-            GeneralFactory.Build(outPutPath, projName);
+            GeneralFactory factory = new GeneralFactory(outPutPath, projName);
+            factory.Build();
 
             Console.WriteLine("success.....");
         }
diff --git a/MyStaging.sln b/MyStaging.sln
diff --git a/MyStaging.xUnitTest.db/MyStaging.xUnitTest.db.csproj b/MyStaging.xUnitTest.db/MyStaging.xUnitTest.db.csproj
