From c89255c8c810b873def18e5369f31684c8115ad0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com> Date: Sat, 14 May 2022 12:22:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../System/CommonLangController.cs | 71 ++++--------------- ZR.Model/System/Dto/CommonLangDto.cs | 8 +-- 2 files changed, 17 insertions(+), 62 deletions(-) diff --git a/ZR.Admin.WebApi/Controllers/System/CommonLangController.cs b/ZR.Admin.WebApi/Controllers/System/CommonLangController.cs index 5f99499..a777d5f 100644 --- a/ZR.Admin.WebApi/Controllers/System/CommonLangController.cs +++ b/ZR.Admin.WebApi/Controllers/System/CommonLangController.cs @@ -1,14 +1,13 @@ using Infrastructure; using Infrastructure.Attribute; using Infrastructure.Enums; +using Infrastructure.Extensions; using Infrastructure.Model; using Mapster; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using System; using System.Collections.Generic; -using System.Linq; -using ZR.Admin.WebApi.Extensions; using ZR.Admin.WebApi.Filters; using ZR.Common; using ZR.Model; @@ -101,14 +100,10 @@ namespace ZR.Admin.WebApi.Controllers public IActionResult GetCommonLang(long Id) { var response = _CommonLangService.GetFirst(x => x.Id == Id); - var modal = response.Adapt(); - if (modal != null) - { - var list = _CommonLangService.GetList(f => f.LangKey == modal.LangKey); - modal.LangName = list.Find(f => f.LangCode == "zh-cn")?.LangName; - modal.LangNameEn = list.Find(f => f.LangCode == "en")?.LangName; - modal.LangNameTw = list.Find(f => f.LangCode == "zh-tw")?.LangName; - } + + var list = _CommonLangService.GetList(x => x.LangKey == response.LangKey); + var vo = list.Adapt>(); + var modal = new CommonLangDto() { LangKey = response.LangKey, LangList = vo }; return SUCCESS(modal); } @@ -121,47 +116,11 @@ namespace ZR.Admin.WebApi.Controllers [ActionPermissionFilter(Permission = "system:lang:query")] public IActionResult GetCommonLangByKey(string langKey) { - var response = _CommonLangService.GetList(x => x.LangKey == langKey); + var list = _CommonLangService.GetList(x => x.LangKey == langKey); + var vo = list.Adapt>(); + var modal = new CommonLangDto() { LangKey = langKey, LangList = vo }; - return SUCCESS(response); - } - /// - /// 添加多语言配置 - /// - /// - [HttpPost] - [ActionPermissionFilter(Permission = "system:lang:add")] - [Log(Title = "多语言配置", BusinessType = BusinessType.INSERT)] - public IActionResult AddCommonLang([FromBody] CommonLangDto parm) - { - if (parm == null) - { - throw new CustomException("请求参数错误"); - } - - //从 Dto 映射到 实体 - var modal = parm.Adapt().ToCreate(HttpContext); - var list = _CommonLangService.GetList(f => f.LangKey == modal.LangKey); - modal.Addtime = DateTime.Now; - modal.LangCode = "zh-cn"; - modal.LangName = parm.LangName; - if (!list.Any(f => f.LangCode == modal.LangCode)) - { - _CommonLangService.InsertReturnSnowflakeId(modal); - } - modal.LangCode = "zh-tw"; - modal.LangName = parm.LangNameTw; - if (!list.Any(f => f.LangCode == modal.LangCode)) - { - _CommonLangService.InsertReturnSnowflakeId(modal); - } - modal.LangCode = "en"; - modal.LangName = parm.LangNameEn; - if (!list.Any(f => f.LangCode == modal.LangCode)) - { - _CommonLangService.InsertReturnSnowflakeId(modal); - } - return ToResponse(1); + return SUCCESS(modal); } /// @@ -173,18 +132,16 @@ namespace ZR.Admin.WebApi.Controllers [Log(Title = "多语言配置", BusinessType = BusinessType.UPDATE)] public IActionResult UpdateCommonLang([FromBody] CommonLangDto parm) { - if (parm == null) + if (parm == null || parm.LangKey.IsEmpty()) { throw new CustomException("请求实体不能为空"); } - //从 Dto 映射到 实体 - var modal = parm.Adapt().ToUpdate(HttpContext); - var list = _CommonLangService.GetList(f => f.LangKey == modal.LangKey); List langs = new(); - langs.Add(new CommonLang() { Addtime = DateTime.Now, LangCode = "zh-cn", LangKey = modal.LangKey, LangName = parm.LangName }); - langs.Add(new CommonLang() { Addtime = DateTime.Now, LangCode = "zh-tw", LangKey = modal.LangKey, LangName = parm.LangNameTw }); - langs.Add(new CommonLang() { Addtime = DateTime.Now, LangCode = "en", LangKey = modal.LangKey, LangName = parm.LangNameEn }); + foreach (var item in parm.LangList) + { + langs.Add(new CommonLang() { Addtime = DateTime.Now, LangKey = parm.LangKey, LangCode = item.LangCode, LangName = item.LangName }); + } var storage = _CommonLangService.Storageable(langs).WhereColumns(it => new { it.LangKey, it.LangCode }).ToStorage(); long r = storage.AsInsertable.ExecuteReturnSnowflakeId();//执行插入 diff --git a/ZR.Model/System/Dto/CommonLangDto.cs b/ZR.Model/System/Dto/CommonLangDto.cs index 1f56d7b..18938a5 100644 --- a/ZR.Model/System/Dto/CommonLangDto.cs +++ b/ZR.Model/System/Dto/CommonLangDto.cs @@ -9,16 +9,14 @@ namespace ZR.Model.Dto /// public class CommonLangDto { - [Required(ErrorMessage = "id不能为空")] + //[Required(ErrorMessage = "id不能为空")] public long Id { get; set; } //[Required(ErrorMessage = "语言code不能为空")] public string LangCode { get; set; } public string LangKey { get; set; } - [Required(ErrorMessage = "名称不能为空")] + //[Required(ErrorMessage = "名称不能为空")] public string LangName { get; set; } - public string LangNameEn { get; set; } - public string LangNameTw { get; set; } - //public List Langs { get; set; } + public List LangList { get; set; } } ///