From f550310b1ebee23c56ccff5495fbb608be9286fa Mon Sep 17 00:00:00 2001
From: izory <791736813@qq.com>
Date: Fri, 10 Sep 2021 18:39:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E7=94=9F?=
=?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Template/ControllersTemplate.txt | 17 +++++---
ZR.CodeGenerator/CodeGeneratorTool.cs | 14 +++----
ZR.Service/IBaseService.cs | 6 +--
ZR.Vue/src/router/index.js | 2 +-
ZRAdmin.xml | 41 +++++++++++++++++++
5 files changed, 63 insertions(+), 17 deletions(-)
diff --git a/ZR.Admin.WebApi/Template/ControllersTemplate.txt b/ZR.Admin.WebApi/Template/ControllersTemplate.txt
index 0c7101c..4aa7fdb 100644
--- a/ZR.Admin.WebApi/Template/ControllersTemplate.txt
+++ b/ZR.Admin.WebApi/Template/ControllersTemplate.txt
@@ -92,16 +92,23 @@ namespace ZRAdmin.Controllers
/// 更新<#=FileName#>
///
///
- [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();
- //addModel.CreateID = User.Identity.Name;
- //TODO 字段映射
- var response = _<#=ServiceName#>.Update(addModel);
+ var updateModel = parm.Adapt<<#=ModelName#>>().ToCreate();
+ //updateModel.CreateID = User.Identity.Name;
+
+ var response = _<#=ServiceName#>.Update(w => w.{primaryKey} == updateModel.{primaryKey}, it => new <#=ModelName#>()
+ {
+ //TODO 字段映射
+ });
return SUCCESS(response);
}
diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs
index 8269080..03470fe 100644
--- a/ZR.CodeGenerator/CodeGeneratorTool.cs
+++ b/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;
}
///
diff --git a/ZR.Service/IBaseService.cs b/ZR.Service/IBaseService.cs
index 72959f0..e77d47b 100644
--- a/ZR.Service/IBaseService.cs
+++ b/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
///
///
///
- PagedInfo GetPages(Expression> where, PagerInfo parm);
+ PagedInfo GetPages(Expression> where, Model.PagerInfo parm);
///
/// 根据条件查询分页
@@ -148,7 +146,7 @@ namespace ZR.Service
///
///
///
- PagedInfo GetPages(Expression> where, PagerInfo parm, Expression> order, string orderEnum = "Asc");
+ PagedInfo GetPages(Expression> where, Model.PagerInfo parm, Expression> order, string orderEnum = "Asc");
///
/// 根据条件查询数据
diff --git a/ZR.Vue/src/router/index.js b/ZR.Vue/src/router/index.js
index d0fd641..cd682e2 100644
--- a/ZR.Vue/src/router/index.js
+++ b/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
},
{
diff --git a/ZRAdmin.xml b/ZRAdmin.xml
index fe02fe5..8b02947 100644
--- a/ZRAdmin.xml
+++ b/ZRAdmin.xml
@@ -920,5 +920,46 @@
+
+
+ 代码自动生成
+
+
+
+
+ 接口
+
+
+
+
+ 查询列表
+
+
+
+
+
+ 查询详情
+
+
+
+
+
+
+ 添加
+
+
+
+
+
+ 更新
+
+
+
+
+
+ 删除
+
+
+