From 25750ab29ce4e243f4e4e17a796167f3a0f0697b Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周一, 05 5月 2025 16:33:49 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

---
 Weben_CMS专用代码生成器/Code/Generate/Controller/Controller_Generate.cs |   17 +++++------------
 1 files changed, 5 insertions(+), 12 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/Controller/Controller_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/Controller/Controller_Generate.cs"
index 3889b30..99dc295 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/Controller/Controller_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/Controller/Controller_Generate.cs"
@@ -1,5 +1,6 @@
 锘�
 
+using GenerateCode_WeiBen_WMS.Model;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -12,24 +13,16 @@
     /// </summary>
     public class Controller_Generate : BaseGenerate
     {
-        public static string CreateText(string Modulelogo,
-            string ChinaComment, List<ColumnModel> columnNameList, string entityName, string orderByName = "")
+        public static string CreateText(GenerateCodeParam param)
         {
             var str = TextHelper.ReadText(@"Templete\Controller妯℃澘.txt");
             CommonReplace(ref str);
-            str = str.Replace("$ChinaComment$", ChinaComment);//涓枃娉ㄩ噴
-            str = str.Replace("$EntityName$", entityName);
-            str = str.Replace("$Modulelogo$", Modulelogo);//妯″潡绠�鍐�
-            str = str.Replace("$OrderByName$", orderByName == "" ? "Id" : orderByName);//妯″潡绠�鍐�
 
-            str = str.Replace("$ValidateEmptyForInsert$", StructStrHelper.GetValidateEmptyStrForController(columnNameList));
-            str = str.Replace("$ValidateEmptyForUpdate$", StructStrHelper.GetValidateEmptyStrForController(columnNameList, false));
+            CommonReplace(ref str);
 
+            CommonHelper.CommonReplaceStr(param, ref str);
 
-
-            var pageStr = StructStrHelper.GetPageFilterStrForController(columnNameList);
-            str = str.Replace("$PageSearchFilter$", pageStr);
-
+            
             return str;
         }
     }

--
Gitblit v1.9.3