修改代码生成

ZR.Admin.WebApi/Template/ControllersTemplate.txt

@@ -92,16 +92,23 @@ namespace ZRAdmin.Controllers
         /// 更新<#=FileName#>
         /// </summary>
         /// <returns></returns>
-        [HttpPut("edit")]
+        [HttpPut]
         [ActionPermissionFilter(Permission = "<#=Permission#>:update")]
         [Log(Title = "<#=FileName#>修改", BusinessType = BusinessType.UPDATE)]
         public IActionResult Update([FromBody] <#=ModelName#>Dto parm)
         {
+            if (parm == null)
+            {
+                throw new CustomException("请求实体不能为空");
+            }
             //从 Dto 映射到 实体
-            var addModel = parm.Adapt<<#=ModelName#>>().ToCreate();
+            var updateModel = parm.Adapt<<#=ModelName#>>().ToCreate();
-            //addModel.CreateID = User.Identity.Name;
+            //updateModel.CreateID = User.Identity.Name;
+
+            var response = _<#=ServiceName#>.Update(w => w.{primaryKey} == updateModel.{primaryKey}, it => new <#=ModelName#>()
+            {
                 //TODO 字段映射
-            var response = _<#=ServiceName#>.Update(addModel);
+            });
 
             return SUCCESS(response);
         }

ZR.CodeGenerator/CodeGeneratorTool.cs

@@ -91,7 +91,7 @@ namespace ZR.CodeGenerator
                 else
                 {
                     vueViewEditFromContent += $"        {columnName}: undefined,\n";
-                    vueViewEditFromBindContent += $"        {columnName} = row.{columnName}\n";
+                    vueViewEditFromBindContent += $"        {columnName}: row.{columnName},\n";
                 }
                 //vueViewSaveBindContent += string.Format("        '{0}':this.editFrom.{0},\n", columnName);
                 if (dbFieldInfo.IsIdentity || dbFieldInfo.IsPrimarykey)
@@ -107,7 +107,7 @@ namespace ZR.CodeGenerator
             }
             if (dto.genFiles.Contains(1))
             {
-                //GenerateModels(_option.ModelsNamespace, modelTypeName, tableInfo.Name, modelContent, modelTypeDesc, keyTypeName, ifExsitedCovered);
+                GenerateModels(_option.ModelsNamespace, modelTypeName, tableInfo.Name, modelContent, modelTypeDesc, keyTypeName, ifExsitedCovered);
             }
             if (dto.genFiles.Contains(2))
             {
@@ -490,12 +490,11 @@ namespace ZR.CodeGenerator
                 return;
             var content = ReadTemplate("VueTemplate.txt");
             content = content
-                //.Replace("{BaseNamespace}", fileClassName.ToLower())
                 .Replace("{fileClassName}", FirstLowerCase(modelTypeName))
-                .Replace("{ModelTypeNameToLower}", FirstLowerCase(modelTypeName))
                 .Replace("{VueViewListContent}", vueViewListContent)
                 .Replace("{VueViewFromContent}", vueViewFromContent)
-                .Replace("{ModelTypeName}", FirstLowerCase(modelTypeName))
+                .Replace("{ModelTypeName}", modelTypeName)
+                .Replace("{Permission}", modelTypeName.ToLower())
                 .Replace("{VueViewEditFromContent}", vueViewEditFromContent)
                 .Replace("{VueViewEditFromBindContent}", vueViewEditFromBindContent)
                 .Replace("{VueViewSaveBindContent}", vueViewSaveBindContent)
@@ -512,7 +511,8 @@ namespace ZR.CodeGenerator
                 return;
             content = ReadTemplate("VueJsTemplate.txt");
             content = content
-                .Replace("{ModelTypeName}", FirstLowerCase(modelTypeName))
+                .Replace("{ModelTypeName}", modelTypeName)
+                .Replace("{ModelName}", GetModelName(modelTypeName))
                 .Replace("{ModelTypeDesc}", modelTypeDesc);
             //.Replace("{fileClassName}", fileClassName)
             WriteAndSave(fullPath, content);
@@ -535,7 +535,7 @@ namespace ZR.CodeGenerator
                 modelTypeName = modelTypeName.Replace(_option.ReplaceTableNameStr.ToString(), "");
             }
             modelTypeName = modelTypeName.Replace("_", "");
-            modelTypeName = modelTypeName.Substring(0, 1).ToUpper() + modelTypeName.Substring(1);
+            modelTypeName = modelTypeName.Substring(0, 1).ToUpper() + modelTypeName[1..];
             return modelTypeName;
         }
         /// <summary>

ZR.Service/IBaseService.cs

@@ -3,8 +3,6 @@ using SqlSugar;
 using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
-using System.Threading.Tasks;
-using ZR.Model;
 
 namespace ZR.Service
 {
@@ -138,7 +136,7 @@ namespace ZR.Service
         /// <param name="where"></param>
         /// <param name="parm"></param>
         /// <returns></returns>
-        PagedInfo<T> GetPages(Expression<Func<T, bool>> where, PagerInfo parm);
+        PagedInfo<T> GetPages(Expression<Func<T, bool>> where, Model.PagerInfo parm);
 
         /// <summary>
         /// 根据条件查询分页
@@ -148,7 +146,7 @@ namespace ZR.Service
         /// <param name="order"></param>
         /// <param name="orderEnum"></param>
         /// <returns></returns>
-        PagedInfo<T> GetPages(Expression<Func<T, bool>> where, PagerInfo parm, Expression<Func<T, object>> order, string orderEnum = "Asc");
+        PagedInfo<T> GetPages(Expression<Func<T, bool>> where, Model.PagerInfo parm, Expression<Func<T, object>> order, string orderEnum = "Asc");
 
         /// <summary>
         /// 根据条件查询数据

ZR.Vue/src/router/index.js

@@ -44,7 +44,7 @@ export const constantRoutes = [
   },
   {
     path: '/demo',
-    component: (resolve) => require(['@/views/demo'], resolve),
+    component: (resolve) => require(['@/views/userInfo/index'], resolve),
     hidden: true
   },
   {

ZRAdmin.xml

@@ -920,5 +920,46 @@
             </summary>
             <param name="services"></param>
         </member>
+        <member name="T:ZRAdmin.Controllers.UserInfoController">
+            <summary>
+            代码自动生成
+            </summary>
+        </member>
+        <member name="F:ZRAdmin.Controllers.UserInfoController._UserInfoService">
+            <summary>
+            接口
+            </summary>
+        </member>
+        <member name="M:ZRAdmin.Controllers.UserInfoController.Query(ZR.Model.Dto.UserInfoQueryDto)">
+            <summary>
+            查询列表
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:ZRAdmin.Controllers.UserInfoController.Get(System.Int32)">
+            <summary>
+            查询详情
+            </summary>
+            <param name="luid"></param>
+            <returns></returns>
+        </member>
+        <member name="M:ZRAdmin.Controllers.UserInfoController.Create(ZR.Model.Dto.UserInfoDto)">
+            <summary>
+            添加
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:ZRAdmin.Controllers.UserInfoController.Update(ZR.Model.Dto.UserInfoDto)">
+            <summary>
+            更新
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:ZRAdmin.Controllers.UserInfoController.Delete(System.Int32)">
+            <summary>
+            删除
+            </summary>
+            <returns></returns>
+        </member>
     </members>
 </doc>