From 0566606bfbc2528375202aae12b49d86ffe729ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com> Date: Sun, 19 Feb 2023 17:04:17 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=B7=A5=E5=85=B75=E5=88=86=E9=92=9F=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Abstract/ModelTemplateProvider.cs | 2 +- .../module/Yi.Framework.Template/Program.cs | 8 ++- .../ApplicationContractsSwaggerDoc.xml | 10 +++ .../Dtos/Config/ConfigCreateInputVo.cs | 23 +++++++ .../Dtos/Config/ConfigGetListInputVo.cs | 21 ++++++ .../Dtos/Config/ConfigGetListOutputDto.cs | 21 ++++++ .../Setting/Dtos/Config/ConfigGetOutputDto.cs | 21 ++++++ .../Dtos/Config/ConfigUpdateInputVo.cs | 20 ++++++ .../Setting/IConfigService.cs | 18 +++++ .../ApplicationSwaggerDoc.xml | 5 ++ .../Setting/ConfigService.cs | 17 +++++ .../Setting/ConstClasses/ConfigConst.cs | 16 +++++ .../rbac/Yi.RBAC.Domain/DomainSwaggerDoc.xml | 35 ++++++++++ .../Setting/Entities/ConfigEntity.cs | 63 ++++++++++++++++++ .../rbac/Yi.RBAC.Web/yi-sqlsugar-dev.db | Bin 110592 -> 118784 bytes Yi.RuoYi.Vue3/src/api/system/config.js | 18 ++--- .../src/views/system/config/index.vue | 8 +-- 17 files changed, 286 insertions(+), 20 deletions(-) create mode 100644 Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Setting/Dtos/Config/ConfigCreateInputVo.cs create mode 100644 Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Setting/Dtos/Config/ConfigGetListInputVo.cs create mode 100644 Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Setting/Dtos/Config/ConfigGetListOutputDto.cs create mode 100644 Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Setting/Dtos/Config/ConfigGetOutputDto.cs create mode 100644 Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Setting/Dtos/Config/ConfigUpdateInputVo.cs create mode 100644 Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Setting/IConfigService.cs create mode 100644 Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Setting/ConfigService.cs create mode 100644 Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain.Shared/Setting/ConstClasses/ConfigConst.cs create mode 100644 Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/Setting/Entities/ConfigEntity.cs diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Abstract/ModelTemplateProvider.cs b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Abstract/ModelTemplateProvider.cs index fa4e9e5b..c538a61b 100644 --- a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Abstract/ModelTemplateProvider.cs +++ b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Abstract/ModelTemplateProvider.cs @@ -13,7 +13,7 @@ namespace Yi.Framework.Template.Abstract public ModelTemplateProvider(string modelName, string entityName, string nameSpaces) : base(modelName, entityName, nameSpaces) { - AddIgnoreEntityField(/*"Id", */"TenantId", "IsDeleted", "LastModifierId", "LastModificationTime","OrderNum"); + AddIgnoreEntityField(/*"Id", */"TenantId", "IsDeleted", "LastModifierId", "LastModificationTime", "CreatorId"); } private string entityPath=string.Empty; diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Program.cs b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Program.cs index d37d2cb9..57f4b117 100644 --- a/Yi.Framework.Net6/src/module/Yi.Framework.Template/Program.cs +++ b/Yi.Framework.Net6/src/module/Yi.Framework.Template/Program.cs @@ -17,10 +17,12 @@ TemplateFactory templateFactory = new(); //string modelName = "Identity"; //string nameSpaces = "Yi.RBAC"; //List entityNames = new() { "_" }; -string modelName = "Dictionary"; +//string modelName = "Dictionary"; +//string nameSpaces = "Yi.RBAC"; +//List entityNames = new() { "_", "_" }; +string modelName = "Setting"; string nameSpaces = "Yi.RBAC"; -List entityNames = new() { "_", "_" }; - +List entityNames = new() { "_" }; foreach (var entityName in entityNames) diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/ApplicationContractsSwaggerDoc.xml b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/ApplicationContractsSwaggerDoc.xml index 8bea12d0..d5bee59e 100644 --- a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/ApplicationContractsSwaggerDoc.xml +++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/ApplicationContractsSwaggerDoc.xml @@ -74,5 +74,15 @@ User服务抽象 + + + Config输入创建对象 + + + + + Config服务抽象 + + diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Setting/Dtos/Config/ConfigCreateInputVo.cs b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Setting/Dtos/Config/ConfigCreateInputVo.cs new file mode 100644 index 00000000..22d41efb --- /dev/null +++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Setting/Dtos/Config/ConfigCreateInputVo.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Yi.RBAC.Application.Contracts.Setting.Dtos +{ + /// + /// Config输入创建对象 + /// + public class ConfigCreateInputVo + { + public long Id { get; set; } + public string ConfigName { get; set; } = string.Empty; + public string ConfigKey { get; set; } = string.Empty; + public string ConfigValue { get; set; } = string.Empty; + public string? ConfigType { get; set; } + public int OrderNum { get; set; } + public string? Remark { get; set; } + public DateTime CreationTime { get; set; } + } +} diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Setting/Dtos/Config/ConfigGetListInputVo.cs b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Setting/Dtos/Config/ConfigGetListInputVo.cs new file mode 100644 index 00000000..a8943fb4 --- /dev/null +++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Setting/Dtos/Config/ConfigGetListInputVo.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Yi.Framework.Ddd.Dtos; + +namespace Yi.RBAC.Application.Contracts.Setting.Dtos +{ + public class ConfigGetListInputVo : PagedAndSortedResultRequestDto + { + public long Id { get; set; } + public string ConfigName { get; set; } = string.Empty; + public string ConfigKey { get; set; } = string.Empty; + public string ConfigValue { get; set; } = string.Empty; + public string? ConfigType { get; set; } + public int OrderNum { get; set; } + public string? Remark { get; set; } + public DateTime CreationTime { get; set; } + } +} diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Setting/Dtos/Config/ConfigGetListOutputDto.cs b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Setting/Dtos/Config/ConfigGetListOutputDto.cs new file mode 100644 index 00000000..73819616 --- /dev/null +++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Setting/Dtos/Config/ConfigGetListOutputDto.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Yi.Framework.Ddd.Dtos; + +namespace Yi.RBAC.Application.Contracts.Setting.Dtos +{ + public class ConfigGetListOutputDto : IEntityDto + { + public long Id { get; set; } + public string ConfigName { get; set; } = string.Empty; + public string ConfigKey { get; set; } = string.Empty; + public string ConfigValue { get; set; } = string.Empty; + public string? ConfigType { get; set; } + public int OrderNum { get; set; } + public string? Remark { get; set; } + public DateTime CreationTime { get; set; } + } +} diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Setting/Dtos/Config/ConfigGetOutputDto.cs b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Setting/Dtos/Config/ConfigGetOutputDto.cs new file mode 100644 index 00000000..ff50dbdd --- /dev/null +++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Setting/Dtos/Config/ConfigGetOutputDto.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Yi.Framework.Ddd.Dtos; + +namespace Yi.RBAC.Application.Contracts.Setting.Dtos +{ + public class ConfigGetOutputDto : IEntityDto + { + public long Id { get; set; } + public string ConfigName { get; set; } = string.Empty; + public string ConfigKey { get; set; } = string.Empty; + public string ConfigValue { get; set; } = string.Empty; + public string? ConfigType { get; set; } + public int OrderNum { get; set; } + public string? Remark { get; set; } + public DateTime CreationTime { get; set; } + } +} diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Setting/Dtos/Config/ConfigUpdateInputVo.cs b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Setting/Dtos/Config/ConfigUpdateInputVo.cs new file mode 100644 index 00000000..2c51f3a3 --- /dev/null +++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Setting/Dtos/Config/ConfigUpdateInputVo.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Yi.RBAC.Application.Contracts.Setting.Dtos +{ + public class ConfigUpdateInputVo + { + public long Id { get; set; } + public string ConfigName { get; set; } = string.Empty; + public string ConfigKey { get; set; } = string.Empty; + public string ConfigValue { get; set; } = string.Empty; + public string? ConfigType { get; set; } + public int OrderNum { get; set; } + public string? Remark { get; set; } + public DateTime CreationTime { get; set; } + } +} diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Setting/IConfigService.cs b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Setting/IConfigService.cs new file mode 100644 index 00000000..ef422730 --- /dev/null +++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application.Contracts/Setting/IConfigService.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Yi.RBAC.Application.Contracts.Setting.Dtos; +using Yi.Framework.Ddd.Services.Abstract; + +namespace Yi.RBAC.Application.Contracts.Setting +{ + /// + /// Config服务抽象 + /// + public interface IConfigService : ICrudAppService + { + + } +} diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/ApplicationSwaggerDoc.xml b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/ApplicationSwaggerDoc.xml index 8328023d..1cd9c7cf 100644 --- a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/ApplicationSwaggerDoc.xml +++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/ApplicationSwaggerDoc.xml @@ -163,5 +163,10 @@ + + + Config服务实现 + + diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Setting/ConfigService.cs b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Setting/ConfigService.cs new file mode 100644 index 00000000..294c9dc5 --- /dev/null +++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Application/Setting/ConfigService.cs @@ -0,0 +1,17 @@ +using Yi.RBAC.Application.Contracts.Setting; +using NET.AutoWebApi.Setting; +using Yi.RBAC.Application.Contracts.Setting.Dtos; +using Yi.RBAC.Domain.Setting.Entities; +using Yi.Framework.Ddd.Services; + +namespace Yi.RBAC.Application.Setting +{ + /// + /// Config服务实现 + /// + [AppService] + public class ConfigService : CrudAppService, + IConfigService, IAutoApiService + { + } +} diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain.Shared/Setting/ConstClasses/ConfigConst.cs b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain.Shared/Setting/ConstClasses/ConfigConst.cs new file mode 100644 index 00000000..8e5852a9 --- /dev/null +++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain.Shared/Setting/ConstClasses/ConfigConst.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Yi.RBAC.Domain.Shared.Setting.ConstClasses +{ + /// + /// 常量定义 + /// + + public class ConfigConst + { + } +} diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/DomainSwaggerDoc.xml b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/DomainSwaggerDoc.xml index ddd32ed0..eba4aa75 100644 --- a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/DomainSwaggerDoc.xml +++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/DomainSwaggerDoc.xml @@ -711,5 +711,40 @@ + + + 配置表 + + + + + 配置名称 + + + + + 配置键 + + + + + 配置值 + + + + + 配置类别 + + + + + 排序字段 + + + + + 描述 + + diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/Setting/Entities/ConfigEntity.cs b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/Setting/Entities/ConfigEntity.cs new file mode 100644 index 00000000..734d8ded --- /dev/null +++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/Setting/Entities/ConfigEntity.cs @@ -0,0 +1,63 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Yi.Framework.Data.Auditing; +using Yi.Framework.Data.Entities; +using Yi.Framework.Ddd.Entities; + +namespace Yi.RBAC.Domain.Setting.Entities +{ + /// + /// 配置表 + /// + [SugarTable("Config")] + public class ConfigEntity : IEntity, IAuditedObject, IOrderNum, ISoftDelete + { + [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)] + public long Id { get; set; } + /// + /// 配置名称 + /// + [SugarColumn(ColumnName = "ConfigName")] + public string ConfigName { get; set; } = string.Empty; + /// + /// 配置键 + /// + [SugarColumn(ColumnName = "ConfigKey")] + public string ConfigKey { get; set; } = string.Empty; + /// + /// 配置值 + /// + [SugarColumn(ColumnName = "ConfigValue")] + public string ConfigValue { get; set; } = string.Empty; + /// + /// 配置类别 + /// + [SugarColumn(ColumnName = "ConfigType")] + public string? ConfigType { get; set; } + + + /// + /// 排序字段 + /// + [SugarColumn(ColumnName = "OrderNum")] + public int OrderNum { get; set; } + /// + /// 描述 + /// + [SugarColumn(ColumnName = "Remark")] + public string? Remark { get; set; } + public bool IsDeleted { get; set; } + + public DateTime CreationTime { get; set; } + + public long? CreatorId { get; set; } + + public long? LastModifierId { get; set; } + + public DateTime? LastModificationTime { get; set; } + } +} diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/yi-sqlsugar-dev.db b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/yi-sqlsugar-dev.db index 7bc3ed7d2d2ee4cff2e8033ef2a9fcba7ada3d38..28712623e0aea9edf3670a90fb10499cd698f284 100644 GIT binary patch delta 440 zcmZp8z}B#UeS)-L7y|=?ED*zh;6xo`#<0eOtqF`v>X`+Z)=g(`V3cQJTE`)_IZ&a6 z$)Gtzl3iRF)G2>6T28iChuqFoF3E1s5se=M{e>~e#yxWyxq(S3Yyzn zTNu@tn4KAOwy$er%wS~GmSPjPmz=zjM?xH8a=amgmgVSR-~f4RyLSiUR&^d;Ad`u| zf`NZ4f5m1&haCQTYbIVcVNp?j4q;AfprqJTao-6|0t|*m#xN8KVptj&=o%OTk%EDN z6&UFm7#Mgm^0KMQO7nAwa~MN3D{&qYV0gB*`^EaHPy3smP2EtET3iA&z{C;^jKGE& rA&e7+o5uxq+H(f}FZ|Cp3vRg0KmC9{BbzY9IZWKlY@9&1fsF?MX6A8> delta 81 zcmZozz~1nHZGyC5AOiz~G!Vmpz(gHm#=ypetqF`v>Y4djTBox&Fv@QZRETHU-rB;b e#>CvgxN!TrHpUFb>9e~SO&B$|dv`EyRR;hFdlhd0 diff --git a/Yi.RuoYi.Vue3/src/api/system/config.js b/Yi.RuoYi.Vue3/src/api/system/config.js index e1d549e6..2071c0be 100644 --- a/Yi.RuoYi.Vue3/src/api/system/config.js +++ b/Yi.RuoYi.Vue3/src/api/system/config.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询参数列表 export function listConfig(query) { return request({ - url: '/config/pageList', + url: '/config', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listConfig(query) { // 查询参数详细 export function getConfig(configId) { return request({ - url: '/config/getById/' + configId, + url: '/config/' + configId, method: 'get' }) } @@ -28,7 +28,7 @@ export function getConfigKey(configKey) { // 新增参数配置 export function addConfig(data) { return request({ - url: '/config/add', + url: '/config', method: 'post', data: data }) @@ -37,7 +37,7 @@ export function addConfig(data) { // 修改参数配置 export function updateConfig(data) { return request({ - url: '/config/update', + url: `/config/${data.id}`, method: 'put', data: data }) @@ -45,15 +45,9 @@ export function updateConfig(data) { // 删除参数配置 export function delConfig(configId) { - -if("string"==typeof(configId)) -{ - configId=[configId]; -} return request({ - url: '/config/delList', - method: 'delete', - data:configId + url: `/config/${configId}`, + method: 'delete' }) } diff --git a/Yi.RuoYi.Vue3/src/views/system/config/index.vue b/Yi.RuoYi.Vue3/src/views/system/config/index.vue index 522a165c..45a985bc 100644 --- a/Yi.RuoYi.Vue3/src/views/system/config/index.vue +++ b/Yi.RuoYi.Vue3/src/views/system/config/index.vue @@ -108,9 +108,9 @@ - + @@ -213,7 +213,7 @@ const { queryParams, form, rules } = toRefs(data); function getList() { loading.value = true; listConfig(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => { - configList.value = response.data.data; + configList.value = response.data.items; total.value = response.data.total; loading.value = false; }); @@ -232,7 +232,7 @@ function reset() { configValue: undefined, configType: "Y", remark: undefined, - isDeleted: false + state: true }; proxy.resetForm("configRef"); }