From 0daf61c579df262a70f40be7546d218c07047c16 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 06 5月 2025 06:36:52 +0800
Subject: [PATCH] 222
---
/dev/null | 35 -----------------
Weben_CMS专用代码生成器/Code/Generate/Entity/InputQueryModel_Generate.cs | 2
Weben_CMS专用代码生成器/Code/MainForm.cs | 2
Weben_CMS专用代码生成器/Code/Templete/AppService/IAppService模板.txt | 2
Weben_CMS专用代码生成器/Code/Templete/Entity/ImportModel模板.txt | 2
Weben_CMS专用代码生成器/Code/Templete/AppService/AppService模板.txt | 2
Weben_CMS专用代码生成器/Code/GenerateCode_WeiBen_CMS.csproj | 3 -
Weben_CMS专用代码生成器/Code/Utility/StructStrHelper.cs | 27 ++++++++++++-
Weben_CMS专用代码生成器/Code/Templete/Entity/Dto模板.txt | 5 --
9 files changed, 30 insertions(+), 50 deletions(-)
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Generate/Entity/AddModel_Generate.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Generate/Entity/AddModel_Generate.cs"
deleted file mode 100644
index 87e7f8d..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Generate/Entity/AddModel_Generate.cs"
+++ /dev/null
@@ -1,35 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace GenerateCode_GEBrilliantFactory
-{
- /// <summary>
- /// 鐢熸垚鏂板鍙傛暟瀹炰綋绫�
- /// </summary>
- public class AddModel_Generate : BaseGenerate
- {
- public static string CreateAddModelLText(string addEntityParam,
- string ChinaComment, List<ColumnModel> columnNameList)
- {
- //var str = TextHelper.ReadText(@"Templete\Entity\AddModel妯℃澘.txt");
- var str = TextHelper.ReadText(@"Templete\Entity\InputModel妯℃澘.txt");
- CommonReplace(ref str);
- str = str.Replace("$ChinaComment$", ChinaComment);//涓枃娉ㄩ噴
-
- str = str.Replace("$AddEntityParam$", addEntityParam);
-
- string attrString = "";
-
- List<ColumnModel> newColumnNameList = ListHelper.RemoveIdCreatorModifier(columnNameList);
- for (int i = 0; i < newColumnNameList.Count; ++i)
- {
- // attrString += StructStrHelper.GenerateAttributeForAddModel(newColumnNameList[i]);
- }
- str = str.Replace("$AddAttributes$", attrString);
-
- return str;
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Generate/Entity/InputModel_Generate.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Generate/Entity/InputQueryModel_Generate.cs"
similarity index 96%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Generate/Entity/InputModel_Generate.cs"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Generate/Entity/InputQueryModel_Generate.cs"
index fd3c332..6d6b398 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Generate/Entity/InputModel_Generate.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Generate/Entity/InputQueryModel_Generate.cs"
@@ -11,7 +11,7 @@
/// <summary>
/// 鐢熸垚鏌ヨ瀹炰綋绫�
/// </summary>
- public class InputModel_Generate : BaseGenerate
+ public class InputQueryModel_Generate : BaseGenerate
{
public static string CreateQueryModelLText(GenerateCodeParam param)
{
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/GenerateCode_WeiBen_CMS.csproj" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/GenerateCode_WeiBen_CMS.csproj"
index 4d0bec6..9d31ff0 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/GenerateCode_WeiBen_CMS.csproj"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/GenerateCode_WeiBen_CMS.csproj"
@@ -110,7 +110,6 @@
<Compile Include="Generate\AppService\IAppService_Generate.cs" />
<Compile Include="Generate\BaseGenerate.cs" />
<Compile Include="Generate\Controller\Controller_Generate.cs" />
- <Compile Include="Generate\Entity\AddModel_Generate.cs" />
<Compile Include="Generate\Entity\ImportModel_Generate.cs" />
<Compile Include="Generate\Entity\ExportModel_Generate.cs" />
<Compile Include="Generate\Entity\Dto_Generate.cs" />
@@ -123,7 +122,7 @@
<Compile Include="Generate\Services_InterfaceRealize_Generate.cs" />
<Compile Include="Generate\VUE\VUE_FunConfig_Generate.cs" />
<Compile Include="Generate\Services_Interface_Generate.cs" />
- <Compile Include="Generate\Entity\InputModel_Generate.cs" />
+ <Compile Include="Generate\Entity\InputQueryModel_Generate.cs" />
<Compile Include="Generate\BLL_Generate.cs" />
<Compile Include="Generate\DAL_Generate.cs" />
<Compile Include="Generate\Procedure_Generate.cs" />
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/MainForm.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/MainForm.cs"
index 3ac190e..0c4b085 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/MainForm.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/MainForm.cs"
@@ -191,7 +191,7 @@
#region 瀹炰綋绫�
var entityFilePath = tbPath.Text + @"\server\src\CMS.Plugin." + tb_WCF_NameSpacePath.Text.Trim() + @".Application.Contracts\Dtos\" + tb_EntityName.Text.Trim();
//1銆佺敓鎴� 鍒嗛〉鏌ヨ瀹炰綋 鏂囦欢
- str_generate = InputModel_Generate.CreateQueryModelLText(param);
+ str_generate = InputQueryModel_Generate.CreateQueryModelLText(param);
tf = TextHelper.Export2File_V2(entityFilePath, $"Get{param.EntityName}Input.cs", tableName, str_generate, FileType.InputModel, filePrefixName, entityName, modulelogo);
//2銆佺敓鎴� CreateDto 鏂囦欢
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/AppService/AppService\346\250\241\346\235\277.txt" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/AppService/AppService\346\250\241\346\235\277.txt"
index d0cf6dc..46c7fb2 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/AppService/AppService\346\250\241\346\235\277.txt"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/AppService/AppService\346\250\241\346\235\277.txt"
@@ -1,4 +1,4 @@
-using CMS.Plugin.$NameSpacePath$.Application.Contracts.Dtos.$EntityInstanceName$s;
+using CMS.Plugin.$NameSpacePath$.Application.Contracts.Dtos.$EntityName$;
using CMS.Plugin.$NameSpacePath$.Application.Contracts.Services;
using CMS.Plugin.$NameSpacePath$.Domain.Shared;
using CMS.Plugin.$NameSpacePath$.Domain.Shared.Util;
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/AppService/IAppService\346\250\241\346\235\277.txt" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/AppService/IAppService\346\250\241\346\235\277.txt"
index 44ebadb..d314fbf 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/AppService/IAppService\346\250\241\346\235\277.txt"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/AppService/IAppService\346\250\241\346\235\277.txt"
@@ -1,4 +1,4 @@
-using CMS.Plugin.$NameSpacePath$.Application.Contracts.Dtos.$EntityName$s;
+using CMS.Plugin.$NameSpacePath$.Application.Contracts.Dtos.$EntityName$;
using Volo.Abp.Application.Services;
namespace CMS.Plugin.$NameSpacePath$.Application.Contracts.Services;
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Entity/Dto\346\250\241\346\235\277.txt" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Entity/Dto\346\250\241\346\235\277.txt"
index d32df4c..e0de19a 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Entity/Dto\346\250\241\346\235\277.txt"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Entity/Dto\346\250\241\346\235\277.txt"
@@ -11,11 +11,6 @@
{
$AddAttributesForDto$
- /// <summary>
- /// 并发戳
- /// </summary>
- public string ConcurrencyStamp { get; set; }
-
/// <summary>
/// Gets the export data.
/// </summary>
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Entity/ImportModel\346\250\241\346\235\277.txt" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Entity/ImportModel\346\250\241\346\235\277.txt"
index 9edc11e..ddbe612 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Entity/ImportModel\346\250\241\346\235\277.txt"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Entity/ImportModel\346\250\241\346\235\277.txt"
@@ -22,7 +22,7 @@
/// <summary>
/// $ChinaComment$导入模型
/// </summary>
- public class $EntityName$ImportModel : MaterialExportModel
+ public class $EntityName$ImportModel : $EntityName$ExportModel
{
/// <summary>
/// 行号
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/StructStrHelper.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/StructStrHelper.cs"
index 709c79a..767112b 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/StructStrHelper.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/StructStrHelper.cs"
@@ -248,6 +248,11 @@
attrStr += " public long" + str_NullFlag + attr + " { get; set; }\n";
attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
break;
+ case DataTypeEnum.dt_decimal:
+ if (columnModel.IsNullable) { str_NullFlag = "? "; }
+ attrStr += " public decimal" + str_NullFlag + attr + " { get; set; }\n";
+ attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+ break;
case DataTypeEnum.dt_int:
if (columnModel.IsNullable) { str_NullFlag = "? "; }
var findEnumObj = param.EnumList.Where(x => x.EnumAttrName == attr).FirstOrDefault();
@@ -313,7 +318,7 @@
string attr = columnModel.ColumnName;
string attrStr = "";
- attrStr += $" {attr} = {param.EntityInstanceName}.{attr};\n";
+ attrStr += $" {attr} = {param.EntityInstanceName}.{attr},\n";
return attrStr;
@@ -360,6 +365,7 @@
}
break;
case DataTypeEnum.dt_bigint:
+ case DataTypeEnum.dt_decimal:
if (isHaveMaxLength)
{
attrStr += $" Check.NotNull(input.{attr}, \"{columnModel.Description}\", {columnModel.DataLength});\n";
@@ -428,12 +434,17 @@
case DataTypeEnum.dt_datetime:
case DataTypeEnum.dt_datetime2:
case DataTypeEnum.dt_datetimeoffset:
- attrStr += " public datetime" + str_NullFlag + attr + " { get; set; }\n";
+ attrStr += " public DateTime" + str_NullFlag + attr + " { get; set; }\n";
attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
break;
case DataTypeEnum.dt_bigint:
if (columnModel.IsNullable) { str_NullFlag = "? "; }
attrStr += " public long" + str_NullFlag + attr + " { get; set; }\n";
+ attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+ break;
+ case DataTypeEnum.dt_decimal:
+ if (columnModel.IsNullable) { str_NullFlag = "? "; }
+ attrStr += " public decimal" + str_NullFlag + attr + " { get; set; }\n";
attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
break;
case DataTypeEnum.dt_int:
@@ -466,7 +477,7 @@
attrStr += " /// <summary>\n";
attrStr += " /// " + columnModel.Description + "\n";
attrStr += " /// </summary>\n";
- attrStr += " public string" + str_NullFlag + findEnumObj.EnumTypeDesc + " { get; set; }\n";
+ attrStr += " public string" + str_NullFlag + findEnumObj.EnumTypeDesc + "\n";
attrStr += " { \n";
attrStr += " get \n";
attrStr += " { \n";
@@ -519,6 +530,11 @@
case DataTypeEnum.dt_bigint:
if (columnModel.IsNullable) { str_NullFlag = "? "; }
attrStr += " public long" + str_NullFlag + attr + " { get; set; }\n";
+ attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+ break;
+ case DataTypeEnum.dt_decimal:
+ if (columnModel.IsNullable) { str_NullFlag = "? "; }
+ attrStr += " public decimal" + str_NullFlag + attr + " { get; set; }\n";
attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
break;
case DataTypeEnum.dt_int:
@@ -596,6 +612,10 @@
attrStr += " public long" + str_NullFlag + emptyStr + attr + " { get; set; }\n";
attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
break;
+ case DataTypeEnum.dt_decimal:
+ attrStr += " public decimal" + str_NullFlag + emptyStr + attr + " { get; set; }\n";
+ attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
+ break;
case DataTypeEnum.dt_int:
attrStr += " public int" + str_NullFlag + emptyStr + attr + " { get; set; }\n";
attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
@@ -649,6 +669,7 @@
case DataTypeEnum.dt_datetimeoffset:
return "\n";
case DataTypeEnum.dt_bigint:
+ case DataTypeEnum.dt_decimal:
case DataTypeEnum.dt_int:
case DataTypeEnum.dt_tinyint:
attrStr += " public SearchFilterModeEnum " + attr + highSearchModeSuffix + " { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;\n";
--
Gitblit v1.9.3