Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

新增加系统配置文件

Browse Source
This commit is contained in:
izory
2021-09-29 15:57:56 +08:00
parent 2b263fb64d
commit 2b10934e09
15 changed files with 378 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

162
ZR.Admin.WebApi/Controllers/System/SysConfigController.cs
View File

@@ -1,23 +1,169 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using SqlSugar;
using Infrastructure;
using Infrastructure.Attribute;
using Infrastructure.Enums;
using Infrastructure.Model;
using Mapster;
using ZR.Model.Dto;
using ZR.Model.Models;
using ZR.Service.Business;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Common;
using ZR.Service.System;
using ZR.Model.System;
using Infrastructure.Extensions;
namespace ZR.Admin.WebApi.Controllers.System
namespace ZR.Admin.WebApi.Controllers
{
/// <summary>
/// 配置文件
/// 参数配置Controller
///
/// @author zhaorui
/// @date 2021-09-29
/// </summary>
[Verify]
[Route("system/config")]
public class SysConfigController : BaseController
{
[HttpGet("list")]
public IActionResult Index()
/// <summary>
/// 参数配置接口
/// </summary>
private readonly ISysConfigService _SysConfigService;
public SysConfigController(ISysConfigService SysConfigService)
{
return SUCCESS(1);
_SysConfigService = SysConfigService;
}
/// <summary>
/// 查询参数配置列表
/// </summary>
/// <returns></returns>
[HttpGet("list")]
[ActionPermissionFilter(Permission = "system:config:list")]
public IActionResult QuerySysConfig([FromQuery] SysConfigQueryDto parm)
{
//开始拼装查询条件
var predicate = Expressionable.Create<SysConfig>();
//TODO 搜索条件
predicate = predicate.AndIF(!parm.ConfigType.IsEmpty(),m => m.ConfigType == parm.ConfigType);
predicate = predicate.AndIF(!parm.ConfigName.IsEmpty(),m => m.ConfigName.Contains(parm.ConfigType));
predicate = predicate.AndIF(!parm.ConfigKey.IsEmpty(),m => m.ConfigKey.Contains(parm.ConfigKey));
predicate = predicate.AndIF(!parm.BeginTime.IsEmpty(),m => m.Create_time >= parm.BeginTime );
predicate = predicate.AndIF(!parm.BeginTime.IsEmpty(),m => m.Create_time <= parm.EndTime);
var response = _SysConfigService.GetPages(predicate.ToExpression(), parm);
return SUCCESS(response);
}
/// <summary>
/// 查询参数配置详情
/// </summary>
/// <param name="ConfigId"></param>
/// <returns></returns>
[HttpGet("{ConfigId}")]
[ActionPermissionFilter(Permission = "system:config:query")]
public IActionResult GetSysConfig(int ConfigId)
{
var response = _SysConfigService.GetId(ConfigId);
return SUCCESS(response);
}
/// <summary>
/// 根据参数键名查询参数值
/// </summary>
/// <param name="configKey"></param>
/// <returns></returns>
[HttpGet("configKey/{configKey}")]
public IActionResult GetConfigKey(string configKey)
{
//TODO 增加缓存
var response = _SysConfigService.Queryable().First(f=> f.ConfigKey == configKey);
return SUCCESS(response?.ConfigValue);
}
/// <summary>
/// 添加参数配置
/// </summary>
/// <returns></returns>
[HttpPost]
[ActionPermissionFilter(Permission = "system:config:add")]
[Log(Title = "参数配置添加", BusinessType = BusinessType.INSERT)]
public IActionResult AddSysConfig([FromBody] SysConfigDto parm)
{
if (parm == null)
{
throw new CustomException("请求参数错误");
}
//从 Dto 映射到 实体
var model = parm.Adapt<SysConfig>().ToCreate();
return SUCCESS(_SysConfigService.Add(model, it => new
{
it.ConfigName,
it.ConfigKey,
it.ConfigValue,
it.ConfigType,
it.Create_by,
it.Create_time,
it.Remark,
}));
}
/// <summary>
/// 更新参数配置
/// </summary>
/// <returns></returns>
[HttpPut]
[ActionPermissionFilter(Permission = "system:config:update")]
[Log(Title = "参数配置修改", BusinessType = BusinessType.UPDATE)]
public IActionResult UpdateSysConfig([FromBody] SysConfigDto parm)
{
if (parm == null)
{
throw new CustomException("请求实体不能为空");
}
//从 Dto 映射到 实体
var model = parm.Adapt<SysConfig>().ToUpdate(HttpContext);
var response = _SysConfigService.Update(w => w.ConfigId == model.ConfigId, it => new SysConfig()
{
//Update 字段映射
ConfigName = model.ConfigName,
ConfigKey = model.ConfigKey,
ConfigValue = model.ConfigValue,
ConfigType = model.ConfigType,
Update_by = model.Update_by,
Update_time = model.Update_time,
});
return SUCCESS(response);
}
/// <summary>
/// 删除参数配置
/// </summary>
/// <returns></returns>
[HttpDelete("{ids}")]
[ActionPermissionFilter(Permission = "system:config:remove")]
[Log(Title = "参数配置删除", BusinessType = BusinessType.DELETE)]
public IActionResult DeleteSysConfig(string ids)
{
int[] idsArr = Tools.SpitIntArrary(ids);
if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); }
var response = _SysConfigService.Delete(idsArr);
return SUCCESS(response);
}
}
}
}

4
ZR.Admin.WebApi/Controllers/System/SysProfileController.cs
View File

@@ -79,9 +79,7 @@ namespace ZR.Admin.WebApi.Controllers.System
throw new CustomException(ResultCode.PARAM_ERROR, "请求参数错误");
}
//从 Dto 映射到 实体
var user = userDto.Adapt<SysUser>();
user.Update_by = User.Identity.Name;
user.Update_time = DateTime.Now;
var user = userDto.Adapt<SysUser>().ToUpdate(HttpContext);
int result = UserService.ChangeUser(user);
return ToResponse(result);

4
ZR.Admin.WebApi/Extensions/EntityExtension.cs
View File

@@ -57,9 +57,9 @@ namespace ZR.Admin.WebApi.Extensions
{
types.GetProperty("UpdateTime").SetValue(source, DateTime.Now, null);
}
if (types.GetProperty("Update_Time") != null)
if (types.GetProperty("Update_time") != null)
{
types.GetProperty("Update_Time").SetValue(source, DateTime.Now, null);
types.GetProperty("Update_time").SetValue(source, DateTime.Now, null);
}
//if (types.GetProperty("UpdateID") != null)
//{

11
ZR.Admin.WebApi/wwwroot/CodeGenTemplate/ControllersTemplate.txt
View File

@@ -14,6 +14,7 @@ using {ServicesNamespace}.Business;
using {ApiControllerNamespace}.Extensions;
using {ApiControllerNamespace}.Filters;
using ZR.Common;
using Infrastructure.Extensions;
namespace {ApiControllerNamespace}.Controllers
{
@@ -76,7 +77,7 @@ namespace {ApiControllerNamespace}.Controllers
/// <returns></returns>
[HttpPost]
[ActionPermissionFilter(Permission = "{Permission}:add")]
[Log(Title = "{TableDesc}添加", BusinessType = BusinessType.INSERT)]
[Log(Title = "{FunctionName}添加", BusinessType = BusinessType.INSERT)]
public IActionResult Add{ModelName}([FromBody] {ModelName}Dto parm)
{
if (parm == null)
@@ -84,7 +85,7 @@ namespace {ApiControllerNamespace}.Controllers
throw new CustomException("请求参数错误");
}
//从 Dto 映射到 实体
var model = parm.Adapt<{ModelName}>().ToCreate();
var model = parm.Adapt<{ModelName}>().ToCreate(HttpContext);
return SUCCESS(_{ModelName}Service.Add(model, it => new
{
@@ -98,7 +99,7 @@ namespace {ApiControllerNamespace}.Controllers
/// <returns></returns>
[HttpPut]
[ActionPermissionFilter(Permission = "{Permission}:update")]
[Log(Title = "{TableDesc}修改", BusinessType = BusinessType.UPDATE)]
[Log(Title = "{FunctionName}修改", BusinessType = BusinessType.UPDATE)]
public IActionResult Update{ModelName}([FromBody] {ModelName}Dto parm)
{
if (parm == null)
@@ -106,7 +107,7 @@ namespace {ApiControllerNamespace}.Controllers
throw new CustomException("请求实体不能为空");
}
//从 Dto 映射到 实体
var model = parm.Adapt<{ModelName}>().ToUpdate();
var model = parm.Adapt<{ModelName}>().ToUpdate(HttpContext);
var response = _{ModelName}Service.Update(w => w.{PrimaryKey} == model.{PrimaryKey}, it => new {ModelName}()
{
@@ -123,7 +124,7 @@ namespace {ApiControllerNamespace}.Controllers
/// <returns></returns>
[HttpDelete("{ids}")]
[ActionPermissionFilter(Permission = "{Permission}:delete")]
[Log(Title = "{TableDesc}删除", BusinessType = BusinessType.DELETE)]
[Log(Title = "{FunctionName}删除", BusinessType = BusinessType.DELETE)]
public IActionResult Delete{ModelName}(string ids)
{
int[] idsArr = Tools.SpitIntArrary(ids);

7
ZR.Admin.WebApi/wwwroot/CodeGenTemplate/ServiceTemplate.txt
View File

@@ -1,12 +1,5 @@
using Infrastructure;
using Infrastructure.Attribute;
using Infrastructure.Extensions;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using ZR.Common;
using {ModelsNamespace}.Models;
using {IRepositoriesNamespace};