xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

配置管理增删改查

Browse Source
This commit is contained in:
陈淳
2022-09-23 18:46:37 +08:00
parent 261d9fcd79
commit 9149d6de9a
11 changed files with 217 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
WebFirst/database/sqlite.db
View File

Binary file not shown.

8
Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml
View File

@@ -180,6 +180,14 @@
<param name="ids"></param>
<returns></returns>
</member>
<member name="M:Yi.Framework.ApiMicroservice.Controllers.ConfigController.PageList(Yi.Framework.Model.Models.ConfigEntity,Yi.Framework.Common.Models.PageParModel)">
<summary>
动态条件分页查询
</summary>
<param name="dic"></param>
<param name="page"></param>
<returns></returns>
</member>
<member name="M:Yi.Framework.ApiMicroservice.Controllers.DeptController.SelctGetList(Yi.Framework.Model.Models.DeptEntity)">
<summary>
动态条件查询

40
Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ConfigController.cs Normal file
View File

@@ -0,0 +1,40 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Yi.Framework.Common.Models;
using Yi.Framework.Interface;
using Yi.Framework.Model.Models;
using Yi.Framework.Repository;
using Yi.Framework.WebCore;
using Yi.Framework.WebCore.AttributeExtend;
using Yi.Framework.WebCore.AuthorizationPolicy;
namespace Yi.Framework.ApiMicroservice.Controllers
{
[ApiController]
[Route("api/[controller]/[action]")]
public class ConfigController : BaseSimpleCrudController<ConfigEntity>
{
private IConfigService _iConfigService;
public ConfigController(ILogger<ConfigEntity> logger, IConfigService iConfigService) : base(logger, iConfigService)
{
_iConfigService = iConfigService;
}
/// <summary>
/// 动态条件分页查询
/// </summary>
/// <param name="dic"></param>
/// <param name="page"></param>
/// <returns></returns>
[HttpGet]
public async Task<Result> PageList([FromQuery] ConfigEntity dic, [FromQuery] PageParModel page)
{
return Result.Success().SetData(await _iConfigService.SelctPageList(dic, page));
}
}
}

BIN
Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db
View File

Binary file not shown.

13
Yi.Framework.Net6/Yi.Framework.Interface/IConfigService.cs Normal file
View File

@@ -0,0 +1,13 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using Yi.Framework.Common.Models;
using Yi.Framework.Model.Models;
using Yi.Framework.Repository;
namespace Yi.Framework.Interface
{
public partial interface IConfigService:IBaseService<ConfigEntity>
{
Task<PageModel<List<ConfigEntity>>> SelctPageList(ConfigEntity config, PageParModel page);
}
}

9
Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IConfigService.cs Normal file
View File

@@ -0,0 +1,9 @@
using Yi.Framework.Model.Models;
using Yi.Framework.Repository;
namespace Yi.Framework.Interface
{
public partial interface IConfigService:IBaseService<ConfigEntity>
{
}
}

82
Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/ConfigEntity.cs Normal file
View File

@@ -0,0 +1,82 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text.Json.Serialization;
using SqlSugar;
namespace Yi.Framework.Model.Models
{
/// <summary>
/// 配置表
///</summary>
[SugarTable("Config")]
public partial class ConfigEntity:IBaseModelEntity
{
public ConfigEntity()
{
this.CreateTime = DateTime.Now;
}
[JsonConverter(typeof(ValueToStringConverter))]
[SugarColumn(ColumnName="Id" ,IsPrimaryKey = true )]
public long Id { get; set; }
/// <summary>
/// 配置名称
///</summary>
[SugarColumn(ColumnName="ConfigName" )]
public string ConfigName { get; set; }
/// <summary>
/// 配置键
///</summary>
[SugarColumn(ColumnName="ConfigKey" )]
public string ConfigKey { get; set; }
/// <summary>
/// 配置值
///</summary>
[SugarColumn(ColumnName="ConfigValue" )]
public string ConfigValue { get; set; }
/// <summary>
/// 配置类别
///</summary>
[SugarColumn(ColumnName="ConfigType" )]
public string ConfigType { get; set; }
/// <summary>
/// 创建者
///</summary>
[SugarColumn(ColumnName="CreateUser" )]
public long? CreateUser { get; set; }
/// <summary>
/// 创建时间
///</summary>
[SugarColumn(ColumnName="CreateTime" )]
public DateTime? CreateTime { get; set; }
/// <summary>
/// 修改者
///</summary>
[SugarColumn(ColumnName="ModifyUser" )]
public long? ModifyUser { get; set; }
/// <summary>
/// 修改时间
///</summary>
[SugarColumn(ColumnName="ModifyTime" )]
public DateTime? ModifyTime { get; set; }
/// <summary>
/// 是否删除
///</summary>
[SugarColumn(ColumnName="IsDeleted" )]
public bool? IsDeleted { get; set; }
/// <summary>
/// 租户Id
///</summary>
[SugarColumn(ColumnName="TenantId" )]
public long? TenantId { get; set; }
/// <summary>
/// 排序字段
///</summary>
[SugarColumn(ColumnName="OrderNum" )]
public int? OrderNum { get; set; }
/// <summary>
/// 描述
///</summary>
[SugarColumn(ColumnName="Remark" )]
public string Remark { get; set; }
}
}

29
Yi.Framework.Net6/Yi.Framework.Service/ConfigService.cs Normal file
View File

@@ -0,0 +1,29 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Yi.Framework.Common.Models;
using Yi.Framework.Interface;
using Yi.Framework.Model.Models;
using Yi.Framework.Repository;
namespace Yi.Framework.Service
{
public partial class ConfigService : BaseService<ConfigEntity>, IConfigService
{
public async Task<PageModel<List<ConfigEntity>>> SelctPageList(ConfigEntity config, PageParModel page)
{
RefAsync<int> total = 0;
var data = await _repository._DbQueryable
.WhereIF(!string.IsNullOrEmpty(config.ConfigName), u => u.ConfigName.Contains(config.ConfigName))
.WhereIF(!string.IsNullOrEmpty(config.ConfigKey), u => u.ConfigKey.Contains(config.ConfigKey))
.WhereIF(page.StartTime.IsNotNull() && page.EndTime.IsNotNull(), u => u.CreateTime >= page.StartTime && u.CreateTime <= page.EndTime)
.WhereIF(config.IsDeleted.IsNotNull(), u => u.IsDeleted == config.IsDeleted)
.OrderBy(u => u.OrderNum, OrderByType.Desc)
.ToPageListAsync(page.PageNum, page.PageSize, total);
return new PageModel<List<ConfigEntity>>(data, total);
}
}
}

14
Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/ConfigService.cs Normal file
View File

@@ -0,0 +1,14 @@
using SqlSugar;
using Yi.Framework.Interface;
using Yi.Framework.Model.Models;
using Yi.Framework.Repository;
namespace Yi.Framework.Service
{
public partial class ConfigService : BaseService<ConfigEntity>, IConfigService
{
public ConfigService(IRepository<ConfigEntity> repository) : base(repository)
{
}
}
}

18
Yi.Vue3.X.RuoYi/src/api/system/config.js
View File

@@ -3,7 +3,7 @@ import request from '@/utils/request'
// 查询参数列表
export function listConfig(query) {
return request({
url: '/system/config/list',
url: '/config/pageList',
method: 'get',
params: query
})
@@ -12,7 +12,7 @@ export function listConfig(query) {
// 查询参数详细
export function getConfig(configId) {
return request({
url: '/system/config/' + configId,
url: '/config/getById/' + configId,
method: 'get'
})
}
@@ -28,7 +28,7 @@ export function getConfigKey(configKey) {
// 新增参数配置
export function addConfig(data) {
return request({
url: '/system/config',
url: '/config/add',
method: 'post',
data: data
})
@@ -37,7 +37,7 @@ export function addConfig(data) {
// 修改参数配置
export function updateConfig(data) {
return request({
url: '/system/config',
url: '/config/update',
method: 'put',
data: data
})
@@ -45,9 +45,15 @@ export function updateConfig(data) {
// 删除参数配置
export function delConfig(configId) {
if("string"==typeof(configId))
{
configId=[configId];
}
return request({
url: '/system/config/' + configId,
method: 'delete'
url: '/config/delList',
method: 'delete',
data:configId
})
}

19
Yi.Vue3.X.RuoYi/src/views/system/config/index.vue
View File

@@ -98,7 +98,7 @@
<el-table v-loading="loading" :data="configList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="参数主键" align="center" prop="configId" />
<el-table-column label="参数主键" align="center" prop="id" />
<el-table-column label="参数名称" align="center" prop="configName" :show-overflow-tooltip="true" />
<el-table-column label="参数键名" align="center" prop="configKey" :show-overflow-tooltip="true" />
<el-table-column label="参数键值" align="center" prop="configValue" />
@@ -213,8 +213,8 @@ const { queryParams, form, rules } = toRefs(data);
function getList() {
loading.value = true;
listConfig(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => {
configList.value = response.rows;
total.value = response.total;
configList.value = response.data.data;
total.value = response.data.total;
loading.value = false;
});
}
@@ -226,12 +226,13 @@ function cancel() {
/** 表单重置 */
function reset() {
form.value = {
configId: undefined,
id: undefined,
configName: undefined,
configKey: undefined,
configValue: undefined,
configType: "Y",
remark: undefined
remark: undefined,
isDeleted: false
};
proxy.resetForm("configRef");
}
@@ -248,7 +249,7 @@ function resetQuery() {
}
/** 多选框选中数据 */
function handleSelectionChange(selection) {
ids.value = selection.map(item => item.configId);
ids.value = selection.map(item => item.id);
single.value = selection.length != 1;
multiple.value = !selection.length;
}
@@ -261,7 +262,7 @@ function handleAdd() {
/** 修改按钮操作 */
function handleUpdate(row) {
reset();
const configId = row.configId || ids.value;
const configId = row.id || ids.value;
getConfig(configId).then(response => {
form.value = response.data;
open.value = true;
@@ -272,7 +273,7 @@ function handleUpdate(row) {
function submitForm() {
proxy.$refs["configRef"].validate(valid => {
if (valid) {
if (form.value.configId != undefined) {
if (form.value.id != undefined) {
updateConfig(form.value).then(response => {
proxy.$modal.msgSuccess("修改成功");
open.value = false;
@@ -290,7 +291,7 @@ function submitForm() {
}
/** 删除按钮操作 */
function handleDelete(row) {
const configIds = row.configId || ids.value;
const configIds = row.id || ids.value;
proxy.$modal.confirm('是否确认删除参数编号为"' + configIds + '"的数据项？').then(function () {
return delConfig(configIds);
}).then(() => {