完成Model、Dto的代码生成

ZR.Admin.WebApi/Template/InputDtoTemplate.txt

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using {ModelsNamespace};
+
+namespace {DtosNamespace}
+{
+    /// <summary>
+    /// {TableNameDesc}输入对象模型
+    /// </summary>
+    public class {ModelTypeName}Dto
+    {
+{PropertyName}
+    }
+
+    public class {ModelTypeName}QueryDto: PagerInfo 
+    {
+    
+    
+    }
+}

ZR.Admin.WebApi/Template/ModelTemplate.txt

@@ -9,6 +9,6 @@ namespace {ModelsNamespace}
     [SqlSugar.SugarTable("{TableName}")]
     public class {ModelTypeName}
     {
-{ModelContent}
+{PropertyName}
     }
 }

ZR.Admin.WebApi/ZR.Admin.WebApi.csproj

@@ -57,6 +57,9 @@
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>Controller.cs</LastGenOutput>
     </None>
+    <None Update="Template\InputDtoTemplate.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Update="Template\ModelTemplate.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

ZR.CodeGenerator/CodeGeneratorTool.cs

@@ -39,7 +39,7 @@ namespace ZR.CodeGenerator
         public static void Generate(string dbName, string baseNamespace, DbTableInfo dbTableInfo, string replaceTableNameStr, bool ifExsitedCovered = false)
         {
             _option.BaseNamespace = baseNamespace;
-            _option.DtosNamespace = baseNamespace + "ZR.Model.Dto";
+            _option.DtosNamespace = baseNamespace + "ZR.Model";
             _option.ModelsNamespace = baseNamespace + "ZR.Model";
             //_option.IRepositoriesNamespace = baseNamespace + ".IRepositorie";
             _option.RepositoriesNamespace = baseNamespace + "ZR.Repository";
@@ -86,14 +86,8 @@ namespace ZR.CodeGenerator
         public static void GenerateSingle(List<DbColumnInfo> listField, DbTableInfo tableInfo, bool ifExsitedCovered = false)
         {
             var modelsNamespace = _option.ModelsNamespace;
-            var modelTypeName = tableInfo.Name;//表名
+            var modelTypeName = GetModelName(tableInfo.Name); ;//表名
             var modelTypeDesc = tableInfo.Description;//表描述
-            if (!string.IsNullOrEmpty(_option.ReplaceTableNameStr))
-            {
-                modelTypeName = modelTypeName.Replace(_option.ReplaceTableNameStr.ToString(), "");
-            }
-            modelTypeName = modelTypeName.Replace("_", "");
-            modelTypeName = modelTypeName.Substring(0, 1).ToUpper() + modelTypeName.Substring(1);
 
             string keyTypeName = "string";//主键数据类型
             string modelcontent = "";//数据库模型字段
@@ -121,34 +115,6 @@ namespace ZR.CodeGenerator
                 }
                 modelcontent += $"        public {TableMappingHelper.GetPropertyDatatype(dbFieldInfo.DataType)} {columnName} {{ get; set; }}\n\r";
 
-                //主键
-                //if (dbFieldInfo.IsIdentity)
-                //{
-                    //keyTypeName = dbFieldInfo.DataType;
-                    //outputDtocontent += "        /// <summary>\n";
-                    //outputDtocontent += string.Format("        /// 设置或获取{0}\n", dbFieldInfo.ColumnDescription);
-                    //outputDtocontent += "        /// </summary>\n";
-
-                    //outputDtocontent += string.Format("        [SqlSugar.SugarColumn(IsIdentity = true, IsPrimaryKey = true)]\n");
-                    //outputDtocontent += string.Format("        public {0} {1}", TableMappingHelper.GetPropertyDatatype(dbFieldInfo.DataType), columnName);
-                    //outputDtocontent += " { get; set; }\n\r";
-                //}
-               // else //非主键
-                //{
-                    //modelcontent += "        /// <summary>\n";
-                    //modelcontent += string.Format("        /// 设置或获取{0}\n", dbFieldInfo.ColumnDescription);
-                    //modelcontent += "        /// </summary>\n";
-                    ////if (dbFieldInfo.DataType == "string")
-                    ////{
-                    ////    modelcontent += string.Format("        [MaxLength({0})]\n", dbFieldInfo.FieldMaxLength);
-                    ////}
-                    //modelcontent += string.Format("        public {0} {1}", TableMappingHelper.GetPropertyDatatype(dbFieldInfo.DataType), columnName);
-                    //modelcontent += " { get; set; }\n\r";
-
-
-                    //outputDtocontent += "        /// <summary>\n";
-                    //outputDtocontent += string.Format("        /// 设置或获取{0}\n", dbFieldInfo.ColumnDescription);
-                    //outputDtocontent += "        /// </summary>\n";
                 //if (dbFieldInfo.DataType == "string")
                 //{
                 //    outputDtocontent += string.Format("        [MaxLength({0})]\n", dbFieldInfo.FieldMaxLength);
@@ -196,29 +162,28 @@ namespace ZR.CodeGenerator
                 //    vueViewEditFromRuleContent += "},\n          { min: 2, max: 50, message: \"长度在 2 到 50 个字符\", trigger:\"blur\" }\n";
                 //    vueViewEditFromRuleContent += "        ],\n";
                 //}
-                }
+
 
                 //if (!inputDtoNoField.Contains(columnName) || columnName == "Id")
                 //{
-                //    InputDtocontent += "        /// <summary>\n";
+                InputDtocontent += "        /// <summary>\n";
-                //    InputDtocontent += string.Format("        /// 设置或获取{0}\n", dbFieldInfo.ColumnDescription);
+                InputDtocontent += string.Format("        /// 设置或获取{0}\n", dbFieldInfo.ColumnDescription);
-                //    InputDtocontent += "        /// </summary>\n";
+                InputDtocontent += "        /// </summary>\n";
-                //    //if (dbFieldInfo.FieldType == "string")
+                //if (dbFieldInfo.FieldType == "string")
-                //    //{
+                //{
-                //    //    InputDtocontent += string.Format("        [MaxLength({0})]\n", dbFieldInfo.FieldMaxLength);
+                //    InputDtocontent += string.Format("        [MaxLength({0})]\n", dbFieldInfo.FieldMaxLength);
-                //    //}
+                //}
-                //    InputDtocontent += string.Format("        public {0} {1}", dbFieldInfo.DataType, columnName);
+                InputDtocontent += $"        public {TableMappingHelper.GetPropertyDatatype(dbFieldInfo.DataType)} {columnName} {{ get; set; }}\n\r";
-                //    InputDtocontent += " { get; set; }\n\r";
                 //}
                 //
-            //}
+            }
             GenerateModels(modelsNamespace, modelTypeName, tableInfo.Name, modelcontent, modelTypeDesc, keyTypeName, ifExsitedCovered);
+            GenerateInputDto(modelsNamespace, modelTypeName, modelTypeDesc, InputDtocontent, keyTypeName, ifExsitedCovered);
             //GenerateIRepository(modelTypeName, modelTypeDesc, keyTypeName, ifExsitedCovered);
             //GenerateRepository(modelTypeName, modelTypeDesc, tableInfo.TableName, keyTypeName, ifExsitedCovered);
             //GenerateIService(modelsNamespace, modelTypeName, modelTypeDesc, keyTypeName, ifExsitedCovered);
             //GenerateService(modelsNamespace, modelTypeName, modelTypeDesc, keyTypeName, ifExsitedCovered);
             //GenerateOutputDto(modelTypeName, modelTypeDesc, outputDtocontent, ifExsitedCovered);
-            //GenerateInputDto(modelsNamespace, modelTypeName, modelTypeDesc, InputDtocontent, keyTypeName, ifExsitedCovered);
             //GenerateControllers(modelTypeName, modelTypeDesc, keyTypeName, ifExsitedCovered);
             //GenerateVueViews(modelTypeName, modelTypeDesc, vueViewListContent, vueViewFromContent, vueViewEditFromContent, vueViewEditFromBindContent, vueViewSaveBindContent, vueViewEditFromRuleContent, ifExsitedCovered);
         }
@@ -238,13 +203,15 @@ namespace ZR.CodeGenerator
         /// <param name="ifExsitedCovered">如果目标文件存在，是否覆盖。默认为false</param>
         private static void GenerateModels(string modelsNamespace, string modelTypeName, string tableName, string modelContent, string modelTypeDesc, string keyTypeName, bool ifExsitedCovered = false)
         {
-            var parentPath = "..\\";
+            var parentPath = "..";
-            var servicesPath = parentPath + _option.BaseNamespace + "\\" + modelsNamespace;
+            //../ZR.Model
+            var servicesPath = parentPath + "\\" + _option.BaseNamespace + "\\" + modelsNamespace;
             if (!Directory.Exists(servicesPath))
             {
-                servicesPath = parentPath + _option.ModelsNamespace;
+                //servicesPath = parentPath + "\\" + _option.ModelsNamespace;
                 Directory.CreateDirectory(servicesPath);
             }
+            // ../ZR.Model/Models/User.cs
             var fullPath = servicesPath + "\\Models\\" + modelTypeName + ".cs";
             if (File.Exists(fullPath) && !ifExsitedCovered)
                 return;
@@ -254,14 +221,59 @@ namespace ZR.CodeGenerator
                 .Replace("{ModelTypeName}", modelTypeName)
                 .Replace("{TableNameDesc}", modelTypeDesc)
                 .Replace("{KeyTypeName}", keyTypeName)
-                .Replace("{ModelContent}", modelContent)
+                .Replace("{PropertyName}", modelContent)
                 .Replace("{TableName}", tableName);
             WriteAndSave(fullPath, content);
         }
+
+
+        /// <summary>
+        /// 生成InputDto文件
+        /// </summary>
+        /// <param name="modelsNamespace"></param>
+        /// <param name="modelTypeName"></param>
+        /// <param name="modelTypeDesc"></param>
+        /// <param name="modelContent"></param>
+        /// <param name="keyTypeName"></param>
+        /// <param name="ifExsitedCovered">如果目标文件存在，是否覆盖。默认为false</param>
+        private static void GenerateInputDto(string modelsNamespace, string modelTypeName, string modelTypeDesc, string modelContent, string keyTypeName, bool ifExsitedCovered = false)
+        {
+            var parentPath = "..";
+            var servicesPath = parentPath + "\\" + _option.BaseNamespace + "\\" + modelsNamespace;
+            if (!Directory.Exists(servicesPath))
+            {
+                //servicesPath = parentPath + "\\" + _option.BaseNamespace + "\\Dtos";
+                Directory.CreateDirectory(servicesPath);
+            }
+            // ../ZR.Model/Dto/User.cs
+            var fullPath = servicesPath + "\\Dto\\" + modelTypeName + "Dto.cs";
+            if (File.Exists(fullPath) && !ifExsitedCovered)
+                return;
+            var content = ReadTemplate("InputDtoTemplate.txt");
+            content = content
+                .Replace("{DtosNamespace}", _option.DtosNamespace)
+                .Replace("{ModelsNamespace}", modelsNamespace)
+                .Replace("{TableNameDesc}", modelTypeDesc)
+                .Replace("{KeyTypeName}", keyTypeName)
+                .Replace("{PropertyName}", modelContent)
+                .Replace("{ModelTypeName}", modelTypeName);
+            WriteAndSave(fullPath, content);
+        }
         #endregion
 
         #region 帮助方法
 
+        private static string GetModelName(string modelTypeName)
+        {
+            if (!string.IsNullOrEmpty(_option.ReplaceTableNameStr))
+            {
+                modelTypeName = modelTypeName.Replace(_option.ReplaceTableNameStr.ToString(), "");
+            }
+            modelTypeName = modelTypeName.Replace("_", "");
+            modelTypeName = modelTypeName.Substring(0, 1).ToUpper() + modelTypeName.Substring(1);
+            return modelTypeName;
+        }
+
         /// <summary>
         /// 从代码模板中读取内容
         /// </summary>