From 38b161e4d52362081bfe78fb5b51fbf384db7ce2 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 06 5月 2025 07:22:21 +0800
Subject: [PATCH] 222
---
Weben_CMS专用代码生成器/Code/Utility/StructStrHelper.cs | 180 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 176 insertions(+), 4 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/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 a4dcf5a..b05c3d8 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"
@@ -199,6 +199,7 @@
attrStr += " public float" + str_NullFlag + attr + " { get; set; }\n";
break;
case DataTypeEnum.dt_bit:
+ case DataTypeEnum.dt_tinyint:
if (columnModel.IsNullable) { str_NullFlag = "? "; }
attrStr += " public bool" + str_NullFlag + attr + " { get; set; }\n";
break;
@@ -218,7 +219,7 @@
/// </summary>
/// <param name="columnModel"></param>
/// <returns></returns>
- public static string GenerateAttributeForAddModel(ColumnModel columnModel,GenerateCodeParam param)
+ public static string GenerateAttributeForAddModel(ColumnModel columnModel, GenerateCodeParam param)
{
try
{
@@ -248,6 +249,17 @@
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_tinyint:
+ case DataTypeEnum.dt_bit:
+ if (columnModel.IsNullable) { str_NullFlag = "? "; }
+ attrStr += " public bool" + 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();
@@ -268,6 +280,123 @@
break;
}
+ return attrStr;
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+
+ }
+
+ /// <summary>
+ /// 鐢熸垚灞炴�у瓧绗︿覆ForAddModel-鏇存柊瀹炰綋涓撶敤
+ /// </summary>
+ /// <param name="columnModel"></param>
+ /// <returns></returns>
+ public static string GenerateAttributeForUpdateModel(ColumnModel columnModel, GenerateCodeParam param)
+ {
+ try
+ {
+ string attr = columnModel.ColumnName;
+
+ string attrStr = "";
+ attrStr += $" updateObj.{attr} = input.{attr};\n";
+
+
+ return attrStr;
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+
+ }
+
+ /// <summary>
+ /// 鐢熸垚灞炴�у瓧绗︿覆ForAddModel-鏇存柊瀹炰綋涓撶敤(瀵煎叆鏃�)
+ /// </summary>
+ /// <param name="columnModel"></param>
+ /// <returns></returns>
+ public static string GenerateAttributeForUpdateModelByImport(ColumnModel columnModel, GenerateCodeParam param)
+ {
+ try
+ {
+ string attr = columnModel.ColumnName;
+
+ string attrStr = "";
+ attrStr += $" {attr} = {param.EntityInstanceName}.{attr},\n";
+
+
+ return attrStr;
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+
+ }
+
+ /// <summary>
+ /// 鐢熸垚灞炴�у瓧绗︿覆ForAddModel-CheckCreateOrUpdateDtoAsync涓撶敤
+ /// </summary>
+ /// <param name="columnModel"></param>
+ /// <returns></returns>
+ public static string GenerateAttributeForCheckCreateOrUpdateDtoAsync(ColumnModel columnModel, GenerateCodeParam param)
+ {
+ try
+ {
+ string attr = columnModel.ColumnName;
+
+ string attrStr = "";
+ bool isHaveMaxLength = false;
+ if (!string.IsNullOrEmpty(columnModel.DataLength))
+ {
+ isHaveMaxLength = true;
+ }
+ if (columnModel.IsNullable == false)
+ {//蹇呭～
+ DataTypeEnum myDataType = (DataTypeEnum)Enum.Parse(typeof(DataTypeEnum), "dt_" + columnModel.DataType);
+ switch (myDataType)
+ {
+ case DataTypeEnum.dt_datetime:
+ case DataTypeEnum.dt_datetime2:
+ case DataTypeEnum.dt_datetimeoffset:
+ if (isHaveMaxLength)
+ {
+ attrStr += $" Check.NotNull(input.{attr}, \"{columnModel.Description}\", {columnModel.DataLength});\n";
+ }
+ else
+ {
+ attrStr += $" Check.NotNull(input.{attr}, \"{columnModel.Description}\");\n";
+ }
+ break;
+ case DataTypeEnum.dt_bigint:
+ case DataTypeEnum.dt_decimal:
+ case DataTypeEnum.dt_tinyint:
+ case DataTypeEnum.dt_bit:
+ case DataTypeEnum.dt_int:
+ if (isHaveMaxLength)
+ {
+ attrStr += $" Check.NotNull(input.{attr}, \"{columnModel.Description}\", {columnModel.DataLength});\n";
+ }
+ else
+ {
+ attrStr += $" Check.NotNull(input.{attr}, \"{columnModel.Description}\");\n";
+ }
+ break;
+ default:
+ if (isHaveMaxLength)
+ {
+ attrStr += $" Check.NotNullOrWhiteSpace(input.{attr}, \"{columnModel.Description}\", {columnModel.DataLength});\n";
+ }
+ else
+ {
+ attrStr += $" Check.NotNullOrWhiteSpace(input.{attr}, \"{columnModel.Description}\");\n";
+ }
+ break;
+ }
+ }
return attrStr;
}
catch (Exception ex)
@@ -304,12 +433,23 @@
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_tinyint:
+ case DataTypeEnum.dt_bit:
+ if (columnModel.IsNullable) { str_NullFlag = "? "; }
+ attrStr += " public bool" + str_NullFlag + attr + " { get; set; }\n";
attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
break;
case DataTypeEnum.dt_int:
@@ -342,7 +482,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";
@@ -397,6 +537,17 @@
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_tinyint:
+ case DataTypeEnum.dt_bit:
+ if (columnModel.IsNullable) { str_NullFlag = "? "; }
+ attrStr += " public bool" + 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();
@@ -418,7 +569,7 @@
break;
}
-
+
return attrStr;
}
@@ -472,10 +623,15 @@
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";//鏈�鍚庢槸鍔犱竴涓┖鏍�
break;
+ case DataTypeEnum.dt_bit:
case DataTypeEnum.dt_tinyint:
attrStr += " public bool" + str_NullFlag + emptyStr + attr + " { get; set; }\n";
attrStr += "\n";//鏈�鍚庢槸鍔犱竴涓┖鏍�
@@ -525,6 +681,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";
@@ -630,6 +787,7 @@
defaultValue = "getdate()";
break;
case DataTypeEnum.dt_bit:
+ case DataTypeEnum.dt_tinyint:
defaultValue = "0";
break;
default:
@@ -688,6 +846,7 @@
case DataTypeEnum.dt_datetime2:
case DataTypeEnum.dt_datetimeoffset:
case DataTypeEnum.dt_bit:
+ case DataTypeEnum.dt_tinyint:
sql.Append("@" + attrColumnName + " " + columnModel.DataType + " " + fuhao + "\n");
break;
case DataTypeEnum.dt_decimal:
@@ -749,6 +908,7 @@
case DataTypeEnum.dt_datetime2:
case DataTypeEnum.dt_datetimeoffset:
case DataTypeEnum.dt_bit:
+ case DataTypeEnum.dt_tinyint:
sql.Append("@" + attrColumnName + " " + columnModel.DataType + " " + fuhao + "\n");
break;
case DataTypeEnum.dt_decimal:
@@ -809,6 +969,7 @@
case DataTypeEnum.dt_datetime2:
case DataTypeEnum.dt_datetimeoffset:
case DataTypeEnum.dt_bit:
+ case DataTypeEnum.dt_tinyint:
sql.Append("@" + attrColumnName + " " + columnModel.DataType + " " + fuhao);
break;
case DataTypeEnum.dt_decimal:
@@ -934,6 +1095,7 @@
case DataTypeEnum.dt_datetime2:
case DataTypeEnum.dt_datetimeoffset:
case DataTypeEnum.dt_bit:
+ case DataTypeEnum.dt_tinyint:
updateSql = " " + attrColumnName + "= case @" + attrColumnName + " when NULL then " + attrColumnName + " else @" + attrColumnName + " end ";
break;
default:
@@ -1095,6 +1257,7 @@
str += "SqlDbType.Float," + columnModel.DataLength.ToString();
break;
case DataTypeEnum.dt_bit:
+ case DataTypeEnum.dt_tinyint:
str += "SqlDbType.Bit," + columnModel.DataLength.ToString();
break;
}
@@ -1165,6 +1328,7 @@
sb.Append("} \n");
break;
case DataTypeEnum.dt_bit:
+ case DataTypeEnum.dt_tinyint:
sb.Append("if (dataRow[\"" + columnModel.ColumnName.ToString() + "\"].ToString() != \"\") \n");
sb.Append("{ \n");
@@ -1415,6 +1579,7 @@
sb.Append(" </el-table-column> \n");
break;
case DataTypeEnum.dt_bit:
+ case DataTypeEnum.dt_tinyint:
sb.Append(" <el-table-column prop=\"" + columnModel.ColumnName + "\" label=\"" + columnModel.Description + "\" align=\"center\" > \n");
sb.Append("<template slot-scope=\"scope\">");
sb.Append("<el-tag :type=\"scope.row." + columnModel.ColumnName + " ? 'danger' : 'success'\"");
@@ -1462,6 +1627,7 @@
switch (enumDT)
{
case DataTypeEnum.dt_bit:
+ case DataTypeEnum.dt_tinyint:
sb.Append(" <el-switch v-model=\"addForm." + columnModel.ColumnName + "\"></el-switch> \n");
break;
case DataTypeEnum.dt_datetime:
@@ -1509,6 +1675,7 @@
switch (enumDT)
{
case DataTypeEnum.dt_bit:
+ case DataTypeEnum.dt_tinyint:
sb.Append(" <el-switch v-model=\"viewDetailForm." + columnModel.ColumnName + "\"></el-switch> \n");
break;
case DataTypeEnum.dt_datetime:
@@ -1566,6 +1733,7 @@
elment = "el-date-picker";
break;
case DataTypeEnum.dt_bit:
+ case DataTypeEnum.dt_tinyint:
elment = "el-select";
break;
default:
@@ -1590,6 +1758,7 @@
switch (enumDT)
{
case DataTypeEnum.dt_bit:
+ case DataTypeEnum.dt_tinyint:
sb.Append(" options: [{label: '鏄�',value: 'true'}, {label: '鍚�',value: 'false'}] \n");
break;
default:
@@ -1702,6 +1871,7 @@
sb.Append("<el-input v-model=\"serachObj." + columnModel.ColumnName + "\" placeholder=\"璇疯緭鍏�" + columnModel.Description + "\"></el-input> \n");
break;
case DataTypeEnum.dt_bit:
+ case DataTypeEnum.dt_tinyint:
sb.Append("<el-checkbox-group v-model=\"ck_delflag\" @change=\"ckDelFlag\">\n");
sb.Append(" <el-checkbox-button label=\"鍚敤\" name=\"ck_delflag\"></el-checkbox-button>\n");
sb.Append(" <el-checkbox-button label=\"绂佺敤\" name=\"ck_delflag\"></el-checkbox-button>\n");
@@ -1747,6 +1917,7 @@
switch (enumDT)
{
case DataTypeEnum.dt_bit:
+ case DataTypeEnum.dt_tinyint:
case DataTypeEnum.dt_datetime:
case DataTypeEnum.dt_datetime2:
case DataTypeEnum.dt_datetimeoffset:
@@ -1812,6 +1983,7 @@
sb.Append(" } \n");
break;
case DataTypeEnum.dt_bit:
+ case DataTypeEnum.dt_tinyint:
sb.Append(" if (!string.IsNullOrEmpty(queryModel." + columnModel.ColumnName + ")) \n");
sb.Append(" { \n");
sb.Append(" strWhere += \" AND $TableAlias$." + columnModel.ColumnName + " = '\" + queryModel." + columnModel.ColumnName + " + \"'\"; \n");
--
Gitblit v1.9.3