From 0b5e5dc35223251da44ee912d819a0180c7d0f54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Tue, 20 Sep 2022 21:17:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E4=B8=8D=E7=94=9F=E6=88=90=E4=BB=93=E5=82=A8=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/CodeGenTemplate/TplService.txt    | 20 +++++--------------
 ZR.CodeGenerator/CodeGeneratorTool.cs         |  5 ++++-
 ZR.Model/System/Generate/GenTable.cs          | 10 +++++++---
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt
index ce428f3..6d7e919 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt
@@ -1,7 +1,4 @@
-using System;
-using SqlSugar;
-using System.Collections.Generic;
-using Infrastructure;
+using SqlSugar;
 using Infrastructure.Attribute;
 using ${options.ModelsNamespace};
 using ${options.ModelsNamespace}.Dto;
@@ -20,12 +17,6 @@ namespace ${options.ServicesNamespace}.${options.SubNamespace}
     [AppService(ServiceType = typeof(I${replaceDto.ModelTypeName}Service), ServiceLifetime = LifeTime.Transient)]
     public class ${replaceDto.ModelTypeName}Service : BaseService<${replaceDto.ModelTypeName}>, I${replaceDto.ModelTypeName}Service
     {
-        private readonly ${replaceDto.ModelTypeName}Repository _${replaceDto.ModelTypeName}Repository;
-        public ${replaceDto.ModelTypeName}Service(${replaceDto.ModelTypeName}Repository repository)
-        {
-            _${replaceDto.ModelTypeName}Repository = repository;
-        }
-
         #region 业务逻辑代码
 
         /// <summary>
@@ -51,8 +42,7 @@ $elseif(column.CsharpType == "int" || column.CsharpType == "long")
 $end
 $end
 $end
-            var response = _${replaceDto.ModelTypeName}Repository
-                .Queryable()
+            var response = Queryable()
 $if(null != genTable.SubTableName && "" != genTable.SubTableName)
                 .Includes(it => it.${genTable.SubTable.ClassName}.MappingField(z => z.${genTable.SubTableFkName}, () => it.${replaceDto.PKName}))
 $end
@@ -87,7 +77,7 @@ $end
 $end
 $end
 
-            var response = _${replaceDto.ModelTypeName}Repository.Queryable().Where(predicate.ToExpression())
+            var response = Queryable().Where(predicate.ToExpression())
                 .ToTree(it => it.Children, it => it.${genTable.Options.TreeParentCode}, 0);
 
             return response;
@@ -100,7 +90,7 @@ $end
         /// <returns></returns>
         public int Add${replaceDto.ModelTypeName}(${replaceDto.ModelTypeName} parm)
         {
-            var response = _${replaceDto.ModelTypeName}Repository.Insert(parm, it => new
+            var response = Insert(parm, it => new
             {
 ${foreach(item in genTable.Columns)}
 $if((item.IsInsert))
@@ -118,7 +108,7 @@ ${end}
         /// <returns></returns>
         public int Update${replaceDto.ModelTypeName}(${replaceDto.ModelTypeName} parm)
         {
-            var response = _${replaceDto.ModelTypeName}Repository.Update(w => w.${replaceDto.PKName} == parm.${replaceDto.PKName}, it => new ${replaceDto.ModelTypeName}()
+            var response = Update(w => w.${replaceDto.PKName} == parm.${replaceDto.PKName}, it => new ${replaceDto.ModelTypeName}()
             {
 $foreach(item in genTable.Columns)
 $if((item.IsEdit))
diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs
index 30a4a4d..6cb7364 100644
--- a/ZR.CodeGenerator/CodeGeneratorTool.cs
+++ b/ZR.CodeGenerator/CodeGeneratorTool.cs
@@ -83,7 +83,6 @@ namespace ZR.CodeGenerator
             InitJntTemplate(dto, replaceDto);
 
             GenerateModels(replaceDto, dto);
-            GenerateRepository(replaceDto, dto);
             GenerateService(replaceDto, dto);
             GenerateControllers(replaceDto, dto);
             if (dto.VueVersion == 3)
@@ -98,6 +97,10 @@ namespace ZR.CodeGenerator
 
                 GenerateVueViews(replaceDto, dto);
             }
+            if (dto.GenTable.Options.GenerateRepo == 1)
+            {
+                GenerateRepository(replaceDto, dto);
+            }
             GenerateVueJs(replaceDto, dto);
             GenerateSql(replaceDto, dto);
 
diff --git a/ZR.Model/System/Generate/GenTable.cs b/ZR.Model/System/Generate/GenTable.cs
index ab012da..c4ad3d4 100644
--- a/ZR.Model/System/Generate/GenTable.cs
+++ b/ZR.Model/System/Generate/GenTable.cs
@@ -74,7 +74,7 @@ namespace ZR.Model.System.Generate
         /// </summary>
         [SqlSugar.SugarColumn(IsJson = true, ColumnDataType = "nvarchar(4000)")]
         public Options Options { get; set; }
-        
+
         #region 表额外字段
         /** 表列信息 */
         [SqlSugar.SugarColumn(IsIgnore = true)]
@@ -88,7 +88,7 @@ namespace ZR.Model.System.Generate
         #endregion
     }
 
-    public class Options 
+    public class Options
     {
         public long ParentMenuId { get; set; } = 0;
         public string SortType { get; set; } = "asc";
@@ -96,7 +96,7 @@ namespace ZR.Model.System.Generate
         public string TreeCode { get; set; } = string.Empty;
         public string TreeName { get; set; } = string.Empty;
         public string TreeParentCode { get; set; } = string.Empty;
-        public string PermissionPrefix { get; set; }= string.Empty;
+        public string PermissionPrefix { get; set; } = string.Empty;
         /// <summary>
         /// 额外参数字符串
         /// </summary>
@@ -105,5 +105,9 @@ namespace ZR.Model.System.Generate
         /// 列大小 12,24
         /// </summary>
         public int ColNum { get; set; } = 12;
+        /// <summary>
+        /// 是否生成仓储层
+        /// </summary>
+        public int GenerateRepo { get; set; }
     }
 }