From e8812787adfbd146e64cc83fa9402db81774b713 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: Mon, 20 Nov 2023 17:46:44 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B9=E6=B3=95=E6=96=B0=E5=A2=9E=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E7=94=9F=E6=88=90=E9=9B=AA=E8=8A=B1id=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/CodeGenTemplate/TplControllers.txt            | 2 +-
 ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt    | 7 ++++++-
 ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt        | 8 +++++---
 ZR.CodeGenerator/CodeGeneratorTool.cs                     | 3 ++-
 ZR.CodeGenerator/Model/ReplaceDto.cs                      | 6 +++++-
 ZR.ServiceCore/Model/Generate/GenTable.cs                 | 4 ++++
 6 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt
index fec4063..902db54 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt
@@ -66,7 +66,7 @@ $end
         {
             var response = _${replaceDto.ModelTypeName}Service.GetInfo(${replaceDto.PKName});
             
-            var info = response.Adapt<${replaceDto.ModelTypeName}>();
+            var info = response.Adapt<${replaceDto.ModelTypeName}Dto>();
             return SUCCESS(info);
         }
 
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt
index f8d525e..8cd6983 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt
@@ -117,7 +117,12 @@ $end
 $if(null != genTable.SubTableName && "" != genTable.SubTableName)
             return Context.InsertNav(model).Include(s1 => s1.${genTable.SubTable.ClassName}Nav).ExecuteReturnEntity();
 $else
-            return Context.Insertable(model).ExecuteReturnEntity();
+$if(replaceDto.useSnowflakeId)
+            model.${replaceDto.PKName} = Insertable(model).ExecuteReturnSnowflakeId();
+            return model;
+$else
+            return Insertable(model).ExecuteReturnEntity();
+$end
 $end
         }
 
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
index 702c64b..38b0979 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
@@ -267,7 +267,7 @@ $if(column.CsharpType == "int" || column.CsharpType == "long")
 $end
 
 $if(column.IsPK || column.IsIncrement)
-$if(column.IsPK && column.IsIncrement == false)
+$if(column.IsPK && column.IsIncrement == false && replaceDto.useSnowflakeId == false)
           <el-col :lg="${options.ColNum}">
             <el-form-item label="${labelName}" prop="${columnName}">
               <el-input v-model${number}="form.${columnName}" placeholder="请输入${labelName}" :disabled="opertype != 1"/>
@@ -635,9 +635,11 @@ const state = reactive({
   form: {},
   rules: {
 $foreach(column in genTable.Columns)
-$if(column.IsRequired && column.IsIncrement == false)
+$if(column.IsRequired && column.IsPk && replaceDto.useSnowflakeId)
+    ${column.CsharpFieldFl}: [{ required: true, message: "${column.ColumnComment}不能为空", trigger: $if(column.htmlType == "select")"change"$else"blur"$end }],
+$elseif(column.IsRequired && column.IsIncrement == false)
     ${column.CsharpFieldFl}: [{ required: true, message: "${column.ColumnComment}不能为空", trigger: $if(column.htmlType == "select")"change"$else"blur"$end
-$if(column.CsharpType == "int" || column.CsharpType == "long"), type: "number"$end }],
+    $if(column.CsharpType == "int" || column.CsharpType == "long"), type: "number" $end }],
 $end
 $end
   },
diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs
index feb82b7..8a28cfa 100644
--- a/ZR.CodeGenerator/CodeGeneratorTool.cs
+++ b/ZR.CodeGenerator/CodeGeneratorTool.cs
@@ -53,7 +53,8 @@ namespace ZR.CodeGenerator
                 ShowBtnMultiDel = dto.GenTable.Options.CheckedBtn.Any(f => f == 7),
                 ShowBtnImport = dto.GenTable.Options.CheckedBtn.Any(f => f == 8),
                 ViewFileName = dto.GenTable.BusinessName.FirstUpperCase(),
-                OperBtnStyle = dto.GenTable.Options.OperBtnStyle
+                OperBtnStyle = dto.GenTable.Options.OperBtnStyle,
+                UseSnowflakeId = dto.GenTable.Options.UseSnowflakeId
             };
             var columns = dto.GenTable.Columns;
 
diff --git a/ZR.CodeGenerator/Model/ReplaceDto.cs b/ZR.CodeGenerator/Model/ReplaceDto.cs
index 3719e49..030038e 100644
--- a/ZR.CodeGenerator/Model/ReplaceDto.cs
+++ b/ZR.CodeGenerator/Model/ReplaceDto.cs
@@ -11,7 +11,7 @@ namespace ZR.CodeGenerator.Model
         /// <summary>
         /// 首字母小写主键
         /// </summary>
-        public string FistLowerPk{ get; set; }
+        public string FistLowerPk { get; set; }
         /// <summary>
         /// 主键类型
         /// </summary>
@@ -74,5 +74,9 @@ namespace ZR.CodeGenerator.Model
         /// 操作按钮样式
         /// </summary>
         public int OperBtnStyle { get; set; }
+        /// <summary>
+        /// 是否使用雪花id
+        /// </summary>
+        public bool UseSnowflakeId { get; set; }
     }
 }
diff --git a/ZR.ServiceCore/Model/Generate/GenTable.cs b/ZR.ServiceCore/Model/Generate/GenTable.cs
index 6e3199e..6e2ceaa 100644
--- a/ZR.ServiceCore/Model/Generate/GenTable.cs
+++ b/ZR.ServiceCore/Model/Generate/GenTable.cs
@@ -132,5 +132,9 @@ namespace ZR.Model.System.Generate
         /// 操作按钮样式
         /// </summary>
         public int OperBtnStyle { get; set; } = 1;
+        /// <summary>
+        /// 是否使用雪花id
+        /// </summary>
+        public bool UseSnowflakeId { get; set; } = false;
     }
 }