diff --git a/ZR.Admin.WebApi/Controllers/business/GendemoController.cs b/ZR.Admin.WebApi/Controllers/business/GendemoController.cs
index 61e4d8c8..33c8a37a 100644
--- a/ZR.Admin.WebApi/Controllers/business/GendemoController.cs
+++ b/ZR.Admin.WebApi/Controllers/business/GendemoController.cs
@@ -14,6 +14,7 @@ using ZR.Service.Business;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Common;
+using Infrastructure.Extensions;
namespace ZR.Admin.WebApi.Controllers
{
@@ -21,11 +22,11 @@ namespace ZR.Admin.WebApi.Controllers
/// 代码生成演示Controller
///
/// @author zr
- /// @date 2021-09-27
+ /// @date 2021-10-10
///
[Verify]
[Route("business/Gendemo")]
- public class GendemoController: BaseController
+ public class GendemoController : BaseController
{
///
/// 代码生成演示接口
@@ -76,7 +77,7 @@ namespace ZR.Admin.WebApi.Controllers
///
[HttpPost]
[ActionPermissionFilter(Permission = "business:gendemo:add")]
- [Log(Title = "{TableDesc}添加", BusinessType = BusinessType.INSERT)]
+ [Log(Title = "代码生成演示添加", BusinessType = BusinessType.INSERT)]
public IActionResult AddGendemo([FromBody] GendemoDto parm)
{
if (parm == null)
@@ -84,11 +85,15 @@ namespace ZR.Admin.WebApi.Controllers
throw new CustomException("请求参数错误");
}
//从 Dto 映射到 实体
- var model = parm.Adapt().ToCreate();
+ var model = parm.Adapt().ToCreate(HttpContext);
return SUCCESS(_GendemoService.Add(model, it => new
{
- it.Name, it.Icon, it.ShowStatus, it.Sex, it.Sort,
+ it.Name,
+ it.Icon,
+ it.ShowStatus,
+ it.Sex,
+ it.Sort,
}));
}
@@ -98,7 +103,7 @@ namespace ZR.Admin.WebApi.Controllers
///
[HttpPut]
[ActionPermissionFilter(Permission = "business:gendemo:update")]
- [Log(Title = "{TableDesc}修改", BusinessType = BusinessType.UPDATE)]
+ [Log(Title = "代码生成演示修改", BusinessType = BusinessType.UPDATE)]
public IActionResult UpdateGendemo([FromBody] GendemoDto parm)
{
if (parm == null)
@@ -106,12 +111,16 @@ namespace ZR.Admin.WebApi.Controllers
throw new CustomException("请求实体不能为空");
}
//从 Dto 映射到 实体
- var model = parm.Adapt().ToUpdate();
+ var model = parm.Adapt().ToUpdate(HttpContext);
var response = _GendemoService.Update(w => w.Id == model.Id, it => new Gendemo()
{
//Update 字段映射
- Name = model.Name, Icon = model.Icon, ShowStatus = model.ShowStatus, Sex = model.Sex, Sort = model.Sort,
+ Name = model.Name,
+ Icon = model.Icon,
+ ShowStatus = model.ShowStatus,
+ Sex = model.Sex,
+ Sort = model.Sort,
});
return SUCCESS(response);
@@ -123,7 +132,7 @@ namespace ZR.Admin.WebApi.Controllers
///
[HttpDelete("{ids}")]
[ActionPermissionFilter(Permission = "business:gendemo:delete")]
- [Log(Title = "{TableDesc}删除", BusinessType = BusinessType.DELETE)]
+ [Log(Title = "代码生成演示删除", BusinessType = BusinessType.DELETE)]
public IActionResult DeleteGendemo(string ids)
{
int[] idsArr = Tools.SpitIntArrary(ids);
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/ControllersTemplate.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/ControllersTemplate.txt
index e4ac42df..97bb3b08 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/ControllersTemplate.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/ControllersTemplate.txt
@@ -77,7 +77,7 @@ namespace {ApiControllerNamespace}.Controllers
///
[HttpPost]
[ActionPermissionFilter(Permission = "{Permission}:add")]
- [Log(Title = "{FunctionName}添加", BusinessType = BusinessType.INSERT)]
+ [Log(Title = "{FunctionName}", BusinessType = BusinessType.INSERT)]
public IActionResult Add{ModelName}([FromBody] {ModelName}Dto parm)
{
if (parm == null)
@@ -89,7 +89,7 @@ namespace {ApiControllerNamespace}.Controllers
return SUCCESS(_{ModelName}Service.Add(model, it => new
{
- {InsertColumn}
+{InsertColumn}
}));
}
@@ -99,7 +99,7 @@ namespace {ApiControllerNamespace}.Controllers
///
[HttpPut]
[ActionPermissionFilter(Permission = "{Permission}:update")]
- [Log(Title = "{FunctionName}修改", BusinessType = BusinessType.UPDATE)]
+ [Log(Title = "{FunctionName}", BusinessType = BusinessType.UPDATE)]
public IActionResult Update{ModelName}([FromBody] {ModelName}Dto parm)
{
if (parm == null)
@@ -112,7 +112,7 @@ namespace {ApiControllerNamespace}.Controllers
var response = _{ModelName}Service.Update(w => w.{PrimaryKey} == model.{PrimaryKey}, it => new {ModelName}()
{
//Update 字段映射
- {UpdateColumn}
+{UpdateColumn}
});
return SUCCESS(response);
@@ -124,7 +124,7 @@ namespace {ApiControllerNamespace}.Controllers
///
[HttpDelete("{ids}")]
[ActionPermissionFilter(Permission = "{Permission}:delete")]
- [Log(Title = "{FunctionName}删除", BusinessType = BusinessType.DELETE)]
+ [Log(Title = "{FunctionName}", BusinessType = BusinessType.DELETE)]
public IActionResult Delete{ModelName}(string ids)
{
int[] idsArr = Tools.SpitIntArrary(ids);
diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs
index dda6f317..55965b5c 100644
--- a/ZR.CodeGenerator/CodeGeneratorTool.cs
+++ b/ZR.CodeGenerator/CodeGeneratorTool.cs
@@ -77,12 +77,12 @@ namespace ZR.CodeGenerator
//编辑字段
if (dbFieldInfo.IsEdit)
{
- replaceDto.UpdateColumn += $"{dbFieldInfo.CsharpField} = model.{dbFieldInfo.CsharpField}, ";
+ replaceDto.UpdateColumn += $" {dbFieldInfo.CsharpField} = model.{dbFieldInfo.CsharpField}, \n";
}
//新增字段
if (dbFieldInfo.IsInsert)
{
- replaceDto.InsertColumn += $"it.{dbFieldInfo.CsharpField}, ";
+ replaceDto.InsertColumn += $" it.{dbFieldInfo.CsharpField}, \n";
}
//TODO 查询
//if (dbFieldInfo.IsQuery)
@@ -309,8 +309,8 @@ namespace ZR.CodeGenerator
.Replace("{ModelName}", replaceDto.ModelTypeName)
.Replace("{Permission}", replaceDto.Permission)
.Replace("{PrimaryKey}", replaceDto.PKName)
- .Replace("{UpdateColumn}", replaceDto.UpdateColumn)
- .Replace("{InsertColumn}", replaceDto.InsertColumn)
+ .Replace("{UpdateColumn}", replaceDto.UpdateColumn.TrimEnd('\n'))
+ .Replace("{InsertColumn}", replaceDto.InsertColumn.TrimEnd('\n'))
.Replace("{ModuleName}", generateDto.GenTable.ModuleName)
.Replace("{PKCsharpType}", replaceDto.PKType)
.Replace("{Author}", replaceDto.Author)
diff --git a/ZR.Vue/src/api/gendemo.js b/ZR.Vue/src/api/gendemo.js
new file mode 100644
index 00000000..394e903a
--- /dev/null
+++ b/ZR.Vue/src/api/gendemo.js
@@ -0,0 +1,59 @@
+import request from '@/utils/request'
+
+/**
+ * 代码生成演示分页查询
+ * @param {查询条件} data
+ */
+export function listGendemo(query) {
+ return request({
+ url: 'business/Gendemo/list',
+ method: 'get',
+ params: query,
+ })
+}
+
+/**
+ * 新增代码生成演示
+ * @param data
+ */
+export function addGendemo(data) {
+ return request({
+ url: 'business/Gendemo',
+ method: 'post',
+ data: data,
+ })
+}
+
+/**
+ * 修改代码生成演示
+ * @param data
+ */
+export function updateGendemo(data) {
+ return request({
+ url: 'business/Gendemo',
+ method: 'PUT',
+ data: data,
+ })
+}
+
+/**
+ * 获取代码生成演示详情
+ * @param {Id} 代码生成演示Id
+ */
+export function getGendemo(id) {
+ return request({
+ url: 'business/Gendemo/' + id,
+ method: 'get'
+ })
+}
+
+/**
+ * 删除
+ * @param {主键} pid
+ */
+export function delGendemo(pid) {
+ return request({
+ url: 'business/Gendemo/' + pid,
+ method: 'delete'
+ })
+}
diff --git a/ZR.Vue/src/settings.js b/ZR.Vue/src/settings.js
index 1a1fb568..897ea5b0 100644
--- a/ZR.Vue/src/settings.js
+++ b/ZR.Vue/src/settings.js
@@ -3,7 +3,7 @@ module.exports = {
/**
* 主题颜色
*/
- theme: '#409EFF',
+ theme: '#13C2C2',
/**
* 侧边栏主题 深色主题theme-dark，浅色主题theme-light
*/
diff --git a/ZR.Vue/src/views/business/gendemo/index.vue b/ZR.Vue/src/views/business/gendemo/index.vue
new file mode 100644
index 00000000..bac7304b
--- /dev/null
+++ b/ZR.Vue/src/views/business/gendemo/index.vue
@@ -0,0 +1,282 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+ 是
+ 否
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+