From 5fd4f17be9d7aea2dffba22e5cc96a0f232fb980 Mon Sep 17 00:00:00 2001 From: izory <791736813@qq.com> Date: Fri, 10 Sep 2021 18:06:07 +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=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Template/ControllersTemplate.txt | 6 +- ZR.Admin.WebApi/Template/IServiceTemplate.txt | 5 +- ZR.Admin.WebApi/Template/InputDtoTemplate.txt | 4 +- ZR.Admin.WebApi/Template/ModelTemplate.txt | 2 +- .../Template/RepositoryTemplate.txt | 2 +- ZR.Admin.WebApi/Template/ServiceTemplate.txt | 4 +- ZR.Admin.WebApi/Template/VueJsTemplate.txt | 116 +++++++----------- ZR.Admin.WebApi/Template/VueTemplate.txt | 69 ++++++----- 8 files changed, 95 insertions(+), 113 deletions(-) diff --git a/ZR.Admin.WebApi/Template/ControllersTemplate.txt b/ZR.Admin.WebApi/Template/ControllersTemplate.txt index 2031f4e..0c7101c 100644 --- a/ZR.Admin.WebApi/Template/ControllersTemplate.txt +++ b/ZR.Admin.WebApi/Template/ControllersTemplate.txt @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using ZR.Admin.WebApi.Filters; using ZR.Admin.WebApi.Controllers; -using ZR.Service; +using ZR.Service.Business; using SqlSugar; using Infrastructure; using Infrastructure.Attribute; @@ -12,7 +12,8 @@ using Infrastructure.Enums; using Infrastructure.Model; using Mapster; using ZR.Admin.WebApi.Extensions; -using ZR.Model; +using ZR.Model.Dto; +using ZR.Model.Models; namespace ZRAdmin.Controllers { @@ -59,6 +60,7 @@ namespace ZRAdmin.Controllers /// /// [HttpGet("{{primaryKey}}")] + [ActionPermissionFilter(Permission = "<#=Permission#>:query")] public IActionResult Get({KeyTypeName} {primaryKey}) { var response = _<#=ServiceName#>.GetId({primaryKey}); diff --git a/ZR.Admin.WebApi/Template/IServiceTemplate.txt b/ZR.Admin.WebApi/Template/IServiceTemplate.txt index 7bd979a..2d576c7 100644 --- a/ZR.Admin.WebApi/Template/IServiceTemplate.txt +++ b/ZR.Admin.WebApi/Template/IServiceTemplate.txt @@ -1,8 +1,7 @@ using System; -using ZR.Model.System; -using ZR.Model; +using ZR.Model.Models; -namespace {IServicsNamespace} +namespace {IServicsNamespace}.Business { /// /// 定义{TableNameDesc}服务接口 diff --git a/ZR.Admin.WebApi/Template/InputDtoTemplate.txt b/ZR.Admin.WebApi/Template/InputDtoTemplate.txt index f38f62b..42116c7 100644 --- a/ZR.Admin.WebApi/Template/InputDtoTemplate.txt +++ b/ZR.Admin.WebApi/Template/InputDtoTemplate.txt @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; -using {ModelsNamespace}; +using {ModelsNamespace}.Dto; -namespace {DtosNamespace} +namespace {DtosNamespace}.Dto { /// /// {TableNameDesc}输入对象模型 diff --git a/ZR.Admin.WebApi/Template/ModelTemplate.txt b/ZR.Admin.WebApi/Template/ModelTemplate.txt index 23e36c5..7d9a00a 100644 --- a/ZR.Admin.WebApi/Template/ModelTemplate.txt +++ b/ZR.Admin.WebApi/Template/ModelTemplate.txt @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace {ModelsNamespace} +namespace {ModelsNamespace}.Models { /// /// {TableNameDesc}，数据实体对象 diff --git a/ZR.Admin.WebApi/Template/RepositoryTemplate.txt b/ZR.Admin.WebApi/Template/RepositoryTemplate.txt index 78765e4..df6fa3d 100644 --- a/ZR.Admin.WebApi/Template/RepositoryTemplate.txt +++ b/ZR.Admin.WebApi/Template/RepositoryTemplate.txt @@ -1,7 +1,7 @@ using System; using Infrastructure.Attribute; using {RepositoriesNamespace}.System; -using {ModelsNamespace}; +using {ModelsNamespace}.Models; namespace {RepositoriesNamespace} { diff --git a/ZR.Admin.WebApi/Template/ServiceTemplate.txt b/ZR.Admin.WebApi/Template/ServiceTemplate.txt index de593c9..a47b5a9 100644 --- a/ZR.Admin.WebApi/Template/ServiceTemplate.txt +++ b/ZR.Admin.WebApi/Template/ServiceTemplate.txt @@ -7,11 +7,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using ZR.Common; -using ZR.Model; +using ZR.Model.Models; using ZR.Repository; using ZR.Service.IService; -namespace {ServicesNamespace} +namespace {ServicesNamespace}.Business { /// /// {TableNameDesc}服务接口实现 diff --git a/ZR.Admin.WebApi/Template/VueJsTemplate.txt b/ZR.Admin.WebApi/Template/VueJsTemplate.txt index d882fc9..719dfc7 100644 --- a/ZR.Admin.WebApi/Template/VueJsTemplate.txt +++ b/ZR.Admin.WebApi/Template/VueJsTemplate.txt @@ -1,85 +1,59 @@ -import http from '@/utils/request' -import defaultSettings from '@/settings' +import request from '@/utils/request' /** * {ModelTypeDesc}分页查询 * @param {查询条件} data */ -export function get{ModelTypeName}ListWithPager(data) { - return http.request({ - url: '{ModelTypeName}/FindWithPagerAsync', - method: 'post', - data: data, - baseURL: defaultSettings.api{fileClassName}Url // 直接通过覆盖的方式 - }) -}/** - * 获取所有可用的{ModelTypeDesc} - */ -export function getAll{ModelTypeName}List() { - return http.request({ - url: '{ModelTypeName}/GetAllEnable', +export function list{ModelTypeName}(data) { + return request({ + url: 'bus/{ModelTypeName}/list', method: 'get', - baseURL: defaultSettings.api{fileClassName}Url // 直接通过覆盖的方式 - }) -} -/** - * 新增或修改保存{ModelTypeDesc} - * @param data - */ -export function save{ModelTypeName}(data, url) { - return http.request({ - url: url, - method: 'post', - data: data, - baseURL: defaultSettings.api{fileClassName}Url // 直接通过覆盖的方式 - }) -} -/** - * 获取{ModelTypeDesc}详情 - * @param {Id} {ModelTypeDesc}Id - */ -export function get{ModelTypeName}Detail(id) { - return http({ - url: '{ModelTypeName}/GetById', - method: 'get', - params: { id: id }, - baseURL: defaultSettings.api{fileClassName}Url // 直接通过覆盖的方式 - }) -} -/** - * 批量设置启用状态 - * @param {id集合} ids - */ -export function set{ModelTypeName}Enable(data) { - return http({ - url: '{ModelTypeName}/SetEnabledMarktBatchAsync', - method: 'post', - data: data, - baseURL: defaultSettings.api{fileClassName}Url // 直接通过覆盖的方式 - }) -} -/** - * 批量软删除 - * @param {id集合} ids - */ -export function deleteSoft{ModelTypeName}(data) { - return http({ - url: '{ModelTypeName}/DeleteSoftBatchAsync', - method: 'post', - data: data, - baseURL: defaultSettings.api{fileClassName}Url // 直接通过覆盖的方式 + params: data, }) } /** - * 批量删除 - * @param {id集合} ids + * 新增{ModelTypeDesc} + * @param data */ -export function delete{ModelTypeName}(data) { - return http({ - url: '{ModelTypeName}/DeleteBatchAsync', - method: 'delete', +export function add{ModelTypeName}(data) { + return request({ + url: '/bus/{ModelTypeName}', + method: 'post', data: data, - baseURL: defaultSettings.api{fileClassName}Url // 直接通过覆盖的方式 + }) +} + +/** + * 修改{ModelTypeDesc} + * @param data + */ +export function update{ModelTypeName}(data) { + return request({ + url: '/bus/{ModelTypeName}', + method: 'PUT', + data: data, + }) +} + +/** + * 获取{ModelTypeDesc}详情 + * @param {Id} {ModelTypeDesc}Id + */ +export function get{ModelTypeName}(id) { + return request({ + url: '/bus/{ModelTypeName}/' + id, + method: 'get' + }) +} + +/** + * 删除 + * @param {主键} pid + */ +export function del{ModelTypeName}(pid) { + return request({ + url: '/bus/{ModelTypeName}/' + pid, + method: 'delete' }) } diff --git a/ZR.Admin.WebApi/Template/VueTemplate.txt b/ZR.Admin.WebApi/Template/VueTemplate.txt index b8e7b95..c4e1b89 100644 --- a/ZR.Admin.WebApi/Template/VueTemplate.txt +++ b/ZR.Admin.WebApi/Template/VueTemplate.txt @@ -36,20 +36,14 @@ - 新增 + 新增 - 修改 + 修改 - 删除 + 删除 - @@ -59,10 +53,9 @@ {VueViewListContent} @@ -70,8 +63,8 @@ - - + + {VueViewFromContent}
@@ -83,15 +76,23 @@